From c97714e1cdd8088a8e50e0aa04d2a4c59a28bda8 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期三, 09 七月 2025 16:21:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 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 b9824bf..f377bb2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -105,6 +105,9 @@
@Value("${loc-move.enable}")
private boolean enable;
+ @Value("${config.outloading}")
+ private boolean outloading;
+
public synchronized void generateStoreWrkFile() {
try {
@@ -178,17 +181,23 @@
}
storageEscalationParam.setBarcode(BoxNo);
storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
+ storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
if (taskWrk == null) {
log.error("鍏ュ簱璇锋眰wms鍒涘缓浠诲姟宸ヤ綔妗ｄ负绌猴細{}", storageEscalationParam);
continue;
+ } else {
+ if (-1 == taskWrk.getWrkNo()) {
+ back = true;
+ }
}
if (back) {
+ staProtocol.setWorkNo((short)9991);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.info("缁勬墭鍏ュ簱鎵樼洏閫�鍥炲懡浠ゆ帹閫佽緭閫佺嚎闃熷垪鎴愬姛==>{}锛寋}", BoxNo, errMsg);
+ log.info("缁勬墭鍏ュ簱鎵樼洏閫�鍥炲懡浠ゆ帹閫佽緭閫佺嚎闃熷垪鎴愬姛==>{}锛寋}锛寋}", BoxNo, errMsg, taskWrk.getWrkNo());
} else {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
@@ -351,14 +360,16 @@
continue;
}
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- if (!locMast.getLocSts().equals("O") && taskWrk.getWrkSts() == 2) {
- log.error("鍏ュ簱WMS鍒嗛厤搴撲綅{}鏈夎锛屽簱浣嶇姸鎬佷负{}", locMast.getLocNo(), locMast.getLocSts());
- taskWrk.setWrkSts(5);
- taskWrk.setMemo("WMS鍒嗛厤搴撲綅鏈夎");
- taskWrkService.updateById(taskWrk);
- continue;
- }
+// LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+// if (!locMast.getLocSts().equals("O")) {
+// if (taskWrk.getWrkSts() == 2) {
+// log.error("鍏ュ簱WMS鍒嗛厤搴撲綅{}鏈夎锛屽簱浣嶇姸鎬佷负{}", locMast.getLocNo(), locMast.getLocSts());
+// taskWrk.setWrkSts(5);
+// taskWrk.setMemo("WMS鍒嗛厤搴撲綅鏈夎");
+// taskWrkService.updateById(taskWrk);
+// }
+// continue;
+// }
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
@@ -481,7 +492,7 @@
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ if (staProtocol.isAutoing() && (outloading || !staProtocol.isLoading()) && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -874,14 +885,14 @@
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
+ TaskWrk taskWrk = taskWrkService.selectByTargetPoint(inSta.getBackSta() + "");
switch (inSta.getBackSta()) {
- case 116:
- if (pakout != null) {
+ case 101:
+ if (taskWrk != null) {
if (devpThread.ioModeOf1F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -894,12 +905,12 @@
devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE;
}
break;
- case 117:
- if (pakout != null) {
+ case 104:
+ if (taskWrk != null) {
if (devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F2 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -912,12 +923,12 @@
devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
}
break;
- case 118:
- if (pakout != null) {
+ case 107:
+ if (taskWrk != null) {
if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -930,12 +941,12 @@
devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
}
break;
- case 119:
- if (pakout != null) {
+ case 110:
+ if (taskWrk != null) {
if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -948,12 +959,12 @@
devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
}
break;
- case 120:
- if (pakout != null) {
+ case 113:
+ if (taskWrk != null) {
if (devpThread.ioModeOf1F5 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F5 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -967,11 +978,11 @@
}
break;
case 203:
- if (pakout != null) {
+ if (taskWrk != null) {
if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -986,11 +997,11 @@
break;
case 207:
- if (pakout != null) {
+ if (taskWrk != null) {
if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -1005,11 +1016,11 @@
break;
case 212:
- if (pakout != null) {
+ if (taskWrk != null) {
if (devpThread.ioModeOf2F3 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F3 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
+ TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
&& !devpThread.getStation().get(inSta.getBackSta()).isLoading()
&& devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
--
Gitblit v1.9.1