From 8e266016897bd53a441319ae7509404fb1b07a55 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 06 七月 2025 17:33:31 +0800
Subject: [PATCH] 罐装线要桶数量维护修改
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index afdfb38..ca4215f 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -314,7 +314,7 @@
/**
* 缃愯绾胯妗舵暟閲忓噺灏�
*/
- private void decreaseWantBucketCount(int site, int decrease) {
+ private void decreaseWantBucketCount(int site, int decrease) throws InterruptedException {
int siteNew;
switch (site) {
@@ -336,8 +336,6 @@
return;
}
- staProtocol.setWantBucketCount(remaining); // 璁剧疆鍓╀綑瑕佹《鏁�
-
boolean offer = MessageQueue.offer(SlaveType.Devp, inGzxSiteList.indexOf(site) + 4, new Task(6, staProtocol));
if (offer) {
log.info("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁板懡浠ゆ帹閫侀槦鍒楁垚鍔燂細绔欑偣锛歿}锛屽墿浣欒妗舵暟锛歿}" ,site, remaining);
@@ -346,6 +344,7 @@
}
log.info("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁版垚鍔燂紝绔欑偣锛歿}锛屽噺灏戝墠锛歿}锛屽噺灏戞暟锛歿}锛屽墿浣欒妗舵暟锛歿}", site, count, decrease, remaining);
+ Thread.sleep(1200);
}
/**
@@ -1178,7 +1177,7 @@
/**
* 鍫嗗灈鏈哄洖鍘熺偣
*/
- public synchronized void originGo() {
+ public synchronized void originGo() throws InterruptedException {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -1202,6 +1201,12 @@
continue;
}
+ // 鏈夊悐杞﹀叆搴撴垨鍚婅溅鍑哄簱浠诲姟
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnProtocol.getCrnNo()).in("wrk_sts", 3, 12));
+ if(count != 0) {
+ continue;
+ }
+
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
@@ -1219,6 +1224,7 @@
basCrnpService.updateById(basCrnp); // 璁剧疆鏇存柊鏃堕棿锛岄伩鍏嶉噸澶嶄笅鍙戝洖鍘熺偣
log.info("{}鍙峰爢鍨涙満鍥炲師鐐逛换鍔′笅鍙戞垚鍔燂細{}", crn.getId(), JSON.toJSON(crnCommand));
}
+ Thread.sleep(2000);
}
}
}
--
Gitblit v1.9.1