库存明细ID外键

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -12,6 +12,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
 import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 import com.glxp.api.req.basic.PrescribeBindWorkRequest;
@@ -47,8 +48,6 @@ public class IoCollectOrderController extends BaseController {
 
     @Resource
     IoCollectOrderBizService collectOrderBizService;
-    @Resource
-    IoCollectCodeService collectCodeService;
 
     @GetMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
@@ -201,6 +200,17 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 更新biz信息
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/order/biz/save")
+    public BaseResponse saveOrderBiz(@RequestBody IoCollectOrderBiz collectOrderBiz) {
+        collectOrderBizService.updateById(collectOrderBiz);
+        return ResultVOUtils.success("更新成功");
+    }
+
 
     /**
      * 单据挂起

src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java

@@ -39,7 +39,7 @@ public class IoSplitDesOrderDetail implements Serializable {
 
     @TableField(value = "invId")
     @ApiModelProperty(value = "")
-    private Integer invId;
+    private Long invId;
 
     @TableField(value = "relId")
     @ApiModelProperty(value = "")

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

@@ -211,5 +211,10 @@ public class IoSplitFifoCodeEntity implements Serializable {
     @ApiModelProperty(value = "业务类型")
     private String busType;
 
+    @TableField(value = "invIdFk")
+    @ApiModelProperty(value = "库存ID外键")
+    private Long invIdFk;
+
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -24,7 +24,7 @@ import lombok.NoArgsConstructor;
 public class IoSplitFifoInv implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "")
-    private Integer id;
+    private Long id;
 
     /**
      * 工位编码

src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java

@@ -116,4 +116,5 @@ public class CollectOrderBizRequest extends ListPageRequest {
     private Long relId;
 
     private Integer fifoSplit;
+    private String replaceCode;
 }

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.lang.Assert;
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -62,7 +63,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                 }
             }
         }
-        splitFifoCodeService.saveBatch(splitCodeEntities);
+
         for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
 
             IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
@@ -70,7 +71,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                 splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
                 splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
             } else {
-                IoSplitFifoInv ioSplitFifoInv = IoSplitFifoInv.builder()
+                splitFifoInv = IoSplitFifoInv.builder()
+                        .id(IdUtil.getSnowflakeNextId())
                         .workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode())
                         .deptCode(ioSplitFifoCodeEntity.getDeptCode())
                         .invCode(ioSplitFifoCodeEntity.getInvCode())
@@ -92,10 +94,11 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .remark(null)
                         .enableRemind(false)
                         .invRemindCount(0).build();
-                save(ioSplitFifoInv);
+                save(splitFifoInv);
             }
-
+            ioSplitFifoCodeEntity.setInvIdFk(splitFifoInv.getId());
         }
+        splitFifoCodeService.saveBatch(splitCodeEntities);
 
         ThreadUtil.execAsync(() -> {
 //                        splitFifoCodeService.preAllotInv(orderEntity.getWorkPlaceCode());