From 2bf8b67517bc3da7da258a59fc3e5a8c9734e9fc Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 31 Dec 2024 17:04:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=95=B4=E6=9C=BA=E3=80=81?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=90=88=E5=90=8C=EF=BC=9A=201=E3=80=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E3=80=81=E8=B4=B7=E8=AE=B0=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=EF=BC=9A=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=87=BA=E5=8F=A3=E3=80=81=E8=B4=B8=E6=98=93=E5=87=BA?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=B4=B8=E6=98=93=E5=87=BA?= =?UTF-8?q?=E5=8F=A3=E3=80=82=E5=90=88=E5=90=8C=E7=94=9F=E6=88=90=E8=B4=B7?= =?UTF-8?q?=E8=AE=B0=E5=8D=95=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AE=B5=E6=90=BA?= =?UTF-8?q?=E5=B8=A6=E5=88=B0=E8=B4=B7=E8=AE=B0=E5=8D=95=E3=80=82---1=202?= =?UTF-8?q?=E3=80=81=E6=89=8B=E5=B7=A5=E6=96=B0=E5=A2=9E=E8=B4=B7=E8=AE=B0?= =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E5=87=BA=E5=8F=A3=EF=BC=8C=E5=8F=AF=E9=80=89=E6=8B=A9=E8=B4=B8?= =?UTF-8?q?=E6=98=93=E5=87=BA=E5=8F=A3=EF=BC=9B---1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java | 1 + .../com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java | 2 ++ .../java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java | 3 +++ 3 files changed, 6 insertions(+) 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 42e85d7f..20f54987 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,6 +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"));//出口 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 aa7d89fe..935067ee 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,6 +88,8 @@ 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"));//出口 + String products = ""; DynamicObject yem_bd_products = dataEntitie.getDynamicObject("yem_bd_products"); if (yem_bd_products != null) { 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 1baf792c..70f0fb4d 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,6 +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_wholemachine", dataEntitie.getString("yem_wholemachine")); debcrednote.set("yem_groupcusfields", dataEntitie.getDynamicObject("yem_customer").getDynamicObject("yem_groupcustomers")); DynamicObject yem_currency = dataEntitie.getDynamicObject("yem_givecurrency"); @@ -675,6 +676,8 @@ 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"));//出口 + // BigDecimal yem_userate = dataEntitie.getBigDecimal("yem_exrate"); // if (yem_userate.compareTo(BigDecimal.ZERO) == 0) { if (yem_currency != null && yem_currencybase != null && yem_exratetable != null) {