From b7380ff70bcc962494cd6640fcc3eac21aaab0a1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 15 一月 2026 08:09:29 +0800
Subject: [PATCH] 1.自动下发出库任务给wcs 2.wcs申请入库
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 0621b3b..62ac520 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasAgvMast;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasAgvMastService;
import com.zy.asrs.service.BasArmMastLogService;
import com.zy.asrs.service.BasArmMastService;
import com.zy.asrs.service.WrkMastService;
@@ -29,6 +31,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasArmMastService basArmMastService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -37,31 +41,9 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
- if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
- continue;
- }
- }
- if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
- continue;
- }
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void executeArm(){
- List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
- if (basArmMastList.isEmpty()) {
- return;
- }
- for (BasArmMast basArmMast : basArmMastList) {
- ReturnT<String> result = workLogHandler.startArm(basArmMast);
- if (!result.isSuccess()) {
- log.error("ARM宸ヤ綔妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", basArmMast.getId());
}
}
}
--
Gitblit v1.9.1