From 9e53b59e30bba2149900aa2cc9f22ad0ab445edd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 13:47:27 +0800
Subject: [PATCH] u8单据对接开发完成

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

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..e4019ca 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -34,7 +34,7 @@
     private OpenService openService;
 
     @PostMapping("/order/matSync/default/v1")
-    @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+    @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾")
     public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                       @RequestBody(required = false) MatSyncParam param,
                                       HttpServletRequest request){
@@ -67,6 +67,7 @@
      * 娣诲姞鍏ュ簱鍗�
      */
     @PostMapping("/order/pakin/default/v1")
+    @AppAuth(memo = "鍏ュ簱鍗曚笅鍙�")
     public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakinParam param,
                                            HttpServletRequest request) {
@@ -77,10 +78,13 @@
         if (Cools.isEmpty(param.getOrderNo())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
         }
+        if (Cools.isEmpty(param.getOptType())) {
+            return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+        }
         if (Cools.isEmpty(param.getOrderType())) {
             return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderDetails())) {
+        if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
         openService.pakinOrderCreate(param);
@@ -102,7 +106,7 @@
      * 娣诲姞鍑哄簱鍗�
      */
     @PostMapping("/order/pakout/default/v1")
-    @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+    @AppAuth(memo = "鍑哄簱鍗曚笅鍙�")
     public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                             @RequestBody OpenOrderPakoutParam param,
                                             HttpServletRequest request) {
@@ -110,19 +114,16 @@
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (Cools.isEmpty(param.getLgort())) {
-            return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
-        }
-        if (!param.getLgort().equals("5006")) {
-            return R.ok();
-        }
         if (Cools.isEmpty(param.getOrderNo())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
         }
         if (Cools.isEmpty(param.getOrderType())) {
             return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
         }
-        if (Cools.isEmpty(param.getOrderDetails())) {
+        if (Cools.isEmpty(param.getOptType())) {
+            return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+        }
+        if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
             return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
         }
         openService.pakoutOrderCreate(param);
@@ -140,6 +141,14 @@
         return R.ok().add(openService.pakoutOrderComplete(param));
     }
 
+    /**
+     * 缁撴灉涓婃姤鎺ュ彛-娴嬭瘯
+     */
+    @PostMapping("/order/resultExport/default/v1")
+    public synchronized R orderPakoutComplete(String param) {
+       return new R(200,"鎿嶄綔鎴愬姛");
+    }
+
 
     /**
      * 搴撳瓨缁熻
@@ -152,7 +161,7 @@
     }
 
     private void auth(String appkey, Object obj, HttpServletRequest request) {
-        log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+        log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
         request.setAttribute("cache", obj);
         if (!auth) {
             return;

--
Gitblit v1.9.1