From 5e4d17f6a07256743a7708d8a3f5ee63fddbb040 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 31 五月 2024 09:16:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 865dcb5..1e5476d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -69,6 +69,18 @@
this.updateById(agvWrkMast);
}
+ public void updateWrkStsByWrkNo(int wrkNo, long wrkSts,String manuType,long userId) {
+ Date now = new Date();
+ AgvWrkMast agvWrkMast = this.selectById(wrkNo);
+ //鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
+ checkWrkSts(agvWrkMast,wrkSts);
+ agvWrkMast.setWrkSts(wrkSts);
+ agvWrkMast.setManuType(manuType);
+ agvWrkMast.setModiTime(now);
+ agvWrkMast.setModiUser(userId);
+ this.updateById(agvWrkMast);
+ }
+
// TODO 鍒ゆ柇瑙勫垯
private boolean checkWrkSts(AgvWrkMast agvWrkMast,long wrkSts){
@@ -100,9 +112,9 @@
}
- //瀹瑰櫒鍏ュ満
+ //璐ф灦鍏ュ満
public int containerMoveIn(List<AgvWrkMast> agvWrkMastList) throws IOException {
- //璋冪敤瀹瑰櫒鍏ュ満鏃舵墍闇�瑕佸弬鏁�
+ //璋冪敤璐ф灦鍏ュ満鏃舵墍闇�瑕佸弬鏁�
Map<String,List<Map<String,String>>> containerMoveParam = new HashMap<>();
List<Map<String,String>> positionCodeMapList = new ArrayList<>();
containerMoveParam.put("containerMoveIns",positionCodeMapList);
@@ -112,11 +124,11 @@
if(Cools.isEmpty(positionCodeMapList)){
return 0;
}
- return doHttpRequest(containerMoveParam,"瀹瑰櫒鍏ュ満浠诲姟涓嬪彂",url, containerMoveInPath,null,"127.0.0.1");
+ return doHttpRequest(containerMoveParam,"璐ф灦鍏ュ満浠诲姟涓嬪彂",url, containerMoveInPath,null,"127.0.0.1");
}
- //瀹瑰櫒绂诲満
+ //璐ф灦绂诲満
public int containerMoveOut(List<AgvWrkMast> agvWrkMastList){
Map<String,List<Map<String,String>>> containerMoveParam = new HashMap<>();
List<Map<String,String>> positionCodeMapList = new ArrayList<>();
@@ -126,7 +138,7 @@
positionCodeMap.put("positionCode",agvWrkMast.getLocNo());
positionCodeMapList.add(positionCodeMap);
}
- return doHttpRequest(containerMoveParam,"瀹瑰櫒绂诲満浠诲姟涓嬪彂",url, containerMoveOutPath,null,"127.0.0.1");
+ return doHttpRequest(containerMoveParam,"璐ф灦绂诲満浠诲姟涓嬪彂",url, containerMoveOutPath,null,"127.0.0.1");
}
public boolean insertByIncrease(AgvWrkMast agvWrkMast) {
@@ -140,14 +152,14 @@
return this.delete(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
}
- //瀹瑰櫒鍒拌揪閫氱煡
+ //璐ф灦鍒拌揪閫氱煡
public int containerArrived(AgvWrkMast agvWrkMast) {
Map<String,String> containerArrivedParam = new HashMap<>();
containerArrivedParam.put("slotCode",agvWrkMast.getSourceLocNo());
containerArrivedParam.put("containerCode",agvWrkMast.getBarcode());
- return doHttpRequest(containerArrivedParam,"瀹瑰櫒杈惧埌閫氱煡",url, containerArrivedPath,null,"127.0.0.1");
+ return doHttpRequest(containerArrivedParam,"璐ф灦杈惧埌閫氱煡",url, containerArrivedPath,null,"127.0.0.1");
}
@Override
@@ -176,9 +188,9 @@
private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
- //寰�瀹瑰櫒鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
+ //寰�璐ф灦鍏ュ満鍙傛暟涓斁鍏ユ簮绔欑偣浣嶇疆
for(AgvWrkMast agvWrkMast : agvWrkMastList){
- //鍒ゆ柇鏄惁涓鸿緭閫佺嚎鍏ュ簱锛屾槸鍒欎笉闇�瑕佸鍣ㄨ繘鍦鸿姹�
+ //鍒ゆ柇鏄惁涓鸿緭閫佺嚎鍏ュ簱锛屾槸鍒欎笉闇�瑕佽揣鏋惰繘鍦鸿姹�
if("Y".equals(agvWrkMast.getMk())){
continue;
}
@@ -205,7 +217,7 @@
agvWrkMast.setWrkNo(-agvWrkMast.getWrkNo());
}
agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
- if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 12) {
+ if (agvWrkMast.getIoType() == 108 || (agvWrkMast.getIoType() == 109 && agvWrkMast.getWrkSts() == 201) || agvWrkMast.getIoType() == 12) {
agvTaskCreateParam.setTaskTyp("F06");
} else {
agvTaskCreateParam.setTaskTyp("F01");
--
Gitblit v1.9.1