From 18046957f206ea97133f1352434bc3f4cf556a00 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 23 五月 2025 16:36:56 +0800
Subject: [PATCH] 完善agv调度
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 22 +++-------------------
src/main/resources/mapper/WrkMastMapper.xml | 1 +
src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java | 2 +-
src/main/resources/application.yml | 2 +-
5 files changed, 7 insertions(+), 22 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 1f17c09..f1814fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -223,7 +223,7 @@
// }
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), 102);
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index f39e2a5..2615993 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -31,29 +31,12 @@
@Autowired
private WorkMastHandler workMastHandler;
@Autowired
- private BasDevpService basDevpService;
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
- if (wrkMasts.isEmpty()) {
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("wrk_sts", 14)
- .eq("io_type", 103));
- for (WrkMast wrkMast : wrkMasts1) {
- BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>()
- .eq("dev_no",wrkMast.getStaNo())
- .eq("wrk_no",wrkMast.getWrkNo()));
- if(basDevp==null){
- continue;
- }
- if (!Cools.isEmpty(wrkMast.getMemo())) {
- wrkMast.setWrkSts(30L);
- wrkMastService.updateById(wrkMast);
- }
- }
- return;
- }
+
for (WrkMast wrkMast : wrkMasts) {
ReturnT<String> returnT = workMastHandler.start(wrkMast);
if (!returnT.isSuccess()) {
@@ -65,6 +48,7 @@
}
}
}
+
}
}
diff --git a/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java b/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
index a8ab00c..c5df7f8 100644
--- a/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
+++ b/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
@@ -78,7 +78,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if(jsonObject.getBoolean("IsSuccess")){
- wrkMast.setWrkSts(31L);//WMS涓嬪彂鎼繍浠诲姟缁橰CS鎴愬姛
+ wrkMast.setWrkSts(15L);//WMS涓嬪彂鎼繍浠诲姟缁橰CS鎴愬姛,杞巻鍙叉。
wrkMastService.updateById(wrkMast);
bool = true;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4e7e633..86c927e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs-yclk
+ url: jdbc:sqlserver://127.0.0.1:50948;databasename=dlzasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 512c377..a09e64b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,6 +72,7 @@
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and inv_wh = 'Y')
or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp) and inv_wh = 'Y')
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp) and inv_wh = 'Y')
+ or (wrk_sts=15 and io_type=110)
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1