From 062b3da2a21fabbe5fe76178522ad763e09ed1cc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 10:01:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d252ad8..1ce38b8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -54,21 +54,22 @@
     @PostMapping("/order/pakin/default/v1")
     @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
     public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakinParam param,
+                                           @RequestBody OpenOrderPakinJDParam param1,
                                            HttpServletRequest request) {
-        auth(appkey, param, request);
-        if (Cools.isEmpty(param)) {
+        auth(appkey, param1, request);
+        if (Cools.isEmpty(param1)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (Cools.isEmpty(param.getOrderNo())) {
+        if (Cools.isEmpty(param1.getOrderNo())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderType())) {
+        if (Cools.isEmpty(param1.getFormId())) {
             return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderDetails())) {
+        if (Cools.isEmpty(param1.getMatList())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
+        OpenOrderPakinParam param = new OpenOrderPakinParam(param1);
         openService.pakinOrderCreate(param);
         return R.ok();
     }
@@ -78,7 +79,7 @@
      * */
     @PostMapping("/digital/twin/inventory/quantity")
     public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
-                                           HttpServletRequest request) {
+                                            HttpServletRequest request) {
         auth(appkey, null, request);
         return R.ok(openService.inventoryQuantity());
     }
@@ -87,7 +88,7 @@
      * */
     @PostMapping("/digital/ownerAll/number/quantity")
     public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
-                                           HttpServletRequest request) {
+                                         HttpServletRequest request) {
         auth(appkey, null, request);
         return openService.ownerAllNumber();
     }
@@ -99,21 +100,23 @@
     @PostMapping("/order/pakout/default/v1")
     @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
     public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
-                                            @RequestBody OpenOrderPakoutParam param,
+                                            @RequestBody OpenOrderPakinJDParam param1,
                                             HttpServletRequest request) {
-        auth(appkey, param, request);
-        if (Cools.isEmpty(param)) {
+        auth(appkey, param1, request);
+        if (Cools.isEmpty(param1)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (Cools.isEmpty(param.getOrderNo())) {
+        if (Cools.isEmpty(param1.getOrderNo())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderType())) {
+        if (Cools.isEmpty(param1.getFormId())) {
             return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderDetails())) {
+        if (Cools.isEmpty(param1.getCreateDate())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
+        OpenOrderPakoutParam param = new OpenOrderPakoutParam(param1);
+
         openService.pakoutOrderCreate(param);
         return R.ok();
     }

--
Gitblit v1.9.1