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

Revert "fix："

Browse Source 
This reverts commit d376fdd257.
This commit is contained in:
ljw 2025-01-21 11:34:13 +08:00
parent 1aceca2caf
commit 45e149d5bf
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
String string = yemCodets + "-" + yemGname + "-" + yemGqty + "-" + yemDeclprice + "-" + yemDecltotal + "-" + number; String string = yemCodets + "-" + yemGname + "-" + yemGqty + "-" + yemDeclprice + "-" + yemDecltotal + "-" + number;
maps.put(string, dynamicObject); maps.put(string, dynamicObject);
} }
//出口报关单//海运费（原币）、保费（原表）取单一窗口的的海运费、保费 //出口报关单
QFilter yemRealbringbillno = new QFilter("yem_realbringbillno", QCP.equals, yemBillno); QFilter yemRealbringbillno = new QFilter("yem_realbringbillno", QCP.equals, yemBillno);
yemRealbringbillno.or(new QFilter("yem_bringbillno", QCP.equals, yemBillno)); yemRealbringbillno.or(new QFilter("yem_bringbillno", QCP.equals, yemBillno));
String selectfield = DynamicObjectUtil.getSelectfields("yem_es_declaredocx", false); 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; 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"));
i = i - 1; i = i - 1;
} else { } else {
seq = seq + object.getString("seq") + ","; seq = seq + object.getString("seq") + ",";
@ -170,16 +169,11 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
declaredocx.set("yem_customsnumber", yemEntryid); declaredocx.set("yem_customsnumber", yemEntryid);
declaredocx.set("yem_exportdate", yemFiedatets); declaredocx.set("yem_exportdate", yemFiedatets);
declaredocx.set("yem_customsdocumentid", id); 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") BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable")
, declaredocx.getDynamicObject("yem_currencybase") , declaredocx.getDynamicObject("yem_currencybase")
, declaredocx.getDynamicObject("yem_usdcurrency") , 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_distinateportbase", user.getDynamicObject("yem_distinateportbase"));
declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase"));
SaveServiceHelper.update(declaredocx); SaveServiceHelper.update(declaredocx);
SaveServiceHelper.save(new DynamicObject[]{declaredocx}); SaveServiceHelper.save(new DynamicObject[]{declaredocx});

21
src/main/java/kd/cosmic/Application.java
View File

@ -1,5 +1,8 @@
package kd.cosmic; package kd.cosmic;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.cosmic.server.Launcher;
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"); cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
////152 ////152
cosmic.setClusterNumber("yxzg-topview-dev"); // cosmic.setClusterNumber("yxzg-topview-dev");
cosmic.setTenantNumber("yxzg-topview-dev"); // cosmic.setTenantNumber("yxzg-topview-dev");
cosmic.setServerIP("10.64.112.152"); // cosmic.setServerIP("10.64.112.152");
cosmic.setFileServerPathIPAndPort("", ""); // cosmic.setFileServerPathIPAndPort("", "");
cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); // cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
System.setProperty("mq.debug.queue.tag", "wrxtest"); System.setProperty("mq.debug.queue.tag", "wrxtest");
////134 ////134
// cosmic.setClusterNumber("yxzg-prod"); cosmic.setClusterNumber("yxzg-prod");
// cosmic.setTenantNumber("yxzg-prod"); cosmic.setTenantNumber("yxzg-prod");
// cosmic.setServerIP("10.64.111.134"); cosmic.setServerIP("10.64.111.134");
// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
cosmic.setStartWithQing(false); cosmic.setStartWithQing(false);
cosmic.start(); cosmic.start();