From 6ec3ec7d3c0c5126c4f5ab6fcde998efeffa27fd Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Mon, 10 Feb 2025 10:42:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=20=20=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E5=AE=A1=E6=A0=B8=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=202.=E5=8D=95=E4=B8=80=E7=AA=97=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E5=8D=95=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/tws/task/CusdecToDeclaredocxTask.java | 38 +++++++++++++++++-- .../storagetrans/op/StorageTransAuditOp.java | 4 +- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java index fe50f05e..2722f7cc 100644 --- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java +++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java @@ -111,10 +111,40 @@ public class CusdecToDeclaredocxTask extends AbstractTask { , new QFilter[]{new QFilter("id", QCP.equals, yemCustomsdocumentid)}); String yemCusdecstatusname = ""; if (dynamicObject != null) { + Date yemFiedatets = user.getDate("yem_fiedatets");//出口日期 yemCusdecstatusname = dynamicObject.getString("yem_cusdecstatusname");//申报状态 declaredocx.set("yem_declarationstatus", yemCusdecstatusname); + declaredocx.set("yem_customsnumber", yemEntryid); + declaredocx.set("yem_exportdate", yemFiedatets); + declaredocx.set("yem_reightamt", user.getBigDecimal("yem_feerate")); + declaredocx.set("yem_premiumamt", user.getBigDecimal("yem_insurrate")); + declaredocx.set("yem_reightamtbase", user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate"))); + declaredocx.set("yem_premiumamtbase", user.getBigDecimal("yem_insurrate").multiply(declaredocx.getBigDecimal("yem_pmamtrate"))); + declaredocx.set("yem_reightamtend" + , BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate"))) + , declaredocx.getBigDecimal("yem_exrate"), 2)); + BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable") + , declaredocx.getDynamicObject("yem_currencybase") + , declaredocx.getDynamicObject("yem_usdcurrency") + , yemFiedatets); + declaredocx.set("yem_usbexrate", exchangeRate); + declaredocx.set("yem_despportcodebase", user.getDynamicObject("yem_despportcodebase")); + declaredocx.set("yem_distinateportbase", user.getDynamicObject("yem_distinateportbase")); + declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase")); } else { + declaredocx.set("yem_declarationstatus", ""); + declaredocx.set("yem_customsnumber", 0); + declaredocx.set("yem_exportdate", null); + declaredocx.set("yem_reightamt", null); + declaredocx.set("yem_premiumamt", null); + declaredocx.set("yem_reightamtbase", 0); + declaredocx.set("yem_premiumamtbase", 0); + declaredocx.set("yem_reightamtend", 0); + declaredocx.set("yem_usbexrate", 0); + declaredocx.set("yem_despportcodebase", null); + declaredocx.set("yem_distinateportbase", null); + declaredocx.set("yem_transmodbase", null); declaredocx.set("yem_customsdocumentid", 0); } @@ -155,7 +185,7 @@ public class CusdecToDeclaredocxTask extends AbstractTask { String yemErroriskey = billno + "-" + yemDecmatericalname + "-" + yemCusqty + "-" + yemCusconsalesprice + "-" + yemCusamount + "-" + aLong; DynamicObject dynamicObject = maps.get(yemErroriskey); if (dynamicObject != null) { - object.set("yem_gmodel",dynamicObject.getString("yem_gmodel")); + object.set("yem_gmodel", dynamicObject.getString("yem_gmodel")); i = i - 1; } else { seq = seq + object.getString("seq") + ","; @@ -177,14 +207,14 @@ public class CusdecToDeclaredocxTask extends AbstractTask { declaredocx.set("yem_premiumamtbase", user.getBigDecimal("yem_insurrate").multiply(declaredocx.getBigDecimal("yem_pmamtrate"))); declaredocx.set("yem_reightamtend" , BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate"))) - ,declaredocx.getBigDecimal("yem_exrate"),2)); + , declaredocx.getBigDecimal("yem_exrate"), 2)); BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable") - , declaredocx.getDynamicObject("yem_usdcurrency") , declaredocx.getDynamicObject("yem_currencybase") + , declaredocx.getDynamicObject("yem_usdcurrency") , yemFiedatets); declaredocx.set("yem_usbexrate", exchangeRate); - declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") ); + declaredocx.set("yem_despportcodebase", user.getDynamicObject("yem_despportcodebase")); declaredocx.set("yem_distinateportbase", user.getDynamicObject("yem_distinateportbase")); declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase")); SaveServiceHelper.update(declaredocx); diff --git a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransAuditOp.java b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransAuditOp.java index 866ec51d..559a2428 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransAuditOp.java +++ b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransAuditOp.java @@ -232,9 +232,9 @@ public class StorageTransAuditOp extends AbstractOperationServicePlugIn { entryentitys.set(row, entryentity); row++; } + SaveServiceHelper.save(new DynamicObject[]{giftamountss}); + GiftAmount.Calculate(customer, org, products); } - SaveServiceHelper.save(new DynamicObject[]{giftamountss}); - GiftAmount.Calculate(customer, org, products); } }