库存添加业务类型

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -829,6 +829,7 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode());
                 orderEntity.setProductType(1);
                 orderEntity.setFifoSplit(addOrderRequest.getFifoSplit());
+                orderEntity.setSplitBusType(addOrderRequest.getSplitBusType());
                 orderService.insertOrder(orderEntity);
             }
 

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

@@ -334,5 +334,11 @@ public class IoOrderEntity {
      */
     @TableField(value = "fifoSplit")
     private Integer fifoSplit;
+    /**
+     * 上货方式：1:拆零上货；2:整取上货
+     */
+    @TableField(value = "splitBusType")
+    private String splitBusType;
+
 
 }

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

@@ -203,5 +203,13 @@ public class IoSplitFifoCodeEntity implements Serializable {
     @TableField(value = "fifoSplit")
     private Integer fifoSplit;
 
+
+    /**
+     * 业务类型
+     */
+    @TableField(value = "busType")
+    @ApiModelProperty(value = "业务类型")
+    private String busType;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -51,4 +51,8 @@ public class AddOrderRequest {
      * 上货方式：1:拆零上货；2:整取上货
      */
     private Integer fifoSplit;
+    /**
+     * 工位上下货业务类型
+     */
+    private String splitBusType;
 }

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

@@ -1242,7 +1242,7 @@ public class IoCheckInoutService {
             //若未拆零预出库单据则进入到拆零队列
             if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
                 List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
-                fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode());
+                fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode(), orderEntity.getSplitBusType());
                 //更新待处理库存不足单据
                 splitFifoCodeService.updateAllInvAlert(orderEntity.getWorkPlaceCode());
             } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {

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

@@ -393,7 +393,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
                 }
                 splitMap.put(relId, newioSplitCodeResponses);
             }
-
             collectOrderBizMapper.updateAutoResCount(bizId, 0);
         }
 

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

@@ -32,7 +32,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
     IoSplitFifoCodeService splitFifoCodeService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void insertInv(List<IoCodeEntity> codeList, Long workPlaceCode) {
+    public void insertInv(List<IoCodeEntity> codeList, Long workPlaceCode, String busType) {
 
         List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
         if (CollUtil.isNotEmpty(codeList)) {
@@ -45,6 +45,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     ioSplitFifoCodeEntity.setScanCount(IntUtil.value(ioSplitFifoCodeEntity.getScanCount()) + IntUtil.value(codeEntity.getCount()));
                     ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
                     ioSplitFifoCodeEntity.setUpdateTime(new Date());
+                    ioSplitFifoCodeEntity.setBusType(busType);
                     splitFifoCodeService.updateById(ioSplitFifoCodeEntity);
                 } else {
                     IoSplitFifoCodeEntity splitCodeEntity = new IoSplitFifoCodeEntity();
@@ -55,6 +56,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setSupId(Long.parseLong(codeEntity.getSupId()));
                     splitCodeEntity.setWorkPlaceCode(workPlaceCode);
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
+                    splitCodeEntity.setBusType(busType);
                     splitCodeEntity.setId(null);
                     splitCodeEntities.add(splitCodeEntity);
                 }
@@ -62,11 +64,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
         }
         splitFifoCodeService.saveBatch(splitCodeEntities);
         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"));
+
+            IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
             if (splitFifoInv != null) {
                 splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
                 splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
@@ -77,6 +76,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .invCode(ioSplitFifoCodeEntity.getInvCode())
                         .productType(ioSplitFifoCodeEntity.getProductType())
                         .fifoSplit(ioSplitFifoCodeEntity.getFifoSplit())
+                        .busType(ioSplitFifoCodeEntity.getBusType())
                         .relId(ioSplitFifoCodeEntity.getRelId())
                         .batchNo(ioSplitFifoCodeEntity.getBatchNo())
                         .produceDate(ioSplitFifoCodeEntity.getProduceDate())
@@ -142,6 +142,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                 .eq(IoSplitFifoInv::getRelId, ioSplitFifoCodeEntity.getRelId())
                 .eq(IoSplitFifoInv::getWorkPlaceCode, ioSplitFifoCodeEntity.getWorkPlaceCode())
                 .eq(StrUtil.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo()), IoSplitFifoInv::getBatchNo, ioSplitFifoCodeEntity.getBatchNo())
+                .eq(StrUtil.isNotEmpty(ioSplitFifoCodeEntity.getBusType()), IoSplitFifoInv::getBusType, ioSplitFifoCodeEntity.getBusType())
                 .eq(ioSplitFifoCodeEntity.getSupId() != null, IoSplitFifoInv::getSupId, ioSplitFifoCodeEntity.getSupId()).last("limit 1"));
 
         return splitFifoInv;