violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
1.  订舱通知单审核 报错
2.单一窗口报关单对比
This commit is contained in:
25655 2025-02-10 10:42:07 +08:00
parent b933551b42
commit 6ec3ec7d3c
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
View File

@ -111,10 +111,40 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
, new QFilter[]{new QFilter("id", QCP.equals, yemCustomsdocumentid)}); , new QFilter[]{new QFilter("id", QCP.equals, yemCustomsdocumentid)});
String yemCusdecstatusname = ""; String yemCusdecstatusname = "";
if (dynamicObject != null) { if (dynamicObject != null) {
Date yemFiedatets = user.getDate("yem_fiedatets");//出口日期
yemCusdecstatusname = dynamicObject.getString("yem_cusdecstatusname");//申报状态 yemCusdecstatusname = dynamicObject.getString("yem_cusdecstatusname");//申报状态
declaredocx.set("yem_declarationstatus", yemCusdecstatusname); 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 { } 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); declaredocx.set("yem_customsdocumentid", 0);
} }
@ -155,7 +185,7 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
String yemErroriskey = billno + "-" + yemDecmatericalname + "-" + yemCusqty + "-" + yemCusconsalesprice + "-" + yemCusamount + "-" + aLong; String yemErroriskey = billno + "-" + yemDecmatericalname + "-" + yemCusqty + "-" + yemCusconsalesprice + "-" + yemCusamount + "-" + aLong;
DynamicObject dynamicObject = maps.get(yemErroriskey); DynamicObject dynamicObject = maps.get(yemErroriskey);
if (dynamicObject != null) { if (dynamicObject != null) {
object.set("yem_gmodel",dynamicObject.getString("yem_gmodel")); object.set("yem_gmodel", dynamicObject.getString("yem_gmodel"));
i = i - 1; i = i - 1;
} else { } else {
seq = seq + object.getString("seq") + ","; 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_premiumamtbase", user.getBigDecimal("yem_insurrate").multiply(declaredocx.getBigDecimal("yem_pmamtrate")));
declaredocx.set("yem_reightamtend" declaredocx.set("yem_reightamtend"
, BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate"))) , 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") BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable")
, declaredocx.getDynamicObject("yem_usdcurrency")
, declaredocx.getDynamicObject("yem_currencybase") , declaredocx.getDynamicObject("yem_currencybase")
, declaredocx.getDynamicObject("yem_usdcurrency")
, yemFiedatets); , yemFiedatets);
declaredocx.set("yem_usbexrate", exchangeRate); 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_distinateportbase", user.getDynamicObject("yem_distinateportbase"));
declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase")); declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase"));
SaveServiceHelper.update(declaredocx); SaveServiceHelper.update(declaredocx);

2
src/main/java/com/yem/wm/es/storagetrans/op/StorageTransAuditOp.java
View File

@ -232,11 +232,11 @@ public class StorageTransAuditOp extends AbstractOperationServicePlugIn {
entryentitys.set(row, entryentity); entryentitys.set(row, entryentity);
row++; row++;
} }
}
SaveServiceHelper.save(new DynamicObject[]{giftamountss}); SaveServiceHelper.save(new DynamicObject[]{giftamountss});
GiftAmount.Calculate(customer, org, products); GiftAmount.Calculate(customer, org, products);
} }
} }
}
/** /**