diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java index 17246562..c05481a2 100644 --- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java +++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java @@ -90,7 +90,7 @@ public class CusdecToDeclaredocxTask extends AbstractTask { String string = yemCodets + "-" + yemGname + "-" + yemGqty + "-" + yemDeclprice + "-" + yemDecltotal + "-" + number; maps.put(string, dynamicObject); } - //出口报关单//海运费(原币)、保费(原表)取单一窗口的的海运费、保费 + //出口报关单 QFilter yemRealbringbillno = new QFilter("yem_realbringbillno", QCP.equals, yemBillno); yemRealbringbillno.or(new QFilter("yem_bringbillno", QCP.equals, yemBillno)); String selectfield = DynamicObjectUtil.getSelectfields("yem_es_declaredocx", false); @@ -154,7 +154,6 @@ 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")); i = i - 1; } else { seq = seq + object.getString("seq") + ","; @@ -170,16 +169,11 @@ public class CusdecToDeclaredocxTask extends AbstractTask { 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")); 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}); diff --git a/src/main/java/kd/cosmic/Application.java b/src/main/java/kd/cosmic/Application.java index 659c8d34..3de0bf3d 100644 --- a/src/main/java/kd/cosmic/Application.java +++ b/src/main/java/kd/cosmic/Application.java @@ -1,5 +1,8 @@ package kd.cosmic; +import kd.bos.orm.query.QFilter; +import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.cosmic.server.Launcher; import kd.cosmic.server.Launcher; /** @@ -17,17 +20,17 @@ public class Application { cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp"); ////152 - cosmic.setClusterNumber("yxzg-topview-dev"); - cosmic.setTenantNumber("yxzg-topview-dev"); - cosmic.setServerIP("10.64.112.152"); - cosmic.setFileServerPathIPAndPort("", ""); - cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); +// cosmic.setClusterNumber("yxzg-topview-dev"); +// cosmic.setTenantNumber("yxzg-topview-dev"); +// cosmic.setServerIP("10.64.112.152"); +// cosmic.setFileServerPathIPAndPort("", ""); +// cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); System.setProperty("mq.debug.queue.tag", "wrxtest"); ////134 -// cosmic.setClusterNumber("yxzg-prod"); -// cosmic.setTenantNumber("yxzg-prod"); -// cosmic.setServerIP("10.64.111.134"); -// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); + cosmic.setClusterNumber("yxzg-prod"); + cosmic.setTenantNumber("yxzg-prod"); + cosmic.setServerIP("10.64.111.134"); + cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); cosmic.setStartWithQing(false); cosmic.start();