From ddf6cc8d9132045dbe77b219a4b5ad3f22066dda Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:53:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 81a9da5..3edd428 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1366,7 +1366,7 @@
crnCommand.setPltType(crnStation);
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setTaskMode(CrnTaskModeType.TAKE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
crnCommand.setSourcePosX((short) (sourceSta.getRow1() + slave.getOffset())); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) (sourceSta.getBay1() + slave.getOffset())); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) (sourceSta.getLev1() + slave.getOffset())); // 婧愬簱浣嶅眰
@@ -1394,7 +1394,7 @@
}
/**
- * 鍑哄簱鍙栬揣
+ * 鍑哄簱鏀捐揣
*/
public synchronized void outPut(CrnSlave slave, CrnProtocol crnProtocol, Integer mark) {
News.warnNoLog("" + mark + " - 2" + " - 0" + " - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
@@ -1494,6 +1494,11 @@
}
}
+ if (wrkMastMapper.selectByPltType(slave.getId(), wrkMast.getPltType()) == null) {
+ News.error("" + mark + " - 1" + " - 9" + " - 鍫嗗灈鏈烘敼宸ヤ綅瀛樺湪宸ヤ綔妗�,宸ヤ綅={}", wrkMast.getPltType());
+ }
+
+
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
break;
@@ -1510,7 +1515,7 @@
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setTaskMode(CrnTaskModeType.PUT); // 浠诲姟妯″紡: 搴撲綅绉昏浆
// crnCommand.setSourcePosX((short) (sourceSta.getRow1() + slave.getOffset())); // 婧愬簱浣嶆帓
// crnCommand.setSourcePosY((short) (sourceSta.getBay1() + slave.getOffset())); // 婧愬簱浣嶅垪
// crnCommand.setSourcePosZ((short) (sourceSta.getLev1() + slave.getOffset())); // 婧愬簱浣嶅眰
@@ -2661,13 +2666,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- if (shallowLoc.getRow1() == 1 && row == 1) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
- } else if (shallowLoc.getRow1() == 29 && row == 29) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
}
+
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -2686,10 +2692,10 @@
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- if (shallowLoc.getRow1() == 1 && row == 1) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
- } else if (shallowLoc.getRow1() == 29 && row == 29) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
}
--
Gitblit v1.9.1