From 4a2d92f23e17c0d8a47976af51cf4db871df9e83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 15:36:37 +0800
Subject: [PATCH] 捡料
---
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/core/MainProcess.java | 2 ++
src/main/resources/application.yml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a040578..28f02f5 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -55,6 +55,8 @@
mainService.initRealtimeBasMap();
// //浠巖edis涓噸鍚换鍔�
// mainService.restartTaskFromRedis();
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ mainService.stnToCrnStnPick();
// 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
mainService.shuttleIoInExecute();
// 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d607735..24be047 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -79,7 +79,7 @@
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
- staNo: 100
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
backSta: 100
led: ${wcs-slave.led[0].id}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5750ffd..c726335 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -141,7 +141,7 @@
<select id="selectBy2125" resultMap="BaseResultMap">
select * from dbo.asr_wrk_mast
where wrk_sts in (21,25)
- and io_type in (101)
+ and io_type in (101,103)
order by io_pri desc,wrk_sts desc
</select>
--
Gitblit v1.9.1