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

fix:外销合同提交效验

Browse Source
This commit is contained in:
ljw 2024-09-14 17:48:04 +08:00
parent 56ca1a1883
commit 45117092b3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java
View File

@ -325,12 +325,12 @@ public class SalesOrderSubmitValidator extends AbstractValidator {
sumtotalamount.subtract(sumtowardamt).setScale(2, RoundingMode.HALF_UP) sumtotalamount.subtract(sumtowardamt).setScale(2, RoundingMode.HALF_UP)
)); ));
} }
} else if (yem_actremaamount.compareTo(BigDecimal.ZERO)>0){ } else {
// 实际来源总金额 // 实际来源总金额
BigDecimal sumtotalamount = object.getBigDecimal("yem_sumtotalamount"); BigDecimal sumtotalamount = object.getBigDecimal("yem_sumtotalamount");
// 预计去向总金额 // 预计去向总金额
BigDecimal sumtowardamt = object.getBigDecimal("yem_sumtowardamt"); BigDecimal sumtowardamt = object.getBigDecimal("yem_sumtowardamt");
if (debcuseamt.compareTo(sumtotalamount.subtract(sumtowardamt)) < 0) { if (yem_actremaamount.compareTo(BigDecimal.ZERO) < 0) {
sb.append(String.format("配件资金使用明细第 [ %s ] 行，贷记单使用金额 [ %s ] 超过其对应配件资金池 [ %s ] 分录第 [ %s ] 行，实际来源金额 [ %s ] - 预计去向金额 [ %s ] = [ %s ] !!\r\n", sb.append(String.format("配件资金使用明细第 [ %s ] 行，贷记单使用金额 [ %s ] 超过其对应配件资金池 [ %s ] 分录第 [ %s ] 行，实际来源金额 [ %s ] - 预计去向金额 [ %s ] = [ %s ] !!\r\n",
index + 1, index + 1,
debcuseamt.setScale(2, RoundingMode.HALF_UP), debcuseamt.setScale(2, RoundingMode.HALF_UP),
@ -569,7 +569,7 @@ public class SalesOrderSubmitValidator extends AbstractValidator {
DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
for (int i = 0; i < collection.size(); i++) { for (int i = 0; i < collection.size(); i++) {
// 业务分类为整机 // 业务分类为整机
if ("Z".equals(collection.get(i).getString("yem_businesssort"))&&!collection.get(i).getBoolean("yem_ifgift")) { if ("Z".equals(collection.get(i).getString("yem_businesssort")) && !collection.get(i).getBoolean("yem_ifgift")) {
String color = collection.get(i).getString("yem_color"); String color = collection.get(i).getString("yem_color");
if (color == null || color.isEmpty()) { if (color == null || color.isEmpty()) {
this.addMessage(dataEntitie, "商品明细第" + (i + 1) + "行，颜色必填"); this.addMessage(dataEntitie, "商品明细第" + (i + 1) + "行，颜色必填");