From 6f088dc1cb716e345da064a5e89f148bd248c75d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 30 四月 2024 10:54:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 c2b575b..b4c571f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -31,6 +31,9 @@
     @Value("${agv.taskCreatePath}")
     private String taskCreatePath;
 
+    @Value("${agv.taskCancelPath}")
+    private String taskCancelPath;
+
     @Value("${agv.containerMoveInPath}")
     private String containerMoveInPath;
 
@@ -143,6 +146,17 @@
         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){
@@ -169,6 +183,9 @@
 //        //鐩爣浣�
 //        agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getLocNo()));
 
+        if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 ){
+            agvWrkMast.setWrkNo(-agvWrkMast.getWrkNo());
+        }
         agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
         agvTaskCreateParam.setTaskTyp("F01");
         agvTaskCreateParam.setPositionCodePath(agvTaskParamList);

--
Gitblit v1.9.1