From fa010ce6b4ae79abd73dc29031649f0597b87939 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 26 九月 2024 11:37:15 +0800
Subject: [PATCH] 接口路径修改

---
 src/main/java/com/zy/asrs/controller/MobileController.java   |   60 +++++++++++++++---------------
 src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java |    2 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java  |    4 +-
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 57c37d7..a6066c4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -425,37 +425,37 @@
         return mobileService.manDetlOriginOut(json,getUser());
     }
 
-    @RequestMapping("/plaDetl/packin/v1")
-    //@ManagerAuth(memo="pla鍏ュ簱")
-    @Transactional
-    public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
-        String locNo = json.get("locNo").toString();
-        JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
-        //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
-        if(!mobileService.checkMaximum(locNo,jsonArray.size())){
-            return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
-        }
-        for (Object o : jsonArray){
-            JSONObject jsonObject = (JSONObject)o;
-            String brand = jsonObject.get("brand").toString();
-            String batch = jsonObject.get("batch").toString();
-            Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
-            if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
-                return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
-            }
-            //娴嬭瘯
-            if(true){
-                User user = new User();
-                user.setUsername("test");
-                mobileService.plaPakin(brand,locNo,batch,packageNo,user);
-            }
-        }
-        //鍏ュ簱鎴愬姛鍚庝笂鎶RP
-        //openService.pakinReportErp(json);
-        return R.ok("鍏ュ簱鎴愬姛");
-    }
+//    @RequestMapping("/plaDetl/packin/v1")
+//    //@ManagerAuth(memo="pla鍏ュ簱")
+//    @Transactional
+//    public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
+//        String locNo = json.get("locNo").toString();
+//        JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+//        //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
+//        if(!mobileService.checkMaximum(locNo,jsonArray.size())){
+//            return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
+//        }
+//        for (Object o : jsonArray){
+//            JSONObject jsonObject = (JSONObject)o;
+//            String brand = jsonObject.get("brand").toString();
+//            String batch = jsonObject.get("batch").toString();
+//            Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
+//            if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+//                return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+//            }
+//            //娴嬭瘯
+//            if(true){
+//                User user = new User();
+//                user.setUsername("test");
+//                mobileService.plaPakin(brand,locNo,batch,packageNo,user);
+//            }
+//        }
+//        //鍏ュ簱鎴愬姛鍚庝笂鎶RP
+//        //openService.pakinReportErp(json);
+//        return R.ok("鍏ュ簱鎴愬姛");
+//    }
 
-    @RequestMapping("/plaDetl/packin/v1锛�")
+    @RequestMapping("/plaDetl/packin/v1")
     @ManagerAuth(memo="pla鍏ュ簱")
     @Transactional
     public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index bc6f449..9b74be9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -696,7 +696,7 @@
                     .setJson(JSONObject.toJSONString(requestParam))
                     .build()
                     .doPost();
-            log.info("璇锋眰杩斿洖鎶ユ枃锛歿}", response);
+            log.info("鍏ュ簱鍗曚笂鎶ヨ姹傝繑鍥炴姤鏂囷細{}", response);
             response = response.replace("\\", "");
             response = response.substring(1, response.length() - 1);
 
@@ -704,7 +704,7 @@
             JSONArray jsonArray = (JSONArray) jsonObject.get("");
             JSONObject jsonResult = (JSONObject) jsonArray.get(0);
             if (Cools.isEmpty(jsonResult.get("ErrorCode"))) {
-                throw new CoolException(jsonResult.get("errorMsg").toString());
+                throw new CoolException(jsonResult.get("ErrorMsg").toString());
             }
 
             int code = Integer.parseInt(jsonResult.get("ErrorCode").toString());
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
index 13e750a..7570e26 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -91,7 +91,7 @@
                     .build()
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
-
+            log.info("涓婃姤ERP鍑哄簱鍗曟嵁璇锋眰杩斿洖鎶ユ枃锛歿}", response);
             if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
                 throw new CoolException(jsonObject.get("ErrorMsg").toString());
             }

--
Gitblit v1.9.1