待配货，待校验提交修改

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

@@ -693,7 +693,7 @@ public class IoCodeTempController extends BaseController {
             }
 
 
-            if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) {
+            if (IntUtil.value(addOrderRequest.getOrderType()) == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) {
 
                 boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo());
                 if (!isBillExit) {
@@ -744,13 +744,13 @@ public class IoCodeTempController extends BaseController {
             }
 
             //是否边扫边校验
-            if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
+            if (bussinessTypeEntity.getCheckWebNew() == 1 && bussinessTypeEntity.isCheckEnable()) {
                 String errMsg = ioCheckInoutService.checkCode(codeEnttity);
                 if (errMsg != null) {
                     return ResultVOUtils.error(500, errMsg);
                 } else
                     codeTempService.insert(codeEnttity);
-            } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
+            } else if (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable()) {
                 String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
                 if (errMsg != null) {
                     return ResultVOUtils.error(500, errMsg);
@@ -1071,11 +1071,6 @@ public class IoCodeTempController extends BaseController {
     }
 
 
-
-
-
-
-
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/addCode/updateBindSup")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)

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

@@ -325,12 +325,12 @@ public class IoOrderController extends BaseController {
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
             return ResultVOUtils.error(500, "单据还未扫码或和扫码校验存在异常无法提交！");
         }
-
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
             if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
-                String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
-
 
+                if (bussinessTypeEntity.getCheckWebNew() == 1) {
+                    String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
                     if (StrUtil.isNotEmpty(errMsg)) {
                         return ResultVOUtils.error(500, errMsg);
                     }
@@ -343,6 +343,29 @@ public class IoOrderController extends BaseController {
                     orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
                     orderService.update(orderEntity);
                     checkInoutService.check(addOrderRequest.getBillNo());
+                } else {
+                    String errMsg = checkInoutService.bizNoPiCheck(orderDetailBizEntities, orderEntity);
+                    if (StrUtil.isNotEmpty(errMsg)) {
+                        return ResultVOUtils.error(500, errMsg);
+                    }
+                    orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo());
+                    for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
+                        IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();
+                        BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity);
+                        orderDetailBizEntity.setId(null);
+                        orderDetailBizEntity.setCount(IntUtil.value(orderDetailCodeEntity.getReCount()));
+                        getSomeBiz(orderDetailBizEntities, orderDetailBizEntity);
+                        orderDetailBizService.insert(orderDetailBizEntity);
+                    }
+                    saveOrderWeb(addOrderRequest);
+                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                    orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+                    orderService.update(orderEntity);
+                    ioAddInoutService.dealProcess(orderEntity);
+                    checkInoutService.check(addOrderRequest.getBillNo());
+                }
+
+
             } else {
                 return ResultVOUtils.error(500, "单据校验提交失败,请先录入业务单据！");
             }
@@ -557,6 +580,7 @@ public class IoOrderController extends BaseController {
         for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
             IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();
             BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity);
+            orderDetailBizEntity.setCount(IntUtil.value(orderDetailCodeEntity.getReCount()));
             orderDetailBizEntity.setId(null);
             getSomeBiz(orderDetailBizEntities, orderDetailBizEntity);
             orderDetailBizService.insert(orderDetailBizEntity);

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

@@ -296,8 +296,6 @@ public class IoAddInoutService {
         }
 
         if (fromVailPi != null && fromVailPi == 2)
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_ALLOCATE);
-        else
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
 
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
@@ -15,6 +16,7 @@ import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -140,6 +142,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         }
         return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest);
     }
+
     @Override
     public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
         QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();
@@ -161,12 +164,15 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     IoCheckInoutService checkInoutService;
     @Resource
     IoOrderService orderService;
+    @Resource
+    IBasicBussinessTypeService bussinessTypeService;
 
     @Override
     public List<IoOrderDetailBizEntity> checkOrderList(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         List<IoOrderDetailBizEntity> orderDetailBizEntities = findByOrderId(orderId);
-        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_ALLOCATE) {
+        BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(orderEntity.getAction());
+        if (bussinessTypeEntity.getCheckWebNew() == 2) {
             checkInoutService.bizNoPiCheck(orderDetailBizEntities, orderEntity);
         } else {
             List<IoOrderDetailCodeEntity> codeEntities = orderDetailCodeService.findByOrderId(orderId);