补充库存字段

src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java

@@ -25,7 +25,7 @@ public class IoSplitFifoInv implements Serializable {
      */
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "工位编码")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 部门编码
@@ -46,70 +46,77 @@ public class IoSplitFifoInv implements Serializable {
      */
     @TableField(value = "productType")
     @ApiModelProperty(value = "产品类型")
-    private String productType;
+    private Integer productType;
 
     /**
      * 上货方式：1:拆零上货；2:整取上货
      */
     @TableField(value = "fifoSplit")
     @ApiModelProperty(value = "上货方式：1:拆零上货；2:整取上货")
-    private String fifoSplit;
+    private Integer fifoSplit;
 
     /**
      * 产品ID主键
      */
     @TableField(value = "relId")
     @ApiModelProperty(value = "产品ID主键")
-    private Integer relId;
+    private Long relId;
 
     /**
      * 批次号
      */
     @TableField(value = "batchNo")
     @ApiModelProperty(value = "批次号")
-    private Integer batchNo;
+    private String batchNo;
 
     /**
      * 生产日期
      */
     @TableField(value = "produceDate")
     @ApiModelProperty(value = "生产日期")
-    private Date produceDate;
+    private String produceDate;
 
     /**
      * 失效日期
      */
     @TableField(value = "expireDate")
     @ApiModelProperty(value = "失效日期")
-    private Date expireDate;
+    private String expireDate;
 
     /**
      * 供应商ID
      */
     @TableField(value = "supId")
     @ApiModelProperty(value = "供应商ID")
-    private Integer supId;
+    private Long supId;
 
     /**
      * 入库数量
      */
     @TableField(value = "inCount")
     @ApiModelProperty(value = "入库数量")
-    private String inCount;
+    private Integer inCount;
 
     /**
      * 出库数量
      */
     @TableField(value = "outCount")
     @ApiModelProperty(value = "出库数量")
-    private String outCount;
+    private Integer outCount;
+
+    /**
+     * 出库数量
+     */
+    @TableField(value = "reCount")
+    @ApiModelProperty(value = "剩余数量")
+    private Integer reCount;
 
     /**
      * 锁定数量
      */
     @TableField(value = "lockCount")
     @ApiModelProperty(value = "锁定数量")
-    private String lockCount;
+    private Integer lockCount;
 
 
     /**
@@ -133,5 +140,14 @@ public class IoSplitFifoInv implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField(value = "enableRemind")
+    @ApiModelProperty(value = "是否开启库存预警")
+    private Boolean enableRemind;
+
+    @TableField(value = "invRemindCount")
+    @ApiModelProperty(value = "工位库存预警数量")
+    private Integer invRemindCount;
+
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.inout;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoSplitFifoCodeEntity;
 import com.glxp.api.util.IntUtil;
@@ -17,6 +18,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.entity.inout.IoSplitFifoInv;
 import com.glxp.api.dao.inout.IoSplitFifoInvMapper;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoSplitFifoInv> {
@@ -24,6 +26,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
     @Resource
     IoSplitFifoCodeService splitFifoCodeService;
 
+    @Transactional(rollbackFor = Exception.class)
     public void insertInv(List<IoCodeEntity> codeList, Long workPlaceCode) {
 
         List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
@@ -56,12 +59,24 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
 
         //todo  根据工位，产品ID，批次号，供应商  进行库存表新增或插入
 
+        for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
+            IoSplitFifoInv splitFifoInv = getOne(new LambdaQueryWrapper<IoSplitFifoInv>()
+                    .eq(IoSplitFifoInv::getRelId, ioSplitFifoCodeEntity.getRelId())
+                    .eq(IoSplitFifoInv::getWorkPlaceCode, ioSplitFifoCodeEntity.getWorkPlaceCode())
+                    .eq(StrUtil.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo()), IoSplitFifoInv::getBatchNo, ioSplitFifoCodeEntity.getBatchNo())
+                    .eq(ioSplitFifoCodeEntity.getSupId() != null, IoSplitFifoInv::getSupId, ioSplitFifoCodeEntity.getSupId()).last("limit 1"));
+            if (splitFifoInv != null) {
+//                splitFifoInv.setInCount();
+            }
+
+        }
+
         ThreadUtil.execAsync(() -> {
 //                        splitFifoCodeService.preAllotInv(orderEntity.getWorkPlaceCode());
         });
     }
 
-
+    @Transactional(rollbackFor = Exception.class)
     public void removeInv(List<IoCodeEntity> codeList, Long workPlaceCode) {
         List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
         if (CollUtil.isNotEmpty(codeList)) {

src/main/java/com/glxp/api/service/inv/InvCountOrderService.java

@@ -86,8 +86,6 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
     @Resource
     private UdiRelevanceDao udiRelevanceDao;
     @Resource
-    private UdiRelevanceService udiRelevanceService;
-    @Resource
     private IBasicBussinessTypeService basicBussinessTypeService;
     @Resource
     private InvCountSettingService invCountSettingService;