From 6a7127cd7acd86529d076f52d35858a49991e333 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Feb 2023 18:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E5=BE=85=E5=A4=84=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   |  5 ++++
 .../service/inout/IoCheckInoutService.java    | 24 +++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index ca070cb5a..7065c3882 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/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, "单据未校验完成,请先录入业务单据！");
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 341ce801d..682db432b 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/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
-     *                         && checkExpireDate(bizEntity, codeEntity) == null
+     * && checkProductDate(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) {