From 8dad82eb9bc7f51e0d22f6e92106733d4386627c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 06 七月 2025 16:13:31 +0800
Subject: [PATCH] 读取更新罐装线要桶数量
---
src/main/java/com/zy/controller/SiteController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index b3c38f9..0728e2c 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -78,8 +78,8 @@
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setPakMk(String.valueOf(staProtocol.getWantBucketFlag())); // 鍏ュ簱鏍囪 -> 瑕佹《淇″彿
+ vo.setEmptyMk(String.valueOf(staProtocol.getWantBucketCount())); // 绌烘澘淇″彿 -> 瑕佹《鏁�
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setWorkNo(staProtocol.getWorkNo());
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
@@ -178,6 +178,17 @@
}
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
+ int devId = 0;
+ switch (siteId) {
+ case 1081: devId = 4;break;
+ case 1084: devId = 5;break;
+ case 1087: devId = 6;break;
+ default:
+ }
+ if(devId != 0){ // 鍚屾椂缁欑綈瑁呯嚎鍐欏彲鍑�
+ staProtocol.setPlaceableFlag(1);
+ MessageQueue.offer(SlaveType.Devp, devId, new Task(5, staProtocol));
+ }
return R.ok();
} else {
return R.error("涓嬪彂鍛戒护澶辫触");
--
Gitblit v1.9.1