代码备份

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

@@ -773,12 +773,12 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
 
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
                 if (bussinessTypeEntity.isUse()) {
                     codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
@@ -1185,12 +1185,12 @@ public class IoCodeTempController extends BaseController {
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
 
                 if (bussinessTypeEntity.isUse()) {
@@ -2147,12 +2147,12 @@ public class IoCodeTempController extends BaseController {
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-                }
+//                }
-                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
+//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
+//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-                }
+//                }
                 //计算实际数量
                 codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getActCount(udiRelevanceResponse));
             } else if (udiRelevanceResponses.size() == 0) {

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -1,7 +1,5 @@
 package com.glxp.api.res.collect;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -133,7 +131,5 @@ public class CollectOrderBizResponse {
     /**
      * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
      */
-    @TableField(value = "autoTagStatus")
-    @ApiModelProperty(value = "autoTagStatus")
     private Integer autoTagStatus;
 }

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

@@ -517,7 +517,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 .eq(IoCollectOrder::getId, collectOrderRequest.getId()).update();
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void finishOrder(CollectOrderRequest collectOrderRequest) {
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);

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

@@ -392,6 +392,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount()));
                         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);
                     }
 
                 } else {
@@ -409,6 +410,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - removeCount);
                         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);
                     }
                 }
             }
@@ -546,6 +548,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitCodeEntity.getTotalCount()));
                 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);
             }
             if (count >= needCount) {
                 break;

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

@@ -54,12 +54,14 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         List<IoSplitFifoCodeEntity> splitFifoCodeEntities =
                 list(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
-                        .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
+
                         .eq(IoSplitFifoCodeEntity::getRelId, relId)
                         .eq(StrUtil.isNotEmpty(batchNo), IoSplitFifoCodeEntity::getBatchNo, batchNo)
                         .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo)
                 );
 
+//        暂时不穿todo
+//           .eq(StrUtil.isNotEmpty(busType), IoSplitFifoCodeEntity::getBusType, busType)
         return splitFifoCodeEntities;
     }