预警状态

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;
 
 
 }

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())

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();
     }