From 497660fe835e6eee3a11558c280133c405a8ec2c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 14:14:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 12 +++---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 18 +++++++--
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 18 ++++++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 20 +--------
src/main/java/com/zy/asrs/task/WcsDispatcher.java | 6 +-
5 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
index ba9504f..a42d386 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -36,9 +36,9 @@
try {
Thread.sleep(3000);
- workMastHandler.start();
-
- workLogHandler.start();
+// workMastHandler.start();
+//
+// workLogHandler.start();
} catch (Exception e) {
log.error("Exception", e);
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index ac0033c..fa2274c 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,8 +1,10 @@
package com.zy.asrs.task;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.handler.WorkLogHandler;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
+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;
@@ -13,16 +15,22 @@
@Component
public class WorkLogScheduler {
+ private static final Logger log = LoggerFactory.getLogger(WorkLogScheduler.class);
+
@Autowired
private WorkLogHandler workLogHandler;
@Autowired
- private ConfigService configService;
+ private WrkMastService wrkMastService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- ReturnT<Config> result = workLogHandler.start();
+ WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
+ if (null == wrkMast) {
+ return;
+ }
+ ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
- configService.insert(result.getContent());
+ log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
}
}
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 1413527..92be3a2 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -3,9 +3,12 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
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 java.util.Date;
import java.util.List;
/**
@@ -13,6 +16,8 @@
*/
//@Component
public class WorkMastScheduler {
+
+ private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
@Autowired
private WrkMastService wrkMastService;
@@ -26,10 +31,15 @@
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());
+ }
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 13370af..3402e4e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -9,7 +9,6 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ReturnT;
-import com.zy.system.entity.Config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +18,7 @@
* Created by vincent on 2020/7/6
*/
@Service
-public class WorkLogHandler extends AbstractHandler<Config> {
+public class WorkLogHandler extends AbstractHandler<String> {
@Autowired
private WrkMastService wrkMastService;
@@ -30,14 +29,9 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
-// @Override
@Transactional
- public ReturnT<Config> start() {
+ public ReturnT<String> start(WrkMast wrkMast) {
try {
- WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
- if (null == wrkMast) {
- return SUCCESS;
- }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -57,15 +51,7 @@
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- // todo
- Config config = new Config(
- "name", // 鍚嶇О[闈炵┖]
- "code", // 缂栫爜[闈炵┖]
- "val", // 瀵瑰簲鍊糩闈炵┖]
- (short)1, // 绫诲瀷[闈炵┖]
- (short)1 // 鐘舵�乕闈炵┖]
- );
- return FAIL.setMsg(e.getMessage()).setContent(config);
+ return FAIL.setMsg(e.getMessage());
}
return SUCCESS;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 9449e9c..2d79440 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -289,23 +289,23 @@
// 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkDetls101.isEmpty()) {
- exceptionHandle(""); // todo
+ exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
for (WrkDetl wrkDetl : wrkDetls101) {
// todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
- exceptionHandle(""); // todo
+ exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
- // 淇敼搴撲綅鐘舵�� R ===>> O
+ // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocType().equals("R")) {
locMast.setLocType("O");
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
- exceptionHandle(""); // todo
+ exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
}
break;
@@ -318,7 +318,7 @@
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
- exceptionHandle(""); // todo
+ exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
}
break;
@@ -329,7 +329,7 @@
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle(""); // todo
+ exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1