From bbf283177eee80b573b583f2e29e62531eaf7f0a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 26 十月 2024 16:43:15 +0800
Subject: [PATCH] 入库过滤盘点再入库
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 39261ef..bade34f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -205,15 +205,17 @@
//杩囨护鍒ゆ柇锛岄槻姝㈡嫞鏂欏啀鍏ュ簱璐х墿锛岀粡杩囧叆搴撶珯鍐嶅叆搴撴椂锛岃閫�鍥炲埌閫�搴撶珯
WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
if (wrkMast1 !=null){
- if (wrkMast1.getIoType()==103 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
+ if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()== 57 || wrkMast1.getIoType()==104){
continue;
}
}
if (wrkMast != null) {
News.warn(""+mark+" - 4"+" - 婊℃墭鐩樺叆搴撳伐浣滄。涓凡瀛樺湪璇ョ珯鐘舵�佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
if (devp.getId() == 2) {
- staProtocol.setWorkNo((short)9999);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// staProtocol.setWorkNo((short)9999);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
@@ -224,7 +226,7 @@
// led 寮傚父鏄剧ず
if (ledThread != null) {
String errorMsg = "宸ヤ綔妗ｅ凡瀛樺湪璇ユ潯鐮佸彿===>>" + barcode;
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
continue;
}
@@ -275,9 +277,9 @@
ledCommand.setBarcode(barcode);
commands.add(ledCommand);
if (devp.getId() == 1) {
- if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(1, commands))){
- ledThread.setLedMk(false);
- }
+// if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(1, commands))){
+// ledThread.setLedMk(false);
+// }
} else {
if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands))){
ledThread.setLedMk(false);
@@ -536,9 +538,9 @@
ledCommand.setMatDtos(matDtos);
commands.add(ledCommand);
if (devp.getId() == 1) {
- if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(1, commands))) {
- ledThread.setLedMk(false);
- }
+// if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(1, commands))) {
+// ledThread.setLedMk(false);
+// }
} else {
if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, commands))){
ledThread.setLedMk(false);
@@ -1556,7 +1558,13 @@
&& staProtocol.isLoading()
) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
-
+ // 鍒ゆ柇涓婁竴涓┖鎵樺叆搴撳啓鍏ュ悗锛岀嚎绋嬭繕璇诲彇鍒帮紝閫犳垚閲嶅璇锋眰
+ List<WrkMast> wrkMastList = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts",2)
+ .eq("io_type",10).eq("source_sta_no",emptyInSta.getStaNo()));
+ if(!wrkMastList.isEmpty()) {
+ log.warn("鏌ヨ鍒颁竴涓湪璁惧涓婅蛋浠诲姟锛歿}",wrkMastList.get(0).getWrkNo());
+ continue;
+ }
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -1583,7 +1591,6 @@
News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
-
if (ledThread != null) {
// 鍛戒护闆嗗悎
List<LedCommand> commands = new ArrayList<>();
@@ -1602,16 +1609,16 @@
ledCommand.setMatDtos(matDtos);
commands.add(ledCommand);
if (devp.getId() == 1) {
- MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
+// MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
} else {
MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, commands));
}
// ledThread.errorReset();
}
- Thread.sleep(500);
+ Thread.sleep(1000);
} else {
staProtocol.setWorkNo((short)9991);
- staProtocol.setStaNo((short)100);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
--
Gitblit v1.9.1