预验收库存校验问题

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

@@ -951,17 +951,17 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
+//        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
         if (count <= 0) {
             if (count == -1) {
                 return ResultVOUtils.error(500, "该产品未入库");
             } else
                 return ResultVOUtils.error(500, "预验收库存数量不足！");
         } else {
-            if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
+//            if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
-                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
+//                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
-                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-            }
+//            }
             if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加
                 if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品
                     //无序列号，则可能存在多个预验收入库单

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

@@ -251,7 +251,7 @@ public class IoOrderDetailBizController extends BaseController {
             Integer count = invProductDetailService.vailStockCount(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getSupId(), null, outInvCode, null);
             count = IntUtil.value(count) - orderDetailBizEntity.getCount();
 
-            if (count <= 0) {
+            if (count < 0) {
                 if (count == -1) {
                     return ResultVOUtils.error(500, "该产品未入库");
                 } else

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -146,14 +146,14 @@ public class InvPreinOrderController extends BaseController {
             }
         }
 
-        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode());
+//        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode());
         if (count <= 0) {
             return ResultVOUtils.error(500, "预验收库存数量不足！");
         } else {
-            if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo())
+//            if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo())
-                    && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) {
+//                    && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) {
-                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-            }
+//            }
         }
         return ResultVOUtils.success(count);
     }