From 6f36a8cfec3fda3923b923af5eeda67e9c59c2db Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 29 Aug 2024 11:59:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoSplitFifoController.java          | 10 +++++
 .../service/inout/IoSplitFifoCodeService.java | 40 ++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java
index 4c95e4cc8..342a8b49b 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java
@@ -99,5 +99,15 @@ public class IoSplitFifoController extends BaseController {
         String invRemind = splitFifoCodeService.findInvRemind(workPlaceCode);
         return ResultVOUtils.success(invRemind);
     }
+    @GetMapping("/udiwms/ioSplit/findInvRemindByBillNo")
+    public BaseResponse findInvRemindByBillNo(IoSplitFifoCodeRequest splitFifoCodeRequest,
+                                      BindingResult bindingResult) {
+        Long workPlaceCode = splitFifoCodeRequest.getWorkPlaceCode();
+        if (workPlaceCode == null) {
+            return ResultVOUtils.error("工位编号不可为空!");
+        }
+        String invRemind = splitFifoCodeService.findInvRemindByBillNo(workPlaceCode);
+        return ResultVOUtils.success(invRemind);
+    }
 
 }
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 0051a42f8..6559a0b98 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
@@ -31,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -121,9 +118,9 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
                     String cpmctymc = item.getCpmctymc();
                     String batchNo = item.getBatchNo();
                     if (StrUtil.isBlank(batchNo)) {
-                        msg[0] = msg[0] + cpmctymc + "存量为：" + reCount;
+                        msg[0] = msg[0] + cpmctymc + "存量为：" + reCount+";";
                     } else {
-                        msg[0] = msg[0] + cpmctymc + "[" + batchNo + "]存量为：" + reCount;
+                        msg[0] = msg[0] + cpmctymc + "[" + batchNo + "]存量为：" + reCount+";";
                     }
                 }
             }
@@ -132,6 +129,37 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         return msg[0];
     }
 
+    /**
+     * 获取当前工位下的带处理单据 是否库存足够
+     *
+     * @param workPaceCode
+     * @return
+     */
+    public String findInvRemindByBillNo(Long workPaceCode) {
+        final String[] msg = {"库存预警提醒："};
+        if (workPaceCode == null || workPaceCode == 0l) return msg[0];
+
+        //2.遍历当前工位待处理的单据，根据orderTime排序
+        CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
+        collectOrderRequest.setWorkPlaceCode(workPaceCode);
+        collectOrderRequest.setTagStatus(1);
+        List<IoCollectOrderResponse> orderList = collectOrderMapper.filterList(collectOrderRequest);
+        if (CollUtil.isEmpty(orderList)) return msg[0];
+
+        orderList.forEach(item -> {
+            Integer invAlert = item.getInvAlert();
+            if (invAlert == 1) {
+                msg[0] = msg[0] + item.getBillNo() + "：正常; ";
+            } else if (invAlert == 2) {
+                msg[0] = msg[0] + item.getBillNo() + "：不足; ";
+            }
+        });
+
+        return msg[0];
+    }
+
+
+
 
     /**
      * 通过 单据 锁定库存