自动赋码问题修改

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -286,7 +286,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
 
-        if (list == null){
+        if (list == null) {
             return ResultVOUtils.error(500, "未查到此业务单据");
         }
 

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

@@ -96,7 +96,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
         //2.如果拆零表为空，则自动从预出库队列中获拉取数据
         if (CollUtil.isEmpty(ioSplitCodeEntities)) {
-            addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), IntUtil.value(collectOrderBiz.getCount()));
+            addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), IntUtil.value(collectOrderBiz.getUnTagCount()));
             ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
         }
         //3.如果拆零表不为空，则开始扣除数量
@@ -244,7 +244,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
                         if (splitFifoInv != null) {
                             splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + removeCount);
-                            splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - removeCount);
+                            int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - removeCount;
+                            splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
                             splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
                             splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
                             splitFifoInvService.updateById(splitFifoInv);
@@ -266,7 +267,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
             }
         }
-        List<Long> removeIds = new ArrayList<>();
         for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
 //            UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(collectOrderBiz.getRelId());
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
@@ -330,7 +330,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 }
                 for (int i = 0; i < quotient; i++) {
                     IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i);
-                    removeIds.add(splitFifoCodeEntity.getId());
                     collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl()));
                     collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
                             .codeIdFk(splitFifoCodeEntity.getId())
@@ -346,6 +345,17 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                             .createTime(new Date())
                             .updateTime(new Date())
                             .build());
+                    splitFifoCodeService.removeById(splitFifoCodeEntity.getId());
+                    IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
+                    if (splitFifoInv != null) {
+                        splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
+                        int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
+                        splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
+                        splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                        splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                        splitFifoInvService.updateById(splitFifoInv);
+                    }
+
                 }
             }
             //.如果拆零，拆零表扣除

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

@@ -85,6 +85,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setWorkPlaceQueueCode(orderEntity.getWorkPlaceQueueCode());
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
                     splitCodeEntity.setBusType(orderEntity.getSplitBusType());
+                    splitCodeEntity.setInBactchNo(System.currentTimeMillis() + "");
                     splitCodeEntity.setId(null);
                     splitCodeEntities.add(splitCodeEntity);
                 }