From 3ee0ff0bd24d4df9b795146ece6da43a78bf8bd0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 20:55:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 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 b1a3407..990265b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -679,30 +679,19 @@
// && (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()) {
- WrkMast wrkMast = null;
- if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
- if (staProtocol.getWorkNo() == 0) {
- continue;
- }
- //鏍规嵁宸ヤ綔鍙锋悳绱㈠伐浣滄。
- wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
- }else {
- //鏍规嵁鎵樼洏鐮佹悳绱㈠伐浣滄。
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- if (Cools.isEmpty(barcode)) {
- continue;
- }
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
- continue;
- }
- wrkMast = wrkMastMapper.selectByBarcode(barcode);
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
}
-
+ String barcode = barcodeThread.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ continue;
+ }
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
+ continue;
+ }
+ WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);
if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
continue;
}
--
Gitblit v1.9.1