Merge branch 'dev-zzs' into test
This commit is contained in:
commit
23b0248f08
@ -1169,6 +1169,7 @@ 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;
|
||||||
|
boolean allonPush = true;
|
||||||
for (DynamicObject dynamicObject : materialinfo) {
|
for (DynamicObject dynamicObject : materialinfo) {
|
||||||
|
|
||||||
BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交
|
BigDecimal adstamount = dynamicObject.getBigDecimal("yem_adstamount"); // 销售出库金额-提交
|
||||||
@ -1182,9 +1183,13 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
|
|||||||
}
|
}
|
||||||
|
|
||||||
BigDecimal amt = adstamount.subtract(saamtpriceclause);
|
BigDecimal 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);
|
||||||
}
|
}
|
||||||
dataEntity.set("yem_exportmatsum", sum);
|
dataEntity.set("yem_exportmatsum", sum);
|
||||||
|
dataEntity.set("yem_allonpush", allonPush);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user