From 8b2cf57e5aaf747fdc99ab65f17418ea1ba746bb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 七月 2020 15:31:59 +0800
Subject: [PATCH] #任务中心————工作历史档
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 6 ++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 33 +++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/WcsDispatcher.java | 4 ++++
6 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8a62ed9..93b36f7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -14,4 +14,6 @@
// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
+ WrkMast selectToBeHistoryData();
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index ed26ba9..532d8cc 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -11,4 +11,6 @@
List<WrkMast> selectToBeCompleteData();
+ WrkMast selectToBeHistoryData();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 98efce8..ffe6a7d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -21,4 +21,10 @@
public List<WrkMast> selectToBeCompleteData() {
return this.baseMapper.selectToBeCompleteData();
}
+
+ @Override
+ public WrkMast selectToBeHistoryData() {
+ return this.baseMapper.selectToBeHistoryData();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
index d8d9797..06e5636 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task;
+import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,6 +21,8 @@
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private WorkLogHandler workLogHandler;
@PostConstruct
private void start(){
@@ -30,6 +33,7 @@
workMastHandler.start();
+ workLogHandler.start();
} catch (Exception e) {
log.error("Exception", e);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
new file mode 100644
index 0000000..aff3a2a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -0,0 +1,33 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by vincent on 2020/7/6
+ */
+@Service
+@Transactional
+public class WorkLogHandler {
+
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ public void start() {
+ WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
+ if (null == wrkMast) {
+ return;
+ }
+
+ }
+
+}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d2852af..f3ef02c 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -66,4 +66,13 @@
select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
</select>
+ <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_sts=5
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ order by io_time,wrk_no asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1