等待处理单据提交问题

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

@@ -181,6 +181,7 @@ public class IoOrderController extends BaseController {
     public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
 
         //校验单据是否已完成
+
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
 
@@ -201,6 +202,10 @@ public class IoOrderController extends BaseController {
                     return ResultVOUtils.error(500, "单据未校验完成,请检查后重新提交！");
                 }
                 saveOrderWeb(addOrderRequest);
+                IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+                orderService.update(orderEntity);
                 checkInoutService.check(addOrderRequest.getBillNo());
             } else {
                 return ResultVOUtils.error(500, "单据未校验完成,请先录入业务单据！");

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

@@ -329,6 +329,13 @@ public class IoCheckInoutService {
     //业务单正向校验
     public String bizOrderCheck(List<IoOrderDetailBizEntity> orderDetailBizEntities, List<IoOrderDetailCodeEntity> orderDetailCodeEntities) {
         String errMsg = "";
+        //初始化默认值
+        for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+            codeEntity.setCheckSuccess(false);
+        }
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            bizEntity.setCheckSuccess(false);
+        }
         for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
             for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
                 if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
@@ -359,18 +366,27 @@ public class IoCheckInoutService {
 
 
     /**
-     *  && checkProductDate(bizEntity, codeEntity) == null
+     * && checkProductDate(bizEntity, codeEntity) == null
-     *                         && checkExpireDate(bizEntity, codeEntity) == null
+     * && checkExpireDate(bizEntity, codeEntity) == null
+     * && checkProductDate(bizEntity, codeEntity) == null
+     * && checkExpireDate(bizEntity, codeEntity) == null
      */
 
     //扫码单反向校验
     public String codeOrderCheck(List<IoOrderDetailCodeEntity> orderDetailCodeEntities, List<IoOrderDetailBizEntity> orderDetailBizEntities) {
+
+        //初始化默认值
+        for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+            codeEntity.setCheckSuccess(false);
+        }
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            bizEntity.setCheckSuccess(false);
+        }
+
         for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
             for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
                 if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
                         && checkBatchNo(bizEntity, codeEntity) == null
-                        && checkProductDate(bizEntity, codeEntity) == null
-                        && checkExpireDate(bizEntity, codeEntity) == null
                 ) {
 
                     if (checkCount(bizEntity, codeEntity) == null) {