From 5430dc3eb2a8490c799298fe6578d55f1992df2b Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 16 八月 2024 18:01:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1 +
src/main/resources/mapper/WrkMastMapper.xml | 9 +++++++++
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 88381a1..5502798 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -126,6 +126,7 @@
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWorkingPakoutTwoF(@Param("staNo")Integer staNo);
WrkMast selectShallowLoc(@Param("row")Integer row,@Param("bay")Integer bay,@Param("lev")Integer lev);
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 1504420..3d8479a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1065,7 +1065,7 @@
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
if (crnProtocol.modeType == CrnModeType.AUTO
&& crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()!=(short)4) {
News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
// 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -1097,7 +1097,7 @@
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
if (crnProtocol.modeType == CrnModeType.AUTO
&& crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()==(short)4) {
News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
// 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -4873,8 +4873,8 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
- Integer sourceStaNo = inSta.getStaNo()==103 ? 104 : inSta.getStaNo()==113 ? 104 : 204;
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(sourceStaNo);
+ Integer staNoEnd = inSta.getStaNo()==113 ? 114 : 214;
+ WrkMast pakout = wrkMastMapper.selectWorkingPakoutTwoF(staNoEnd);
boolean sign = true;
int[] staNos = new int[3];
@@ -4883,7 +4883,7 @@
staNos = new int[]{112,113,114};
for (int staNo : staNos){
StaProtocol staProtocol = devpThread.getStation().get(staNo);
- if (!staProtocol.isAutoing() || staProtocol.isLoading()){
+ if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
sign = false;
}
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 461bfe5..72bfac7 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -273,6 +273,15 @@
order by io_time,wrk_no
</select>
+ <select id="selectWorkingPakoutTwoF" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where wrk_sts > 10
+ and io_type > 100 and io_type != 11
+ and sta_no = #{staNo}
+ order by io_time,wrk_no
+ </select>
+
<select id="selectShallowLoc" resultMap="BaseResultMap">
select top 1 *
from dbo.asr_loc_mast
--
Gitblit v1.9.1