From 587fee18e22ed0ceee502ca12025a40e9d63989f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 03 九月 2024 10:47:43 +0800
Subject: [PATCH] 一楼反修入库修改
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 92be3a2..ef96677 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,12 +1,18 @@
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 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;
@@ -14,7 +20,7 @@
/**
* Created by vincent on 2020/7/7
*/
-//@Component
+@Component
public class WorkMastScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
@@ -23,6 +29,8 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -31,14 +39,52 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- 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());
+ try{
+// if (wrkMast.getIoType().equals(101)){
+// if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("3")){
+// continue;
+// }
+// }
+ 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());
+ }
}
+ }catch (Exception e){
+ log.error("宸ヤ綔妗workNo={}]鏇存柊搴撳瓨澶勭悊澶辫触", wrkMast.getWrkNo());
+ log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+
+// @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute202(){
+ BasDevp basDevp = basDevpService.selectById(144);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_no", basDevp.getWrkNo()).eq("io_type", 202).eq("wrk_sts", 52L));
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(56L);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData202();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ try{
+ wrkMast.setWrkSts(57L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo());
+ log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
}
}
}
--
Gitblit v1.9.1