From b48ab507b4cbbe3cf1cf11ac12b1d945478cc662 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 10 六月 2025 19:27:29 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index bbe9cec..26fcc24 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -928,7 +928,7 @@
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
// 婧愮珯1057
- if(slave.getId() == 4 && crnStn.getStaNo() == 1057 && sourceSta.getRow1() == 12) {
+ if(slave.getId() == 4 && crnStn.getStaNo() == 1057 && (sourceSta.getRow1() == 11 || sourceSta.getRow1() == 12)) {
crnCommand.setDestinationPosX((short) 9);
}
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
@@ -1648,14 +1648,22 @@
}
if(wrkMast.getIoType() == 3 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) { // 鍒�1024鍑哄簱鍙ｏ紝鏀惧埌杈撻�佺嚎鍚庝换鍔″畬鎴�
+ if(wrkMast.getWrkSts() != 2 ){
+ log.warn("rgv鏀捐揣瀹屾垚锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
+ continue;
+ }
wrkMast.setWrkSts(2L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
- } else if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
+ } else if(wrkMast.getIoType() == 101 && wrkMast.getWrkSts() == 2 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
} else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035)) {
+ if(wrkMast.getWrkSts() != 2 ){
+ log.warn("rgv鏀捐揣瀹屾垚锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
+ continue;
+ }
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
@@ -1757,6 +1765,7 @@
SearchLocParam param = new SearchLocParam();
param.setIoType(10);
param.setSourceStaNo(site);
+ param.setBucketType("21"); // 绌烘瘝鎵樼洏
param.setLocType1((short) 1);
String response = new HttpHandler.Builder()
--
Gitblit v1.9.1