From eb3e5b10196b173ca27452436d48ea9b1d1b1206 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 17 二月 2023 13:35:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 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 efe3ab1..23d6d98 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -101,10 +101,27 @@
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+
if (barcodeThread == null) {
continue;
}
String barcode = barcodeThread.getBarcode();
+
+ //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
+ if(inSta.getStaNo().equals(101) && !Cools.isEmpty(barcode)){
+ BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
+ if (barcodeThread1 != null) {
+ barcode = barcodeThread1.getBarcode();
+ }
+
+ if(!Cools.isEmpty(barcode)) {
+ BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
+ if (barcodeThread2 != null) {
+ barcode = barcodeThread2.getBarcode();
+ }
+ }
+ }
+
if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -1956,15 +1973,15 @@
}
WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getStaNo());
switch (inSta.getStaNo()) {
- case 102: // 1F1
+ case 101: // 1F1
if (pakout != null) {
if (devpThread.ioModeOf1F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F1 = IoModeType.PAKOUT_MODE;
}
@@ -1974,15 +1991,15 @@
devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE;
}
break;
- case 106: // 1F2
+ case 104: // 1F2
if (pakout != null) {
if (devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F2 = IoModeType.PAKOUT_MODE;
}
@@ -1992,15 +2009,15 @@
devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
}
break;
- case 112: // 1F3
+ case 111: // 1F3
if (pakout != null) {
if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F3 = IoModeType.PAKOUT_MODE;
}
@@ -2010,15 +2027,15 @@
devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
}
break;
- case 116: // 1F4
+ case 114: // 1F4
if (pakout != null) {
if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F4 = IoModeType.PAKOUT_MODE;
}
@@ -2028,15 +2045,15 @@
devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
}
break;
- case 202: // 2F1
+ case 201: // 2F1
if (pakout != null) {
if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2F1 = IoModeType.PAKOUT_MODE;
}
@@ -2046,15 +2063,15 @@
devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
}
break;
- case 205: // 2F2
+ case 203: // 2F2
if (pakout != null) {
if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2F2 = IoModeType.PAKOUT_MODE;
}
@@ -2064,15 +2081,15 @@
devpThread.ioModeOf2F2 = IoModeType.PAKIN_MODE;
}
break;
- case 302: // 3F1
+ case 301: // 3F1
if (pakout != null) {
if (devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf3F1 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf3F1 = IoModeType.PAKOUT_MODE;
}
@@ -2082,15 +2099,15 @@
devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
}
break;
- case 305: // 3F2
+ case 303: // 3F2
if (pakout != null) {
if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf3F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf3F2 = IoModeType.PAKOUT_MODE;
}
--
Gitblit v1.9.1