From 0d81063735b221b81413784db00aff62e77f637b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 29 九月 2025 13:24:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 8b2e293..6e13098 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -974,6 +974,8 @@
} else {
this.inPut(crn, crnProtocol, mark);
}
+ } else {
+ log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 0) {
// 鍫嗗灈鏈哄伐浣�1鏈夌墿鏂�
@@ -996,6 +998,8 @@
this.inPut(crn, crnProtocol, mark);
}
}
+ } else {
+ log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 1) {
// 鍫嗗灈鏈哄伐浣�2鏈夌墿鏂�
@@ -1018,6 +1022,8 @@
this.inPut(crn, crnProtocol, mark);
}
}
+ } else {
+ log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
}
}
@@ -1366,7 +1372,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 +1400,7 @@
}
/**
- * 鍑哄簱鍙栬揣
+ * 鍑哄簱鏀捐揣
*/
public synchronized void outPut(CrnSlave slave, CrnProtocol crnProtocol, Integer mark) {
News.warnNoLog("" + mark + " - 2" + " - 0" + " - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
@@ -1494,6 +1500,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 +1521,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())); // 婧愬簱浣嶅眰
@@ -2088,6 +2099,7 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setPltType(getCrnStation(wrkMast.getSourceLocNo()));
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
@@ -2660,7 +2672,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(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())) {
@@ -2679,7 +2698,14 @@
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(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 (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
--
Gitblit v1.9.1