From 8275c202866b471dd8759b492708c7f8209c7093 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Sat, 1 Mar 2025 18:11:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E5=8F=96=E6=B6=88=20=20=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E5=8F=B0=E8=B5=A0=E9=80=81=E9=85=8D=E4=BB=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E4=B8=80=E8=B7=AF=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E5=BA=93=E7=94=9F=E6=88=90=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=A0=B9=E6=8D=AE=E6=9C=BA=E5=9E=8B+=E5=8D=95?= =?UTF-8?q?=E5=8F=B0=E8=B5=A0=E9=80=81=E9=85=8D=E4=BB=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=B1=87=E6=80=BB=EF=BC=88=E5=90=8C=E5=90=88=E5=90=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../es/storagetrans/form/StorageTransEdit.java | 15 +++++---------- src/main/java/kd/cosmic/Application.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java index c50d55cb..5d7eefc1 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java @@ -1287,9 +1287,9 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele String name = dataEntity.getDataEntityType().getName(); DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); BigDecimal sum = BigDecimal.ZERO; - BigDecimal allonPush = BigDecimal.ZERO; -// boolean allonPush = true; + boolean allonPush = true; for (DynamicObject dynamicObject : materialinfo) { + BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交 BigDecimal saamtpriceclause; if ("yem_es_declaredocx".equals(name)) { @@ -1301,18 +1301,13 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele } BigDecimal amt = adstamount.subtract(saamtpriceclause); - BigDecimal yemExportmat = dynamicObject.getBigDecimal("yem_exportmat"); - if (yemExportmat.compareTo(BigDecimal.ZERO) > 0) { - allonPush = allonPush.add(yemExportmat); + if (amt.compareTo(BigDecimal.ZERO) != 0) { + allonPush = false; } sum = sum.add(amt); dynamicObject.set("yem_exportmat", amt); } dataEntity.set("yem_exportmatsum", sum); - if (allonPush.compareTo(BigDecimal.ZERO) == 0) { - dataEntity.set("yem_allonpush", true); - }else { - dataEntity.set("yem_allonpush", false); - } + dataEntity.set("yem_allonpush", allonPush); } } diff --git a/src/main/java/kd/cosmic/Application.java b/src/main/java/kd/cosmic/Application.java index b30a4f27..da9708ed 100644 --- a/src/main/java/kd/cosmic/Application.java +++ b/src/main/java/kd/cosmic/Application.java @@ -17,17 +17,17 @@ public class Application { cosmic.setWebPath("E:/Cosmic/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();