From ee718203195675fe7b1aab64b3c1890efafb8068 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 16 十一月 2023 13:41:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 ++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/TaskWrkService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 5 +++++
src/main/java/com/zy/core/MainProcess.java | 3 +++
src/main/resources/mapper/TaskWrkMapper.xml | 6 ++++++
6 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 82e1cb3..65cb0ab 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -17,6 +17,8 @@
TaskWrk selectByWrkNo(Integer wrkNo);
+ List<TaskWrk> selectReceive();//鑾峰彇鎺ユ敹浠诲姟
+
TaskWrk selectPakIn(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo, @Param("startPoint") String startPoint);
List<TaskWrk> selectPakOut(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index 696d11d..a3c320a 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -11,6 +11,8 @@
TaskWrk selectByWrkNo(Integer wrkNo);
+ List<TaskWrk> selectReceive();//鑾峰彇鎺ユ敹浠诲姟
+
//娲惧彂浠诲姟
void distribute(String taskNo, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index d8ace45..ec2419b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -40,6 +40,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -91,6 +93,10 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private TaskWrkMapper taskWrkMapper;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private ConfigService configService;
@Value("${wms.url}")
private String wmsUrl;
@@ -1362,5 +1368,25 @@
}
}
+ //鑷姩娲惧彂浠诲姟
+ public void autoDistribute() {
+ Config config = configService.selectByCode("autoDistribute");
+ if (config == null) {
+ return;
+ }
+
+ if (config.getValue().equals("false")) {//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄦ淳鍙戜换鍔�
+ return;
+ }
+
+ for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
+ try {
+ taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
+ } catch (CoolException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 56c6a4e..fddea75 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -32,6 +32,11 @@
}
@Override
+ public List<TaskWrk> selectReceive() {
+ return this.baseMapper.selectReceive();
+ }
+
+ @Override
@Transactional
public void distribute(String taskNo, Long userId) {
TaskWrk taskWrk = this.selectByTaskNo(taskNo);
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0a93935..6add849 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -68,6 +68,9 @@
i = 0;
}
+ //鑷姩娲惧彂浠诲姟
+ mainService.autoDistribute();
+
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index d182a22..aaecabe 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -49,6 +49,12 @@
order by io_pri desc,create_time,wrk_no ASC
</select>
+ <select id="selectReceive" resultMap="BaseResultMap">
+ select * from wcs_task_wrk
+ where 1=1
+ and status = 1
+ </select>
+
<select id="selectPakOutIoType" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where crn_no=#{crnNo}
--
Gitblit v1.9.1