From 3dd987e77e1f1dc6a7bd67cfa2e6e4a78e20520b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 16 十月 2023 16:40:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 9671a2f..db9685d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvWrkMast;
@@ -79,7 +80,7 @@
getRequestParam(agvTaskCreateParam,agvWrkMastList);
- return doHttpRequest(agvTaskCreateParam,"涓婃灦浠诲姟涓嬪彂",url, taskCreatePath,null,"127.0.0.1");
+ return doHttpRequest(agvTaskCreateParam,"鎼繍浠诲姟涓嬪彂",url, taskCreatePath,null,"127.0.0.1");
//return containerMoveParam;
}
@@ -115,6 +116,11 @@
return index > 0;
}
+ @Override
+ public boolean deleteByWrkNo(int wrkNo) {
+ return this.delete(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
+ }
+
private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
//寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
for(AgvWrkMast agvWrkMast : agvWrkMastList){
@@ -130,7 +136,12 @@
AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
//AgvTaskParam
- agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
+ if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57){
+ agvTaskParam.setTaskCode(-agvWrkMast.getWrkNo() + "");
+ }else{
+ agvTaskParam.setTaskCode(agvWrkMast.getWrkNo() + "");
+ }
+
agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//AgvTaskkDescribeParam
--
Gitblit v1.9.1