接930条,最后一版逻辑是FCA+起运港,现在新增合同拼的是目的港

This commit is contained in:
ljw 2024-12-25 09:21:09 +08:00
parent d681e7a2e0
commit 297fdd3b15

View File

@ -392,8 +392,8 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
break; break;
case "yem_shipports": case "yem_shipports":
genShipPortEnName(this.getModel()); genShipPortEnName(this.getModel());
genTradeTermsShipports(model, view);//贸易术语=价格条款+起运港.工厂
genTradeTerms(model.getDataEntity(true), view); genTradeTerms(model.getDataEntity(true), 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"));
@ -401,7 +401,7 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
break; break;
case "yem_destports": case "yem_destports":
genDescPortEnName(this.getModel()); genDescPortEnName(this.getModel());
genTradeTermsDestports(model, view);//贸易术语=价格条款+目的.工厂 genTradeTermsShipports(model, view);//贸易术语=价格条款+起运.工厂
genTradeTerms(model.getDataEntity(true), view); genTradeTerms(model.getDataEntity(true), view);
carryFinalDestination(model, view); carryFinalDestination(model, view);
break; break;