From 6af7661ac19895e577606f0b3a2982c63923935c Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 11 十二月 2025 16:59:39 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 6 ++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 7 insertions(+), 1 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 b4b2b85..4e0841a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2964,7 +2964,7 @@
StaProtocol staProtocol = null;
if(emptyCount >= 2 && site == 1108){
continue;
- }else if(emptyCount > 1 && site == 2031){
+ }else if(emptyCount > 0 && site == 2031){
continue;
}
//濡傛灉绔欑偣鍙嚭绂佺敤锛屽垯涓嶇敓鎴愮┖鐩樺嚭搴撲换鍔�
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 55e9157..4be4902 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -24,6 +24,12 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="box_type3" property="boxType3"/>
+ <result column="standby1" property="standby1"/>
+ <result column="standby2" property="standby2"/>
+ <result column="standby3" property="standby3"/>
+ <result column="order_no" property="orderNo"/>
+
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
--
Gitblit v1.9.1