From 17e41c4b535eb30a4768c7d17b8707bad74bbb22 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 04 九月 2024 17:56:15 +0800
Subject: [PATCH] 移库逻辑调整
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 81 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 40 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 b3e674b..3dd16f4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -91,17 +91,17 @@
@Value("${wms.url}")
private String wmsUrl;
- private Short getWorkMode(Integer bay) {
- if (bay == 2 || bay == 7) {
+ private Short getWorkMode(Short locType1, Integer bay) {
+ if (locType1 == 2) {
return (short) 3;
- } else if (bay == 3) {
- return (short) 2;
- } else if (bay == 4) {
- return (short) 2;
- } else if (bay == 5) {
- return (short) 1;
+ } else if (locType1 == 5) {
+ return (short) 3;
} else {
- return (short) 0;
+ if (bay == 5) {
+ return (short) 1;
+ } else {
+ return (short) 2;
+ }
}
}
@@ -883,7 +883,7 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- Short workMode = getWorkMode(locMast.getBay1());
+ Short workMode = getWorkMode(locMast.getLocType1(), locMast.getBay1());
if (workMode == 2) {
//CrnTaskModeType璇ユ灇涓剧被鏃犳晥锛屽彧鏈�1浠ｈ〃宸ヤ綅锛�2浠ｈ〃宸ヤ綅2锛�3鍙屽伐浣�
crnCommand.setTaskMode(CrnTaskModeType.PAKOUT);
@@ -1055,12 +1055,13 @@
News.warnNoLog("" + mark + " - 2" + " - 12" + " - 鍛戒护涓嬪彂 : 宸ヤ綔鍙�={},婧愭帓={},婧愬垪={},婧愬眰={},鐩爣鎺�={},鐩爣鍒�={},鐩爣灞�={}", wrkMast.getWrkNo().shortValue(), sourceSta.getRow1().shortValue(), sourceSta.getBay1().shortValue(), sourceSta.getLev1().shortValue(), crnStn.getRow().shortValue(), crnStn.getBay().shortValue(), crnStn.getLev().shortValue());
String locNo = sourceSta.getLocNo();
-
+ // 鑾峰彇鐩爣搴撲綅淇℃伅
+ LocMast sta = locMastService.getById(sourceSta.getLocNo());
// 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- Short workMode = getWorkMode(sourceSta.getBay1());
+ Short workMode = getWorkMode(sta.getLocType1(), sourceSta.getBay1());
if (workMode == 2) {
//CrnTaskModeType璇ユ灇涓剧被鏃犳晥锛屽彧鏈�1浠ｈ〃宸ヤ綅锛�2浠ｈ〃宸ヤ綅2锛�3鍙屽伐浣�
crnCommand.setTaskMode(CrnTaskModeType.PAKOUT);
@@ -1268,7 +1269,7 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- Short workMode = getWorkMode(sourceSta.getBay1());
+ Short workMode = getWorkMode(sta.getLocType1(), sourceSta.getBay1());
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
if (workMode == 2) {
//CrnTaskModeType璇ユ灇涓剧被鏃犳晥锛屽彧鏈�1浠ｈ〃宸ヤ綅锛�2浠ｈ〃宸ヤ綅2锛�3鍙屽伐浣�
@@ -1918,7 +1919,7 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(), shallowLoc.getLocType2());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getBay1(), shallowLoc.getLocType1(), shallowLoc.getLocType2());
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
@@ -1930,25 +1931,25 @@
}
if (null != loc) {
//璋冩暣鐨勫師鍥狅細鍙屽伐浣嶇殑鎯呭喌锛�5鍒楋紝鍙兘2鍙峰伐浣嶅彇鏀撅紝34鍒楋紝鍙兘宸ヤ綅1鍙栨斁
- if (shallowLoc.getLocType1() == 1) {
- if (shallowLoc.getBay1() == 5 && loc.getBay1() == 5) {
- break;
- } else if (shallowLoc.getBay1() == 3 || shallowLoc.getBay1() == 4) {
- if (loc.getBay1() == 3 || loc.getBay1() == 4) {
- break;
- }
- }
- loc = null;
- } else {
- break;
- }
+// if (shallowLoc.getLocType1() == 1) {
+// if (shallowLoc.getBay1() == 5 && loc.getBay1() == 5) {
+// break;
+// } else if (shallowLoc.getBay1() == 3 || shallowLoc.getBay1() == 4) {
+// if (loc.getBay1() == 3 || loc.getBay1() == 4) {
+// break;
+// }
+// }
+// loc = null;
+// } else {
+ break;
+ // }
}
}
}
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(), shallowLoc.getLocType2());
+ loc = locMastService.queryFreeLocMast(row, shallowLoc.getBay1(), shallowLoc.getLocType1(), shallowLoc.getLocType2());
if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
@@ -1959,19 +1960,19 @@
}
if (null != loc) {
- //璋冩暣鐨勫師鍥狅細鍙屽伐浣嶇殑鎯呭喌锛�5鍒楋紝鍙兘2鍙峰伐浣嶅彇鏀撅紝34鍒楋紝鍙兘宸ヤ綅1鍙栨斁
- if (shallowLoc.getLocType1() == 1) {
- if (shallowLoc.getBay1() == 5 && loc.getBay1() == 5) {
- break;
- } else if (shallowLoc.getBay1() == 3 || shallowLoc.getBay1() == 4) {
- if (loc.getBay1() == 3 || loc.getBay1() == 4) {
- break;
- }
- }
- loc = null;
- } else {
- break;
- }
+// //璋冩暣鐨勫師鍥狅細鍙屽伐浣嶇殑鎯呭喌锛�5鍒楋紝鍙兘2鍙峰伐浣嶅彇鏀撅紝34鍒楋紝鍙兘宸ヤ綅1鍙栨斁
+// if (shallowLoc.getLocType1() == 1) {
+// if (shallowLoc.getBay1() == 5 && loc.getBay1() == 5) {
+// break;
+// } else if (shallowLoc.getBay1() == 3 || shallowLoc.getBay1() == 4) {
+// if (loc.getBay1() == 3 || loc.getBay1() == 4) {
+// break;
+// }
+// }
+// loc = null;
+// } else {
+ break;
+ // }
}
}
}
--
Gitblit v1.9.1