Merge remote-tracking branch 'origin/master'

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 (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) {
+
+            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, "撤回失败");
+
     }
 
 

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -96,6 +96,11 @@ public class IoOrderResponse {
      */
     private Date updateTime;
 
+    /**
+     * 核对时间
+     */
+    private Date checkTime;
+
     /**
      * 验收人
      */