From a16afe7d27719fd52522eba4159c8aa107699639 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Wed, 26 Feb 2025 09:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/mapper/WmsInstockOrderMapper.java     |  2 ++
 .../impl/WmsInstockOrderServiceImpl.java      | 21 +++++++++++++------
 .../mapper/wms/WmsInstockOrderMapper.xml      | 16 +++++++++++++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java
index c7da5e5..434ad04 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java
@@ -22,4 +22,6 @@ public interface WmsInstockOrderMapper extends BaseMapperPlus<WmsInstockOrder, W
     List<WmsConfiguration> selectAuditByConfiguration(@Param("warehouseId") Long warehouseId);
 
     List<WmsConfiguration> selectUnAuditByConfiguration(@Param("warehouseId") Long warehouseId);
+
+    List<WmsConfiguration> selectAllConfiguration(@Param("warehouseId") Long warehouseId);
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
index 8b2f382..66859c9 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
@@ -157,14 +157,23 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
         }
         String inStockOrder = order + orderDate + orderLast;
         WmsInstockOrder add = MapstructUtils.convert(bo, WmsInstockOrder.class);
-        List<WmsConfiguration> unAuditConfigurationList = baseMapper.selectUnAuditByConfiguration(bo.getWarehouseId());
-        if (CollectionUtils.isNotEmpty(unAuditConfigurationList)){
+        List<WmsConfiguration> allConfigurationList = baseMapper.selectAllConfiguration(bo.getWarehouseId());
+        if (CollectionUtils.isNotEmpty(allConfigurationList)){
+            //查询入库单不用审批的配置
+            List<WmsConfiguration> unAuditConfigurationList = baseMapper.selectUnAuditByConfiguration(bo.getWarehouseId());
+            if (CollectionUtils.isNotEmpty(unAuditConfigurationList)){
+                add.setAuditStatus(auditPass);
+            }else {
+                //查询入库单是否有对应审批配置
+                List<WmsConfiguration> configurationList = baseMapper.selectAuditByConfiguration(bo.getWarehouseId());
+                if (CollectionUtils.isNotEmpty(configurationList)){
+                    add.setAuditBy(configurationList.get(0).getAuditBy());
+                }
+            }
+        }else {
             add.setAuditStatus(auditPass);
         }
-        List<WmsConfiguration> configurationList = baseMapper.selectAuditByConfiguration(bo.getWarehouseId());
-        if (CollectionUtils.isNotEmpty(configurationList)){
-            add.setAuditBy(configurationList.get(0).getAuditBy());
-        }
+
         validEntityBeforeSave(add);
         add.setInstockCode(inStockOrder);
         add.setCreateBy(username);
diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml
index 6bb3e35..230825f 100644
--- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml
+++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml
@@ -43,8 +43,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             hwmom.dbo.wms_configuration x
         where
-            x.approve_type != '2'
+            ((x.approve_range = '1'
+                and x.warehouse_id = #{warehouseId})
+                or x.approve_range = '0')
           and x.node_code = 'in'
           and x.approve_yes_no = '1'
     </select>
+    <select id="selectAllConfiguration" resultType="org.dromara.wms.domain.WmsConfiguration"
+            parameterType="java.lang.Long">
+        SELECT
+            x.*
+        FROM
+            hwmom.dbo.wms_configuration x
+        where
+            (x.approve_range = '1'
+                and x.warehouse_id = #{warehouseId})
+                or x.approve_range = '0')
+                and x.node_code = 'in'
+    </select>
 </mapper>