From 1817f88b4fa72201b83e2202c807fc7ac3239667 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 13 Apr 2023 15:53:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20=E5=AE=A1=E6=A0=B8=E9=80=81=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=20=E5=A2=9E=E5=8A=A0=E6=A0=B8=E5=AF=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
index 940b6d74..cf0c2b33 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -96,6 +96,11 @@ public class IoOrderResponse {
      */
     private Date updateTime;
 
+    /**
+     * 核对时间
+     */
+    private Date checkTime;
+
     /**
      * 验收人
      */

From 9a852742374a5c87089fbb6676f951df283f1907 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 13 Apr 2023 16:26:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 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 60e22d9e..bc365465 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -296,19 +296,38 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+
         IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
-        if (StrUtil.isNotEmpty(orderEntity.getSupplementNo()) || StrUtil.isNotEmpty(orderEntity.getUllageSupNo())) {
-            return ResultVOUtils.error(500, "单据已补单，无法撤回！");
-        }
-        if (orderEntity.getSyncStatus() != null && orderEntity.getSyncStatus() == 1) {
-            return ResultVOUtils.error(500, "单据已同步，无法撤回！");
-        }
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
+            if (StrUtil.isNotEmpty(orderEntity.getSupplementNo()) || StrUtil.isNotEmpty(orderEntity.getUllageSupNo())) {
+                return ResultVOUtils.error(500, "单据已补单，无法撤回！");
+            }
+            if (orderEntity.getSyncStatus() != null && orderEntity.getSyncStatus() == 1) {
+                return ResultVOUtils.error(500, "单据已同步，无法撤回！");
+            }
+            boolean result = orderService.rollbackOrder(billNo);
+            if (result) {
+                return ResultVOUtils.success();
+            }
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "撤回失败");
+        } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
 
-        boolean result = orderService.rollbackOrder(billNo);
-        if (result) {
-            return ResultVOUtils.success();
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
+            orderService.update(orderEntity);
+            return ResultVOUtils.success("撤回成功！");
+
+        } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
+            if (StrUtil.isBlank(billNo)) {
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+            }
+            boolean result = orderService.rollbackUnReOrder(billNo);
+            if (result) {
+                return ResultVOUtils.success("撤回成功！");
+            }
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "撤回失败");
         }
         return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "撤回失败");
+
     }