From 0b8d75223e0e4f9e00cd06c1e82884ece434eef3 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Fri, 11 Jul 2025 16:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImsOutInventoryServiceImpl.java   |  6 ++++++
 .../resources/mapper/ims/ImsInventoryMapper.xml    | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java
index 4fb8b74..45bcf3b 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java
@@ -170,6 +170,12 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService
         Long outId = imsOutInventory.getOutId();
         if (StringUtils.isNotNull(imsOutInventoryDetailAddList))
         {
+            if(Long.valueOf(3).equals(imsOutInventory.getOutType())) {
+                boolean flag = imsOutInventoryDetailAddList.stream().anyMatch(item -> Objects.isNull(item.getIntoDetailId()));
+                if(flag) {
+                    throw new ServiceException("请选择入库批次");
+                }
+            }
             List<ImsOutInventoryDetail> list = new ArrayList<>();
             long totalPriceSum = 0L;
             for (ImsOutInventoryDetailAdd imsOutInventoryDetailAdd : imsOutInventoryDetailAddList)
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml
index ec70016..0351f79 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="minNum != null">min_num,</if>
             <if test="maxNum != null">max_num,</if>
             <if test="materialNum != null">material_num,</if>
-            <if test="inventoryStatus != null">inventory_status,</if>
+            inventory_status,
             <if test="remark != null">remark,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -111,6 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maxNum != null">#{maxNum},</if>
             <if test="materialNum != null">#{materialNum},</if>
             <if test="inventoryStatus != null">#{inventoryStatus},</if>
+            <if test="inventoryStatus == null">
+                inventory_status = CASE
+                WHEN material_num <![CDATA[ < ]]> min_num THEN 2
+                WHEN material_num <![CDATA[ > ]]> max_num THEN 3
+                ELSE 1
+                END,
+            </if>
             <if test="remark != null">#{remark},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -119,6 +126,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            <if test="updateTime != null">#{updateTime},</if>-->
          </trim>
         on duplicate key update material_num = material_num + #{materialNum},
+        inventory_status = CASE
+                WHEN material_num <![CDATA[ < ]]> min_num THEN 2
+                WHEN material_num <![CDATA[ > ]]> max_num THEN 3
+                ELSE 1
+                END,
             update_by = #{updateBy},
             update_time = #{updateTime}
     </insert>