From 7bd457ce079ae29d574c2aa196f170c59ddf44b1 Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 26 Dec 2024 20:06:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=8A=A5=E9=94=99=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java | 2 ++ .../java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java | 2 +- .../shippingdetails/convert/ShippingDetialToStoraConvert.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java index 72806e53..c35dde5f 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java @@ -318,6 +318,8 @@ public class SaleOrderCreditFromEdit extends AbstractBillPlugIn implements Befor products = "CC"; } else if (number.contains("TLJ")) { products = "TLJ"; + }else if (number.contains("WJJ")){ + products = "WJJ"; } } QFilter qFilter2 = new QFilter("billstatus", QCP.equals, "C");// 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 d67a06b8..abd9744b 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 @@ -96,7 +96,7 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn { products = "CC"; } else if (number.contains("TLJ")) { products = "TLJ"; - }else if (number.contains("WJJ")||number.contains("WJZZJ")){ + }else if (number.contains("WJJ")){ products = "WJJ"; } } diff --git a/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java b/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java index 8b5ff0ce..9e0b2b51 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java @@ -124,6 +124,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn // 信保本位币金额 addNew.set("yem_creditamtbase", storageAmount.multiply(exrate)); //应收款金额1（本位币） + addNew.set("yem_paymentamt1_cd", bigDecimal); addNew.set("yem_paymentamt1_cdbase", storageAmount.multiply(exrate)); if ("USD".equals(currency)) { @@ -153,6 +154,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn // 保险费本位币金额 addNew.set("yem_insuranceamtbas_cd", insuranceamt.multiply(exrate)); + addNew.set("yem_amountowed", bigDecimal); // //SWIFT CODE // addNew.set("yem_swiftcode", dynamicObject.get("yem_swiftcode")); }