From 64758a57264af5c863409ba2a9fa7c988c9e3e56 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 一月 2021 10:01:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 10 ----------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
2 files changed, 5 insertions(+), 11 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 f9519b3..83fb570 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -101,8 +101,12 @@
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
- System.err.println(barcode);
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
}
+
// 鑾峰彇鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 6c859db..15f8d1a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -130,16 +130,6 @@
return true;
}
- public String getBarcode() {
- if (Cools.isEmpty(barcode)) {
- return null;
- } else if("NG".endsWith(barcode)) {
- return null;
- } else {
- return barcode.trim();
- }
- }
-
public static void main(String[] args) throws Exception {
BarcodeThread barcodeThread = new BarcodeThread(new Slave());
barcodeThread.getSlave().setIp("192.168.2.150");
--
Gitblit v1.9.1