From 41fc22db3c9bf56e337b7f708c68b2413aae3678 Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 3 Jan 2025 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=90=88=E5=90=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=B4=B7=E8=AE=B0=E5=8D=95=E5=90=88=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java | 2 +- .../com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java | 2 +- .../com/yem/wm/es/storagetrans/form/StorageTransEdit.java | 2 +- .../java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java index 20f54987..fbd8caaa 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java @@ -68,7 +68,7 @@ public class CreateCreditNoteBillOp extends AbstractOperationServicePlugIn imple debCredNote.set("yem_credittype",accFundDetail.get("yem_debcredtype"));//贷记类型 DynamicObject debCredNoteCurr = accFundDetail.getDynamicObject("yem_debcrednotecurr"); debCredNote.set("yem_currency",debCredNoteCurr);//结算币别 - debCredNote.set("yem_combo",accFundDetail.getString("yem_combo"));//出口 + debCredNote.set("yem_sale_type",accFundDetail.getString("yem_sale_type"));//出口 if(YEM.isNotEmpty(useDebCredNoteNo)){ useDebCredNoteNo = BusinessDataServiceHelper.loadSingle(useDebCredNoteNo.getPkValue(),useDebCredNoteNo.getDynamicObjectType().getName()); useRate = useDebCredNoteNo.getBigDecimal("yem_exrate"); diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java index 935067ee..92f627cc 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java @@ -88,7 +88,7 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn { debcrednote.set("yem_source", dataEntitie.getString("billno")); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); - debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 + debcrednote.set("yem_sale_type",dataEntitie.getString("yem_sale_type"));//出口 String products = ""; DynamicObject yem_bd_products = dataEntitie.getDynamicObject("yem_bd_products"); diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java index 13132da3..775b3dad 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java @@ -283,7 +283,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele yem_combo = "Z"; } } - this.getModel().setValue("yem_combo", yem_combo); + this.getModel().setValue("yem_sale_type", yem_combo); } } diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java index 70f0fb4d..dea9b6a1 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java @@ -571,7 +571,7 @@ public class DebCredUtils { debcrednote.set("yem_sourcebillno", dataEntitie.getString("billno")); debcrednote.set("yem_bd_products", dataEntitie.getDynamicObject("yem_bd_products")); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); - debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 + debcrednote.set("yem_sale_type",dataEntitie.getString("yem_sale_type"));//出口 debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); debcrednote.set("yem_groupcusfields", dataEntitie.getDynamicObject("yem_customer").getDynamicObject("yem_groupcustomers")); DynamicObject yem_currency = dataEntitie.getDynamicObject("yem_givecurrency"); @@ -676,7 +676,7 @@ public class DebCredUtils { debcrednote.set("yem_partscredit", "C"); debcrednote.set("yem_accessories", dataEntitie.getString("yem_accessories")); debcrednote.set("yem_wholemachine", dataEntitie.getString("yem_wholemachine")); - debcrednote.set("yem_combo",dataEntitie.getString("yem_combo"));//出口 + debcrednote.set("yem_sale_type",dataEntitie.getString("yem_sale_type"));//出口 // BigDecimal yem_userate = dataEntitie.getBigDecimal("yem_exrate"); // if (yem_userate.compareTo(BigDecimal.ZERO) == 0) {