From 2e77aa6bd5ec4d94f1bd43a01aff51dfdb983d32 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 4 Sep 2024 19:42:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E8=BD=AC=E5=BE=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/collect/CollectOrderBizResponse.java  |  9 +++++++++
 .../service/inout/IoSplitFifoCodeService.java | 20 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index 0f53bc37d..e9b70c3a8 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -1,5 +1,7 @@
 package com.glxp.api.res.collect;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -127,4 +129,11 @@ public class CollectOrderBizResponse {
 
     private Integer autoResCount;
     private String replaceCode;
+
+    /**
+     * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
+     */
+    @TableField(value = "autoTagStatus")
+    @ApiModelProperty(value = "autoTagStatus")
+    private Integer autoTagStatus;
 }
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 f0e00e09b..5ed788e9c 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
@@ -210,8 +210,24 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         IoSplitFifoInvRequest ioSplitFifoInvRequest = new IoSplitFifoInvRequest();
         ioSplitFifoInvRequest.setWorkPlaceCode(workPlaceCode);
         List<IoSplitInvResponse> ioSplitInvResponses = splitFifoInvService.filterList(ioSplitFifoInvRequest);
-        if (CollUtil.isEmpty(ioSplitInvResponses)) return false;
-        Map<Long, List<IoSplitInvResponse>> splitInvMap = ioSplitInvResponses.stream().collect(Collectors.groupingBy(IoSplitInvResponse::getRelId));
+        if (CollUtil.isEmpty(ioSplitInvResponses)){
+            collectOrderMapper.updateInvAlert(order.getId(), 2);
+
+            if (CollUtil.isNotEmpty(bizList)) {
+                for (int i = 0; i < bizList.size(); i++) {
+                    CollectOrderBizResponse collectOrderBizResponse = bizList.get(i);
+                    Integer count = 0;
+                    if (IntUtil.value(collectOrderBizResponse.getAutoResCount()) < 0) {
+                        count = 0 - IntUtil.value(collectOrderBizResponse.getAutoResCount());
+                    } else {
+                        count = collectOrderBizResponse.getCount();
+                    }
+                    collectOrderBizMapper.updateAutoResCount(collectOrderBizResponse.getId(), -count);
+                }
+            }
+            return false;
+        }
+        Map<Long, List<IoSplitInvResponse>> splitInvMap = ioSplitInvResponses.stream().filter(item -> item.getRelId() != null).collect(Collectors.groupingBy(IoSplitInvResponse::getRelId));
 
         if (CollUtil.isNotEmpty(bizList)) {
             if (lockType == 1) {