diff --git a/src/main/java/com/yem/wm/es/declaredocx/op/DeclaredocxComparisonOp.java b/src/main/java/com/yem/wm/es/declaredocx/op/DeclaredocxComparisonOp.java index 279fb2fc..3ff820f7 100644 --- a/src/main/java/com/yem/wm/es/declaredocx/op/DeclaredocxComparisonOp.java +++ b/src/main/java/com/yem/wm/es/declaredocx/op/DeclaredocxComparisonOp.java @@ -1,5 +1,6 @@ package com.yem.wm.es.declaredocx.op; +import com.yem.wm.utils.BigDecimalUtils; import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.YEM; import kd.bos.coderule.api.CodeRuleInfo; @@ -171,16 +172,39 @@ public class DeclaredocxComparisonOp extends AbstractOperationServicePlugIn { } else { String yemCusdecstatusname = user.getString("yem_cusdecstatusname");//申报状态 extracted(data, "出口报关报关单号【" + declaredocxbillno + "】成功匹配单一窗口报关单;\n", id, declaredocxbillno, yemBillno); +// declaredocx.set("yem_declarationstatus", yemCusdecstatusname); +// declaredocx.set("yem_customsnumber", yemEntryid); +// declaredocx.set("yem_exportdate", yemFiedatets); +// declaredocx.set("yem_customsdocumentid", id); +// 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_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")); declaredocx.set("yem_declarationstatus", yemCusdecstatusname); declaredocx.set("yem_customsnumber", yemEntryid); declaredocx.set("yem_exportdate", yemFiedatets); declaredocx.set("yem_customsdocumentid", id); + 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")); SaveServiceHelper.update(declaredocx); SaveServiceHelper.save(new DynamicObject[]{declaredocx}); if ("结关".equals(yemCusdecstatusname) && !YEM.isEmpty(yemFiedatets)) {