From 4fc6bbf066bbcca5f5cc56ec1d1c87534301e145 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 15 Mar 2022 16:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/IOOrderStatusController.java         | 19 +++++++++++++++++++
 .../main/resources/application-pro.properties |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java
index ef57591..fedce97 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java
@@ -83,6 +83,24 @@ public class IOOrderStatusController {
 //    }
 
     @PostMapping("/spms/inout/order/deleteStatus")
+    public BaseResponse deleteStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest,
+                                     BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        boolean b = ioOrderStatusService.updateOrderStatus(orderStatusFilterRequest);
+        if (orderStatusFilterRequest.getStatus() == 2) {
+            orderService.deleteByOrderId(orderStatusFilterRequest.getOrderId());
+        }
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+
+    @PostMapping("/spms/inout/order/updateStatus")
     public BaseResponse updateStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest,
                                      BindingResult bindingResult) {
 
@@ -99,4 +117,5 @@ public class IOOrderStatusController {
         return ResultVOUtils.success("更新成功");
     }
 
+
 }
diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties
index 235d258..9c17893 100644
--- a/api-admin/src/main/resources/application-pro.properties
+++ b/api-admin/src/main/resources/application-pro.properties
@@ -44,7 +44,9 @@ STOCK_PRINT_POST=http://139.159.187.130:8080/UDI_WMS_MC/udiwms/stockprint/post
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 #UDIWMS_IP=http://139.159.187.130:8080/UDI_WMS_MC
+#UDI管理系统地址
 UDIWMS_IP=http://127.0.0.1:9991
+#自助平台地址
 SPMS_IP=http://127.0.0.1:9996
 API_KEY=1101
 API_SECRET=zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L