From 780e206fbbdc070432abdbf716a6d0fbf5613c8f Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 29 Nov 2024 09:16:16 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E9=80=9A=E8=BF=87=E9=94=80=E5=94=AE=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E5=90=AB=E7=A8=8E=E4=B8=8D=E5=90=AB=E7=A8=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E5=88=AB=E5=88=A4=E6=96=AD=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E5=8D=95=E4=BB=B7=E7=BE=8E=E5=85=83=E5=92=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7=E4=BA=BA=E6=B0=91=E5=B8=81?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A1=AB=E5=86=99=E4=BA=86=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=B8=8D=E5=8F=AF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysSalesOrderServiceImpl.java        | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

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<SysSalesOrderChild> 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<SysSalesOrderChild> sysSalesOrderChildList) {
-        // 检查物料数量是否为空
-        boolean anyMaterialNum = sysSalesOrderChildList.stream()
-                .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNum() == null);
-        if (anyMaterialNum) {
-            throw new BusinessException("物料数量不能为空");
-        }
+    private void checkSysSalesOrderChildList(SysSalesOrder sysSalesOrder,List<SysSalesOrderChild> 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("质保天数不能为空");
+            }
         }
     }
 
-
     /**
      * 修改销售订单
      *