From 267c1fa77770639804b4c172fd5f57ca7cc6eacf Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 二月 2025 14:31:24 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..5219272 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("鏈氨缁紒锛侊紒");
}
@@ -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