From bcde9271ecf7a978bbaa7b701fa6da571e165ef7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 07 十月 2024 16:34:24 +0800
Subject: [PATCH] 跨巷道移库
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++++++-
src/main/resources/mapper/WrkMastMapper.xml | 4 ++--
src/main/java/com/zy/core/MainProcess.java | 3 +++
3 files changed, 15 insertions(+), 3 deletions(-)
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 0c92e9b..bf4f3bb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1591,8 +1591,10 @@
continue;
}
+ log.info("{}鍙峰爢鍨涙満閫夊畾鐨勫嚭搴撳彛鏄瘂}",crnProtocol.getCrnNo(),crnStn.getPlatNo());
+
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
- if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
+ if ((wrkMast.getIoType() < 100 && wrkMast.getIoType()!=12) || wrkMast.getSourceStaNo() == null) {
log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
continue;
}
@@ -4684,4 +4686,11 @@
}
}
}
+
+ /**
+ * 12.璺ㄥ贩閬撶Щ搴�
+ */
+ public synchronized void autoMoveLoc() {
+
+ }
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4399b06..704c90f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -75,6 +75,9 @@
// 浜屾ゼ绌烘墭鍥炴祦鍒颁竴妤硷紝3.绔欏埌绔欎换鍔�
mainService.emptyTrayReflux();
+ // 12.璺ㄥ贩閬撹浆绉�
+ mainService.autoMoveLoc();
+
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
// i++;
// k++;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 2e8cee7..95e0cc9 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -103,7 +103,7 @@
</select>
<select id="selectPakInStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where wrk_sts=2 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 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57 or io_type = 12) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
@@ -184,7 +184,7 @@
</select>
<select id="selectPakOutStep12" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and (io_type>100 or io_type = 12) order by io_pri desc,io_time,wrk_no asc
</select>
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
--
Gitblit v1.9.1