From 962a374a511a8a222067a2b8d06bc4c4c9052b29 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 12:54:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++-------
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 ++-
src/main/resources/mapper/WrkMastMapper.xml | 10 ++++++----
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 27 +++------------------------
4 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 7d12b28..29bcb26 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -39,6 +39,7 @@
WrkMast selectPakInStep103(@Param("crnNo")Integer crnNo);
+ WrkMast selectPakInStep104(@Param("crnNo")Integer crnNo);
WrkMast selectByPltType(@Param("crnNo")Integer crnNo,@Param("pltType")Integer pltType);
@@ -115,7 +116,7 @@
*/
List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
- List<WrkMast> selectPakOutStep105(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ List<WrkMast> selectPakOutStep107(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
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 baa398a..8b2e293 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1169,8 +1169,8 @@
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
boolean flag = false;
- // 鑾峰彇宸ヤ綔鐘舵�佷负103锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
- WrkMast wrkMast = wrkMastMapper.selectPakInStep103(slave.getId());
+ // 鑾峰彇宸ヤ綔鐘舵�佷负104锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep104(slave.getId());
if (null == wrkMast) {
News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}");
// log.error("鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
@@ -1231,9 +1231,9 @@
News.error("" + mark + " - 1" + " - 16" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 104.鍚婅溅鍏ュ簱鍙栬揣涓�
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 105.鍚婅溅鍏ュ簱鍙栬揣涓�
Date now = new Date();
- wrkMast.setWrkSts(104L);
+ wrkMast.setWrkSts(105L);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -1379,7 +1379,7 @@
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
- wrkMast.setWrkSts(105L);
+ wrkMast.setWrkSts(106L);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -1400,7 +1400,7 @@
News.warnNoLog("" + mark + " - 2" + " - 0" + " - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
- List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep105(slave.getId(), crnStn.getStaNo());
+ List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep107(slave.getId(), crnStn.getStaNo());
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
@@ -1523,7 +1523,7 @@
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
- wrkMast.setWrkSts(106L);
+ wrkMast.setWrkSts(108L);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9d87197..7c4b956 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,34 +52,16 @@
add(104);add(105);
}};
- /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
- add(108);add(109);
- add(201);add(202);add(203);
- add(204);add(205);add(206);add(207);
- add(208);add(209);add(210);add(211);
-
- add(401);add(402);add(403);add(404);
- }};*/
public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
add(1); add(2);add(3);add(4);add(5);
}};
- /* public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
- add(6);add(7);add(8);add(9);
- add(10); add(11); add(12); add(13);
- }};*/
- /*public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
- add(102); add(105);add(107);add(109);
- add(203);add(205);add(208);add(211);
- }};*/
+
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
-// add(101);
-// add(102);add(103);add(104);add(105);
+
add(102);
}};
@@ -87,10 +69,7 @@
add(101);add(102);add(103);add(104);add(105);
}};
- /*public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
- add(102);add(105);add(107);add(109);
- add(203);add(205);add(208);add(211);
- }};*/
+
private Integer count=0;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f9d225e..768ed09 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -108,10 +108,12 @@
</select>
-
+ <select id="selectPakInStep104" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=104 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ </select>
<select id="selectByPltType" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=103 and crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and plt_type =#{pltType} order by io_pri desc,io_time,wrk_no ASC
</select>
@@ -187,8 +189,8 @@
select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
- <select id="selectPakOutStep105" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=105 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ <select id="selectPakOutStep107" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
--
Gitblit v1.9.1