diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index ab8b32a7..f086f72a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -318,7 +318,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); // 校验子表数据 - checkSysSalesOrderChildList(sysSalesOrderChildList); + checkSysSalesOrderChildList(sysSalesOrder,sysSalesOrderChildList); for (int i = 0; i < s ;i++) { SysSalesOrderChild sysSalesOrderChild = sysSalesOrder.getSysSalesOrderChildList().get(i); @@ -331,30 +331,47 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService //自定义校验 - private void checkSysSalesOrderChildList(List sysSalesOrderChildList) { - // 检查物料数量是否为空 - boolean anyMaterialNum = sysSalesOrderChildList.stream() - .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNum() == null); - if (anyMaterialNum) { - throw new BusinessException("物料数量不能为空"); - } + private void checkSysSalesOrderChildList(SysSalesOrder sysSalesOrder,List sysSalesOrderChildList) { + String commonCurrency = sysSalesOrder.getCommonCurrency(); + if (RMB.equals(commonCurrency)) { + // 检查物料不含税单价RMB是否为空 + boolean anyMaterialNoRmb = sysSalesOrderChildList.stream() + .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNoRmb() == null); + if (anyMaterialNoRmb) { + throw new BusinessException("物料不含税单价RMB不能为空"); + } + } else { + // 检查物料不含税单价美元是否为空 + boolean anyMaterialNoUsd = sysSalesOrderChildList.stream() + .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNoUsd() == null); + if (anyMaterialNoUsd) { + throw new BusinessException("物料不含税单价美元不能为空"); + } - // 检查计划交付时间是否为空 - boolean anyDeliveryTime = sysSalesOrderChildList.stream() - .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getDeliveryTime() == null); - if (anyDeliveryTime) { - throw new BusinessException("计划交付时间不能为空"); - } - // 检查质保天数是否为空 - boolean anyExpiryDay = sysSalesOrderChildList.stream() - .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getExpiryDay() == null); - if (anyExpiryDay) { - throw new BusinessException("质保天数不能为空"); + // 检查物料数量是否为空 + boolean anyMaterialNum = sysSalesOrderChildList.stream() + .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNum() == null); + if (anyMaterialNum) { + throw new BusinessException("物料数量不能为空"); + } + + // 检查计划交付时间是否为空 + boolean anyDeliveryTime = sysSalesOrderChildList.stream() + .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getDeliveryTime() == null); + if (anyDeliveryTime) { + throw new BusinessException("计划交付时间不能为空"); + } + + // 检查质保天数是否为空 + boolean anyExpiryDay = sysSalesOrderChildList.stream() + .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getExpiryDay() == null); + if (anyExpiryDay) { + throw new BusinessException("质保天数不能为空"); + } } } - /** * 修改销售订单 *