From eca908362077754463173155ba81c51ca6328dd1 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 09 十月 2024 13:41:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 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 c821507..99dbde5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -40,14 +40,16 @@
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.asm.Advice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -118,6 +120,7 @@
if (barcodeThread == null) {
continue;
}
+
String barcode = barcodeThread.getBarcode();
// 灏哄妫�娴嬪紓甯�
boolean back = false;
@@ -150,10 +153,18 @@
errMsg = "鎵爜澶辫触";
back = true;
}
+
+ //鎷ｆ枡銆佺洏鐐逛换鍔★紝涓嶈繘鍏ユ柊鏉垮叆搴撴柟娉曪紝鐩存帴璺冲嚭
+ if(staProtocol.getWorkNo()>=3001 && staProtocol.getWorkNo()<=6000){
+ continue;
+ }
+
// 閫�鍥�
if (back) {
// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
+ if(!staProtocol.isOutEnable()){
+ continue;
+ }
if (!staProtocol.isLoading()){
continue;
@@ -169,8 +180,6 @@
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
}
-
-
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing()
@@ -192,17 +201,17 @@
}
continue;
}
- //鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 璁惧鏆備笉鏀寔101銆�104绔欑洏鐐�/鎷ｆ枡鍏ュ簱
- WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
- if(!Cools.isEmpty(wrkMast1)){
- if (wrkMast1.getIoType()!=1){
- continue;
- }
- }
- if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
- log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
- continue;
- }
+// //鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 璁惧鏆備笉鏀寔101銆�104绔欑洏鐐�/鎷ｆ枡鍏ュ簱
+// WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
+// if(!Cools.isEmpty(wrkMast1)){
+// if (wrkMast1.getIoType()!=1){
+// continue;
+// }
+// }
+// if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
+// log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
+// continue;
+// }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
if (wrkMast != null) {
@@ -216,7 +225,7 @@
WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", barcode)
- .in("io_type", 107,103,57,53));
+ .in("io_type", 107,103,104,57,53));
if (!Cools.isEmpty(checkPick)) {
continue;
} else {
@@ -441,7 +450,14 @@
//浠诲姟鍙峰鏋滃湪宸ヤ綔妗ｄ腑瀛樺湪锛屽氨涓嶇敤鍘诲垽鏂潯鐮�
if(Cools.isEmpty(wrkMast1)) {
+// WrkMast mast = wrkMastMapper.selectPickStep(barcode);
+// if (Cools.isEmpty(mast)) {
+// break;
+// }
+
if (!Cools.isEmpty(barcode)) {
+
+
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode) && staProtocol.isPakMk()) {
if (!staProtocol.isLoading()) {
@@ -1190,6 +1206,7 @@
// continue;
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -1890,6 +1907,8 @@
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
continue;
+ } else {
+ News.info("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕ip锛歿}] [port锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort(),commands);
}
}
@@ -1946,6 +1965,7 @@
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
if (reset) {
+ //News.info("{}鍙稬ED鍛戒护閲嶇疆锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
if (ledThread == null) {
continue;
}
--
Gitblit v1.9.1