From 7817637bcb91ab39ede8ab4dd3ce9f22f673b0b7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 04 七月 2020 16:03:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 4 ++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 60 ++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 7 +++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 6 +++
src/main/java/com/zy/asrs/task/WcsDispatcher.java | 7 +++
5 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8d9e59c..2465f1c 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -3,10 +3,16 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
+ @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();
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 55f5f51..ed26ba9 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkMast;
+import java.util.List;
+
public interface WrkMastService extends IService<WrkMast> {
int getWorkingMast(Integer devpNo);
+ List<WrkMast> selectToBeCompleteData();
+
}
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 ddcbc22..542452e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -7,6 +7,8 @@
import com.zy.asrs.service.WrkMastService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("wrkMastService")
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
@@ -14,4 +16,9 @@
public int getWorkingMast(Integer devpNo) {
return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
}
+
+ @Override
+ public List<WrkMast> selectToBeCompleteData() {
+ return this.selectToBeCompleteData();
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
index c09f242..455bd03 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -1,7 +1,9 @@
package com.zy.asrs.task;
+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.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -15,8 +17,10 @@
public class WcsDispatcher {
private static Logger log = LoggerFactory.getLogger(WcsDispatcher.class);
-
private Thread thread;
+
+ @Autowired
+ private WorkMastHandler workMastHandler;
@PostConstruct
private void start(){
@@ -25,6 +29,7 @@
try {
Thread.sleep(3000);
+ workMastHandler.start();
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
new file mode 100644
index 0000000..2878e93
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -0,0 +1,60 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/4
+ */
+@Service
+@Transactional
+public class WorkMastHandler {
+
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ public void start() {
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ // 4.鍏ュ簱瀹屾垚
+ if (wrkMast.getWrkSts() == 4) {
+ doIn(wrkMast);
+ // 14.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 14) {
+ doOut(wrkMast);
+ }
+ }
+ }
+
+ private void doIn(WrkMast wrkMast){
+ switch (wrkMast.getIoType()) {
+ case 10:
+ break;
+ case 1:
+ break;
+ case 53:
+ break;
+ case 54:
+ break;
+ case 57:
+ break;
+ case 11:
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void doOut(WrkMast wrkMast){
+
+ }
+
+}
--
Gitblit v1.9.1