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

fix：

Browse Source 
业务分类为整机且是否赠品为是的，随机资料机型台数不要加上
This commit is contained in:
ljw 2025-01-21 19:03:19 +08:00
parent aa5bf8af2c
commit d563f69534
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
View File

@ -396,7 +396,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
genTradeTermsDestports(model, view);//贸易术语=价格条款+目的港.工厂 genTradeTermsDestports(model, view);//贸易术语=价格条款+目的港.工厂
DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo");
for (DynamicObject dynamicObject : yemEsMaterialinfo) { for (DynamicObject dynamicObject : yemEsMaterialinfo) {
dynamicObject.set("yem_port",model.getValue("yem_shipports")); dynamicObject.set("yem_port", model.getValue("yem_shipports"));
} }
break; break;
case "yem_destports": case "yem_destports":
@ -1536,6 +1536,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
yem_es_materialinfo.set("yem_amt", yem_amt); yem_es_materialinfo.set("yem_amt", yem_amt);
yem_es_materialinfo.set("yem_locamt", yem_amt.multiply(newbill.getBigDecimal("yem_exrate"))); yem_es_materialinfo.set("yem_locamt", yem_amt.multiply(newbill.getBigDecimal("yem_exrate")));
qty_s = BigDecimalUtils.add(qty_s, yem_qty, 10); qty_s = BigDecimalUtils.add(qty_s, yem_qty, 10);
if (!yem_es_materialinfo.getString("yem_businesssort").equals("Z") || !yem_es_materialinfo.getBoolean("yem_ifgift")) {
DynamicObject yem_productmodel = yem_es_materialinfo.getDynamicObject("yem_productmodel"); DynamicObject yem_productmodel = yem_es_materialinfo.getDynamicObject("yem_productmodel");
if (yem_productmodel != null) { if (yem_productmodel != null) {
DynamicObject yem_products = yem_productmodel.getDynamicObject("yem_products"); DynamicObject yem_products = yem_productmodel.getDynamicObject("yem_products");
@ -1550,6 +1551,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
} }
// if ("Z".equals(key)) { // if ("Z".equals(key)) {
DynamicObjectCollection yem_multiconfig_s = yem_es_materialinfo.getDynamicObjectCollection("yem_multiconfig"); DynamicObjectCollection yem_multiconfig_s = yem_es_materialinfo.getDynamicObjectCollection("yem_multiconfig");
for (int j = 0; j < yem_multiconfig_s.size(); j++) { for (int j = 0; j < yem_multiconfig_s.size(); j++) {
@ -1565,6 +1567,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
yem_retrofitting.set("yem_qtyamt", yem_qtyamt); yem_retrofitting.set("yem_qtyamt", yem_qtyamt);
} }
// } // }
}
} else { } else {
yem_es_materialinfo_s.remove(i--); yem_es_materialinfo_s.remove(i--);
} }