From d613408e745a87c2ed77506a96097b0185352d78 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 05 五月 2025 14:52:18 +0800
Subject: [PATCH] pda呼叫空板、出库确认
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 1413527..f39e2a5 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,35 +1,69 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.asrs.task.newWay.handler.AssignTasksToRCSHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
* Created by vincent on 2020/7/7
*/
-//@Component
+@Component
public class WorkMastScheduler {
+
+ private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
@Autowired
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ 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> start = workMastHandler.start(wrkMast);
-
-
-
+ ReturnT<String> returnT = workMastHandler.start(wrkMast);
+ if (!returnT.isSuccess()) {
+ wrkMast.setUpdMk("X");
+ wrkMast.setErrorMemo(returnT.getMsg());
+ wrkMast.setErrorTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
}
}
--
Gitblit v1.9.1