From cc4e0bd14edeeb43268216f18c70be62e482b8f0 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 05 二月 2026 14:31:17 +0800
Subject: [PATCH] 初始化未完成

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4fddbba..f9a2ea6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,7 +4,10 @@
 import com.core.annotations.AppAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
 import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.TokenVo;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OpenService;
 import com.zy.common.model.DetlDto;
@@ -37,7 +40,21 @@
     @Autowired
     private OpenService openService;
 
-    @PostMapping("/order/matSync/default/v2")
+    @PostMapping("/getToken")
+    public synchronized R getToken(@RequestBody(required = true) TokenParam param,
+                                   HttpServletRequest request){
+        authNew(param, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        TokenVo tokenVo = new TokenVo();
+        String token = Cools.enToken(System.currentTimeMillis() + param.getAppId(), param.getAppSecret());
+        tokenVo.setToken(token);
+        tokenVo.setValidTime(30);
+        return R.ok().add(tokenVo);
+    }
+
+    @PostMapping("/erp/mat/sync")
 //    @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
     public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
                                       @RequestBody(required = false) MatSyncParam.MatParam param,
@@ -181,6 +198,23 @@
         }
     }
 
+    private void authNew(TokenParam param, Object obj, HttpServletRequest request) {
+        log.info("{}鎺ュ彛琚闂紱appSecret:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", param.getAppSecret(), JSON.toJSONString(obj));
+        request.setAttribute("cache", obj);
+        if (!auth) {
+            return;
+        }
+        if (Cools.isEmpty(param.getAppId()) || Cools.isEmpty(param.getAppSecret())) {
+            throw new CoolException("璁よ瘉澶辫触锛岃纭appId鍜宎ppSecret鏃犺锛�");
+        }
+        if (!param.getAppId().contains("FNWMS")){
+            throw new CoolException("璁よ瘉澶辫触锛岃纭appId鏃犺锛�");
+        }
+        if (!APP_KEY_LIST.contains(param.getAppSecret())) {
+            throw new CoolException("璁よ瘉澶辫触锛岃纭appSecret鏃犺锛�");
+        }
+    }
+
     public static void main(String[] args) {
         // 1
         System.out.println("======================================");
@@ -248,9 +282,9 @@
         if (Cools.isEmpty(param.getItem())) {
             return R.error("UPC[item]涓嶈兘涓虹┖");
         }
-//        if (Cools.isEmpty(param.getSupplier())) {
-//            return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
-//        }
+        if (Cools.isEmpty(param.getSupplier())) {
+            return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+        }
         if (Cools.isEmpty(param.getStaNo())) {
             return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
         }
@@ -402,6 +436,7 @@
             return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
         }
         if (param.getArm_no()>4){
+            openService.taskArmOrderResult(param);
             return R.ok();
         }
 
@@ -524,6 +559,23 @@
     }
 
     /**
+     * PDA妫�绱㈢洏鐐规暟閲�
+     */
+    @PostMapping("/pick/v1/getPickList")
+    @AppAuth(memo = "PDA妫�绱㈢洏鐐规暟閲�")
+    public synchronized R getPickList(@RequestHeader(required = false) String appkey,
+                                        @RequestBody PdaPickListParam param,
+                                        HttpServletRequest request) {
+//        auth(appkey, param, request);
+
+        List<PickWrkDetlListParam> list = openService.getPickList(param);
+        if (!list.isEmpty()) {
+            return R.ok(list);
+        }
+        return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+    }
+
+    /**
      * PDA缁戝畾瑙ｇ粦
      */
     @PostMapping("/agv/bindCtnrAndBin/v1")

--
Gitblit v1.9.1