From 3677c6501ed94234f406d6444bab46e90824dac8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 09:58:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 6e9fcdf..d1dc9b0 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -57,14 +57,14 @@
for (DevpSlave.Sta inSta : devp.getDriveSta()) {
if (inSta.getStaNo().equals(palletizingNo)){
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
- StaProtocol staProtocol = devpThread.getStation().get(inSta);
- if (staProtocol == null) {
+ StaProtocol staProtocolPall = devpThread.getStation().get(palletizingNo);
+ if (staProtocolPall == null) {
continue;
} else {
- staProtocol = staProtocol.clone();
+ staProtocolPall = staProtocolPall.clone();
}
- if (!staProtocol.isAutoing() || !staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isPakMk()){
+ if (!staProtocolPall.isAutoing() || !staProtocolPall.isLoading() || staProtocolPall.getWorkNo() != 0 || !staProtocolPall.isPakMk()){
return R.error("鏈氨缁紒锛侊紒");
}
@@ -77,7 +77,7 @@
if (!Cools.isEmpty(barcode)) {
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || "000000".equals(barcode)) {
barcode = "";
}
} else {
@@ -88,6 +88,9 @@
}
// Calendar calendar = Calendar.getInstance();
// calendar.setTime(now);
+ if (Cools.isEmpty(barcode) || barcode.equals("")){
+ return R.error("鏈氨缁紒锛侊紒鎵樼洏鏉＄爜涓虹┖锛侊紒锛佽妫�鏌ワ紒锛侊紒");
+ }
return R.ok(
Cools.add("barcode", barcode).add("Date",now)
);
--
Gitblit v1.9.1