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

fix：

Browse Source 
1.取消   销售出库增加单台赠送配件金额，合同一路携带，出库生成赠送配件信息时，数量根据机型+单台赠送配件金额汇总（同合同逻辑）
This commit is contained in:
25655 2025-03-01 18:11:31 +08:00
parent a71a6adf42
commit 8275c20286
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
View File

@ -1287,9 +1287,9 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
String name = dataEntity.getDataEntityType().getName(); String name = dataEntity.getDataEntityType().getName();
DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
BigDecimal sum = BigDecimal.ZERO; BigDecimal sum = BigDecimal.ZERO;
BigDecimal allonPush = BigDecimal.ZERO; boolean allonPush = true;
// boolean allonPush = true;
for (DynamicObject dynamicObject : materialinfo) { for (DynamicObject dynamicObject : materialinfo) {
BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交 BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交
BigDecimal saamtpriceclause; BigDecimal saamtpriceclause;
if ("yem_es_declaredocx".equals(name)) { if ("yem_es_declaredocx".equals(name)) {
@ -1301,18 +1301,13 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
} }
BigDecimal amt = adstamount.subtract(saamtpriceclause); BigDecimal amt = adstamount.subtract(saamtpriceclause);
BigDecimal yemExportmat = dynamicObject.getBigDecimal("yem_exportmat"); if (amt.compareTo(BigDecimal.ZERO) != 0) {
if (yemExportmat.compareTo(BigDecimal.ZERO) > 0) { allonPush = false;
allonPush = allonPush.add(yemExportmat);
} }
sum = sum.add(amt); sum = sum.add(amt);
dynamicObject.set("yem_exportmat", amt); dynamicObject.set("yem_exportmat", amt);
} }
dataEntity.set("yem_exportmatsum", sum); dataEntity.set("yem_exportmatsum", sum);
if (allonPush.compareTo(BigDecimal.ZERO) == 0) { dataEntity.set("yem_allonpush", allonPush);
dataEntity.set("yem_allonpush", true);
}else {
dataEntity.set("yem_allonpush", false);
}
} }
} }

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

@ -17,17 +17,17 @@ public class Application {
cosmic.setWebPath("E:/Cosmic/Comics_YXZG/YXZG-server/webapp"); cosmic.setWebPath("E:/Cosmic/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();