violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
1.外销合同获取标准价取消折扣率和折扣金额
This commit is contained in:
25655 2025-03-29 10:05:11 +08:00
parent e8f6891323
commit 0639255653
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
View File

@ -298,9 +298,9 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
case "yem_safobamount"://销售fob金额
ClientUtils.addSaPriceSaleRMB(model, rowIndex);//销售fob金额 人民币
ClientUtils.totalSaFobAmount(model, "yem_es_materialinfo", "yem_ifgift", "yem_safobamount", "yem_amount");//销售fob金额 汇总表头 fob金额
ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额
ClientUtils.calculateDiscountRate(view, model, rowIndex);//计算折扣率
// ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
// ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额
// ClientUtils.calculateDiscountRate(view, model, rowIndex);//计算折扣率
break;
case "yem_onecarsum"://单车总费用
ClientUtils.countFrontDisPrice(model, rowIndex);//折扣前单价
@ -319,8 +319,8 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
break;
case "yem_disamt"://折扣金额
ClientUtils.countFrontDisAmt(model, rowIndex);//折扣前金额
ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额
ClientUtils.calculateDiscountRate(view, model, -1);//计算折扣率
// ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额
// ClientUtils.calculateDiscountRate(view, model, -1);//计算折扣率
ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别
ClientUtils.countPoolAmt(view, model, "yem_es_materialinfo");//汇总折扣金额使用金额
break;
@ -359,21 +359,21 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
if (!this.getModel().getDataEntityType().getName().equals("yem_es_xsalesorder")) {
ClientUtils.delValue(model, "yem_es_materialinfo");
// ClientUtils.countDisAmt(model,"yem_es_materialinfo",rowIndex);//计算折扣金额
ClientUtils.calculateDiscountRate(view, model, -1);//计算折扣率
// ClientUtils.calculateDiscountRate(view, model, -1);//计算折扣率
}
break;
case "yem_fundpoolamt"://使用额度
ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
break;
case "yem_amount"://财务信息 fob金额
ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
break;
case "yem_frontrateentry"://明细信息 折扣率
ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
break;
case "yem_afterfrontdisamt"://折扣后销售金额
ClientUtils.countAfterFrontPrice(model, rowIndex);//折扣后销售单价
break;
// case "yem_fundpoolamt"://使用额度
// ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
// break;
// case "yem_amount"://财务信息 fob金额
// ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
// break;
// case "yem_frontrateentry"://明细信息 折扣率
// ClientUtils.countDisAmt(model, "yem_es_materialinfo", rowIndex, view);//计算折扣金额
// break;
// case "yem_afterfrontdisamt"://折扣后销售金额
// ClientUtils.countAfterFrontPrice(model, rowIndex);//折扣后销售单价
// break;
// case "yem_exwrmbprice":
// ClientUtils.exwRMBPriceChange(model, rowIndex);
// break;
@ -571,7 +571,7 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
// ClientUtils.resetValuePJ(this.getModel());
String fundusetype = dataEntity.getString("yem_accamtusetype");
if ("A".equals(fundusetype)) {
ClientUtils.countAmtDisAmt(model, "yem_es_materialinfo", view);
// ClientUtils.countAmtDisAmt(model, "yem_es_materialinfo", view);
}
break;
case "createauditbill":