From 62903a6bcced0b44f4d9a4ca4bfab2f30ecdec25 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 01 十一月 2024 11:40:52 +0800
Subject: [PATCH] 入库呼叫agv取货修改

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   60 +++++++++++++++++++++++++++--
 src/main/java/com/zy/asrs/controller/MobileController.java    |   53 ++++----------------------
 src/main/java/com/zy/asrs/service/MobileService.java          |    6 +++
 3 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 42dea83..adbbe73 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,7 +13,6 @@
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
-import com.zy.common.constant.ApiInterfaceConstant;
 import com.zy.common.model.WrkDto;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
@@ -66,6 +65,12 @@
     @PostMapping("/agv/start")
     @ManagerAuth
     public R pdaAgvStart(@RequestBody Map<String,Object> map){
+
+        if (Cools.isEmpty(map.get("sta"))) {
+            return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+        } else if (Cools.isEmpty(map.get("inSta"))) {
+            return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
+        }
 //        HashMap<String, String> map1 = new HashMap<>();
 //        map1.put("agv0001","sta0001");
 //        String sta = map.get("sta").toString();
@@ -77,52 +82,10 @@
 //            return R.ok();
 //        }
         String sta = (String) map.get("sta"); // 鏆傚瓨浣�
-        String inSts = "1040"; // 鍏ュ簱绔欑偣
+        String inSta = (String) map.get("inSta"); // 鍏ュ簱绔欑偣
 
-        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
-        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
-        forwardAGVTaskParam.setTaskTyp("GT3");
-        forwardAGVTaskParam.setCtnrTyp("2");
-        forwardAGVTaskParam.setPriority("1");
-        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
-        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(sta,"05"));
-        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(inSts,"05"));
-        forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+        return mobileService.inLocCallAgv(sta, inSta);
 
-        String body = JSON.toJSONString(forwardAGVTaskParam);
-        String response = "";
-        boolean success = false;
-        try {
-            response = new HttpHandler.Builder()
-                    .setUri(ApiInterfaceConstant.AGV_IP)
-                    .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
-                    .setJson(body)
-                    .build()
-                    .doPost();
-            JSONObject jsonObject = JSON.parseObject(response);
-            if (jsonObject.getInteger("code").equals(0)) {
-                success = true;
-            } else {
-                log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP+ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
-            }
-        } catch (Exception e) {
-            log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
-        } finally {
-            try {
-                // 淇濆瓨鎺ュ彛鏃ュ織
-//                apiLogService.save(
-//                        "璇锋眰浠撳偍MES鐩樼偣鍗曚笂鎶ユ帴鍙�",
-//                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_SB_URL,
-//                        null,
-//                        "127.0.0.1",
-//                        JSON.toJSONString(collect),
-//                        response,
-//                        success
-//                );
-            } catch (Exception e) { log.error("", e); }
-        }
-
-        return R.error();
     }
 
     private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 8d77ce9..6c01385 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.OrderDetl;
@@ -14,6 +15,11 @@
 public interface MobileService {
 
     /**
+     * 鍏ュ簱鍛煎彨agv
+     */
+    R inLocCallAgv(String sta, String inSta);
+
+    /**
      * 缁勬墭
      */
     void comb(CombParam param, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index ee3f2f9..b51a018 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,14 +7,11 @@
 import com.core.common.*;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
-import com.zy.common.CodeRes;
+import com.zy.common.constant.ApiInterfaceConstant;
 import com.zy.common.constant.MesConstant;
 import com.zy.common.entity.Parameter;
 import com.zy.common.model.DetlDto;
@@ -77,6 +74,59 @@
 
 
     @Override
+    public R inLocCallAgv(String sta, String inSta) {
+
+        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+        forwardAGVTaskParam.setTaskTyp("GT3");
+        forwardAGVTaskParam.setCtnrTyp("2");
+        forwardAGVTaskParam.setPriority("1");
+        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(sta, "05"));
+        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(inSta, "05"));
+        forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+        String body = JSON.toJSONString(forwardAGVTaskParam);
+        String response = "";
+        String message = "";
+        boolean success = false;
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(ApiInterfaceConstant.AGV_IP)
+                    .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+                    .setJson(body)
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            jsonObject.getString("message");
+            if (jsonObject.getInteger("code").equals(0)) {
+                success = true;
+            } else {
+                log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+            }
+        } catch (Exception e) {
+            log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鍏ュ簱鍛煎彨agv",
+                        ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+
+        return success ? R.ok("鍛煎彨agv鎴愬姛") : R.parse(message);
+    }
+
+    @Override
     @Transactional
     public void comb(CombParam param, Long userId) {
         if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {

--
Gitblit v1.9.1