From c9df2458cca8f11e4fb4052fe43922fa1daff852 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 26 Aug 2024 17:55:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E6=8D=AE=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/dao/collect/IoCollectOrderMapper.java |  2 ++
 .../com/glxp/api/entity/collect/IoCollectOrder.java    |  7 +++++++
 .../glxp/api/service/inout/IoSplitFifoCodeService.java | 10 ++++++++--
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml    |  7 +++++++
 src/main/resources/schemas/schema_v2.4.sql             |  4 ++++
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java
index 005088904..15790b418 100644
--- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java
+++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java
@@ -5,6 +5,7 @@ import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +16,5 @@ public interface IoCollectOrderMapper extends BaseMapper<IoCollectOrder> {
 
     void clearOrder();
 
+    void updateInvAlert(@Param("id")Integer id,@Param("invAlert") Integer invAlert);
 }
diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
index 3a270a757..7f7e48066 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
@@ -208,5 +208,12 @@ public class IoCollectOrder implements Serializable {
     @ApiModelProperty(value = "排序时间")
     private Date orderTime;
 
+
+    /**
+     * 库存预警： 1:正常; 2:不足
+     */
+    @TableField(value = "invAlert")
+    private Integer invAlert;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
index 14d55d95a..80d6ae17a 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
@@ -21,6 +21,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.res.inout.IoSplitCodeResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -147,7 +148,8 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
             List<CollectOrderBizResponse> bizList = collectOrderBizMapper.filterList(bizRequest);
             if (CollUtil.isNotEmpty(bizList)){
                 //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数
-                autoAllocationWorkPace(splitMap,bizList);
+                Integer invAlert = autoAllocationWorkPace(splitMap, bizList);
+                collectOrderMapper.updateInvAlert(order.getId(),invAlert);
             }
         }
 
@@ -159,7 +161,8 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
      * @param bizList
      */
     @Transactional(rollbackFor = Exception.class)
-    void autoAllocationWorkPace(Map<Long, List<IoSplitCodeResponse>> splitMap, List<CollectOrderBizResponse> bizList) {
+    Integer autoAllocationWorkPace(Map<Long, List<IoSplitCodeResponse>> splitMap, List<CollectOrderBizResponse> bizList) {
+        Integer invAlert = 1;
         for (int i = 0; i < bizList.size(); i++) {
             CollectOrderBizResponse collectOrderBizResponse = bizList.get(i);
             Long relId = collectOrderBizResponse.getRelId();
@@ -192,10 +195,13 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
 
             if (count > 0){//不够分配
                 collectOrderBizMapper.updateAutoResCount(bizId,-count);
+                invAlert =  2;
             }else {
                 collectOrderBizMapper.updateAutoResCount(bizId,collectOrderBizResponse.getCount());
             }
         }
+
+        return invAlert;
     }
 
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 15a74dc04..acdc2d1f3 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -86,4 +86,11 @@
                 TRUNCATE io_collect_order_code_auto;
                 TRUNCATE io_collect_order_code_man
     </select>
+
+    <update id="updateInvAlert" parameterType="map">
+        UPDATE io_collect_order
+        SET invAlert = #{invAlert}
+        WHERE id = #{id}
+    </update>
+
 </mapper>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 5d06ebbba..be77ab957 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4260,3 +4260,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'workPlaceCount',
 CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount',
                          'int NULL DEFAULT NULL COMMENT ''自动扫描分配的工位存量''',
                          1);
+
+CALL Pro_Temp_ColumnWork('io_collect_order', 'invAlert',
+                         'int NULL DEFAULT b''0'' COMMENT ''库存预警： 1:正常; 2:不足''',
+                         1);