From 934fc2e8bb9584ab38da068a72b209541f5930e0 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 24 十月 2024 14:17:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 12 ++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 481fdfd..67a4c58 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -793,7 +793,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(15D);
+ wrkMast.setIoPri(13D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index f501133..6b2c4fe 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -121,6 +121,18 @@
|| (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
return;
}
+ BasDevp basDevp264 = basDevpService.selectById(264);
+ if (basDevp264.getLoading().equals("Y")
+ || !basDevp264.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp264.getWrkNo()) && basDevp264.getWrkNo()!=0) ){
+ return;
+ }
+ BasDevp basDevp266 = basDevpService.selectById(266);
+ if (basDevp266.getLoading().equals("Y")
+ || !basDevp266.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp266.getWrkNo()) && basDevp266.getWrkNo()!=0) ){
+ return;
+ }
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 265).le("dev_no", devNo).eq("loading", "Y"));
int count = 5;
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
--
Gitblit v1.9.1