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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zzs 2025-04-07 10:09:49 +08:00
commit 5f734b112b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1288,6 +1288,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
BigDecimal sum = BigDecimal.ZERO; BigDecimal sum = BigDecimal.ZERO;
boolean allonPush = true; boolean allonPush = true;
BigDecimal amt = BigDecimal.ZERO;
for (DynamicObject dynamicObject : materialinfo) { for (DynamicObject dynamicObject : materialinfo) {
BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交 BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交
@ -1300,13 +1301,13 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
saamtpriceclause = dynamicObject.getBigDecimal("yem_saamtpriceclause"); // 销售金额（价格条款） saamtpriceclause = dynamicObject.getBigDecimal("yem_saamtpriceclause"); // 销售金额（价格条款）
} }
BigDecimal amt = adstamount.subtract(saamtpriceclause); amt = adstamount.subtract(saamtpriceclause);
if (amt.compareTo(BigDecimal.ZERO) != 0) {
allonPush = false;
}
sum = sum.add(amt); sum = sum.add(amt);
dynamicObject.set("yem_exportmat", amt); dynamicObject.set("yem_exportmat", amt);
} }
if (amt.compareTo(BigDecimal.ZERO) != 0) {
allonPush = false;
}
dataEntity.set("yem_exportmatsum", sum); dataEntity.set("yem_exportmatsum", sum);
dataEntity.set("yem_allonpush", allonPush); dataEntity.set("yem_allonpush", allonPush);
} }