From 75d81b507f5be0bedd6aa0f1ae9f830388bf7306 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Tue, 27 Aug 2024 18:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/inout/IoSplitInvResponse.java     |  1 +
 .../collect/IoCollectOrderService.java        |  3 +++
 .../service/inout/IoSplitFifoInvService.java  | 21 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
index 2d043e259..6e2d92e7d 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
@@ -122,6 +122,7 @@ public class IoSplitInvResponse {
     private String zxxsdycpbs;
     private String bzgg;
     private String useLevelUnit;
+    private Integer remindState;
 
 
 }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 5d4ff2677..b4b35bf73 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -22,6 +22,7 @@ import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inout.IoSplitFifoInv;
 import com.glxp.api.entity.inv.InvCountOrderDetailEntity;
 import com.glxp.api.entity.inv.InvCountOrderEntity;
 import com.glxp.api.entity.inv.InvCountSettingEntity;
@@ -467,6 +468,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Transactional(rollbackFor = Exception.class)
     public void orderTop(CollectOrderRequest collectOrderRequest) {
         Assert.notNull(collectOrderRequest.getId(), "id不能为空");
+        IoCollectOrder old = this.getById(collectOrderRequest.getId());
+        Assert.notNull(old,"不存在该库存预警设置");
         //TODO 新建单据未赋值排序时间
         this.lambdaUpdate()
                 .set(IoCollectOrder::getUpdateTime, new Date())
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 665ed8f7f..302a0d8d0 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -131,6 +131,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
 
     /**
      * 库存查询
+     * 若开启了库存预警，需要在库存上有一个状态显示预警状态   1:正常；2:低库存；3:负库存
      * @param ioSplitFifoInvRequest
      * @return
      */
@@ -142,7 +143,24 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
             int offset = (ioSplitFifoInvRequest.getPage() - 1) * ioSplitFifoInvRequest.getLimit();
             PageHelper.offsetPage(offset, ioSplitFifoInvRequest.getLimit());
         }
-        return this.baseMapper.filterList(ioSplitFifoInvRequest);
+        List<IoSplitInvResponse> ioSplitInvResponses = this.baseMapper.filterList(ioSplitFifoInvRequest);
+        if(CollUtil.isNotEmpty(ioSplitInvResponses)){
+            ioSplitInvResponses.forEach( t ->{
+                if(t.getEnableRemind()){
+                    int count = t.getReCount() - t.getInvRemindCount();
+                    if(count >= 0){
+                        t.setRemindState(2);
+                    }else{
+                        t.setRemindState(3);
+                    }
+                }else {
+                    t.setRemindState(1);
+                }
+            });
+            return ioSplitInvResponses;
+        }else{
+            return Collections.emptyList();
+        }
     }
 
     /**
@@ -157,6 +175,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
         this.lambdaUpdate()
                 .set(ioSplitFifoInvRequest.getEnableRemind() != null,IoSplitFifoInv::getEnableRemind,ioSplitFifoInvRequest.getEnableRemind()?1:0)
                 .set(ioSplitFifoInvRequest.getInvRemindCount() != null,IoSplitFifoInv::getInvRemindCount,ioSplitFifoInvRequest.getInvRemindCount())
+                .set(IoSplitFifoInv::getUpdateTime,new Date())
                 .eq(IoSplitFifoInv::getId,ioSplitFifoInvRequest.getId())
                 .update();
     }