From f40e68e59fef7d029b9aee90ba9afbeacb0e88fd Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 18 十月 2023 08:44:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 +-
src/main/resources/mapper/WrkMastMapper.xml | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 7272427..23029a7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -121,7 +121,7 @@
List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour);
List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour);
- Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour);
+ Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour,@Param("workNo")Integer workNo);
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@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 f5a279c..3096cc0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1257,7 +1257,7 @@
public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
Collections.shuffle(slave.getCrnOutStn());
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
- // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11,12,13,14,15, 16锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
if (wrkMast == null) {
continue;
@@ -1267,8 +1267,8 @@
* 100銆�200瀛樺湪杩涜涓殑鐩樼偣浠诲姟锛屽垯涓嶆墽琛岀洏鐐逛换鍔�
* */
if (wrkMast.getIoType().equals(107)){
- Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
- if (countPan > 1){
+ Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo(),wrkMast.getWrkNo());
+ if (countPan > 0){
News.error("MainServiceImpl locToCrnStn 1271琛�"+"鐩樼偣鍑哄簱璺宠繃锛屽瓨鍦ㄨ繘琛屼腑鍙兘鍫靛浠诲姟鏁皗}涓�",countPan);
continue;
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d16d4c2..d638ef9 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -223,6 +223,7 @@
<select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer">
select count (*) from dbo.asr_wrk_mast where 1=1
+ and work_no!=#{workNo}
and
(
<choose>
--
Gitblit v1.9.1