From 15dc3914bdf06e0351b6f39388b3b1512a928904 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 18:04:06 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
index 45d9d36..5defbae 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
@@ -72,6 +72,7 @@
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
+ vo.setBarcode(staProtocol.getBarcode());
}
return R.ok().add(list);
@@ -114,6 +115,7 @@
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
+ vo.setBarcode(staProtocol.getBarcode());
return R.ok().add(vo);
}
}
@@ -142,6 +144,7 @@
if (staNo != null) {
staProtocol.setStaNo(staNo);
}
+ staProtocol.setStartUpFlag(true);
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
return R.ok();
@@ -185,7 +188,7 @@
if (i == -1) {
return R.error("姝ょ珯鐐规棤闇�瀹夊叏淇″彿");
}
- staProtocol.setSafeSignal(new SafeSignal(i, (short) 0, flag));
+ staProtocol.setSafeSignal(new SafeSignal(i, true, flag));
redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
return R.ok();
--
Gitblit v1.9.1