From ea311bea6773822a7672411a6967277379aefa68 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 18:25:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |   77 +++++++++++++++++++++++---------------
 1 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 66d1b6e..4663e33 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -10,7 +10,6 @@
 import com.zy.asrs.entity.AgvWrkMast;
 import com.zy.asrs.entity.param.AgvTaskCreateParam;
 import com.zy.asrs.entity.param.AgvTaskParam;
-import com.zy.asrs.entity.param.AgvTaskkDescribeParam;
 import com.zy.asrs.mapper.AgvWrkMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.utils.HttpHandler;
@@ -20,11 +19,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -35,6 +30,9 @@
 
     @Value("${agv.taskCreatePath}")
     private String taskCreatePath;
+
+    @Value("${agv.taskCancelPath}")
+    private String taskCancelPath;
 
     @Value("${agv.containerMoveInPath}")
     private String containerMoveInPath;
@@ -72,12 +70,12 @@
         return true;
     }
 
-    public int startWrk(List<AgvWrkMast> agvWrkMastList, String taskType) throws IOException {
+    public int startWrk(AgvWrkMast agvWrkMast) throws IOException {
 
         AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
-        agvTaskCreateParam.setTaskType(taskType);
+        //agvTaskCreateParam.setTaskType(taskType);
 
-        getRequestParam(agvTaskCreateParam,agvWrkMastList);
+        getRequestParam(agvTaskCreateParam,agvWrkMast);
 
         return doHttpRequest(agvTaskCreateParam,"鎼繍浠诲姟涓嬪彂",url, taskCreatePath,null,"127.0.0.1");
 
@@ -143,6 +141,22 @@
         //return this.baseMapper.selectReadyAgvWrkMast();
     }
 
+    @Override
+    public AgvWrkMast selectByContainerCode(String containerCode) {
+        return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode));
+    }
+
+    @Override
+    public int callCancelTask(int wrkNo) {
+
+        AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+        agvTaskCreateParam.setTaskCode(wrkNo + "");
+
+        return doHttpRequest(agvTaskCreateParam,"鍙栨秷浠诲姟涓嬪彂",url, taskCancelPath,null,"127.0.0.1");
+
+    }
+
+
     private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
         //寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
         for(AgvWrkMast agvWrkMast : agvWrkMastList){
@@ -156,30 +170,31 @@
         }
     }
 
-    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,List<AgvWrkMast> agvWrkMastList){
-        List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
-            AgvTaskParam agvTaskParam = new AgvTaskParam();
-            AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
-            agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
-            //AgvTaskParam
-            if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57){
-                agvTaskParam.setTaskCode(-agvWrkMast.getWrkNo() + "");
-            }else{
-                agvTaskParam.setTaskCode(agvWrkMast.getWrkNo() + "");
-            }
+    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,AgvWrkMast agvWrkMast){
 
-            agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
+        List<AgvTaskParam> agvTaskParamList = Arrays.asList(
+                //璧峰浣�
+                new AgvTaskParam(agvWrkMast.getSourceLocNo()),
+                //鐩爣浣�
+                new AgvTaskParam(agvWrkMast.getLocNo()));
 
-            //AgvTaskkDescribeParam
-            if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
-                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
-            }
-            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
-            agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
-            return agvTaskParam;
-        }).collect(Collectors.toList());
+//        //璧峰浣�
+//        agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getSourceLocNo()));
+//        //鐩爣浣�
+//        agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getLocNo()));
 
-        agvTaskCreateParam.setTasks(agvTaskParamList);
+        if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 ){
+            agvWrkMast.setWrkNo(-agvWrkMast.getWrkNo());
+        }
+        agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
+        if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 12) {
+            agvTaskCreateParam.setTaskTyp("F06");
+        } else  {
+            agvTaskCreateParam.setTaskTyp("F01");
+        }
+
+        agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
+
     }
 
     private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
@@ -195,7 +210,7 @@
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
 
-            int code = (int) jsonObject.get("code");
+            int code = Integer.parseInt(jsonObject.get("code").toString());
             if(code != 0){
                 throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
             }

--
Gitblit v1.9.1