From ecd79ff570939b55f455767f2b310590faa5a191 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:13:01 +0800
Subject: [PATCH] 1.新增组托时批号必须唯一 2.新增当有出库任务时禁止AGV入库搬运 3.拣料下架从任务状态16改成34
---
src/main/resources/mapper/ViewStayTimeMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index bb44371..2b01a4f 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -6,7 +6,7 @@
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
<sql id="viewStayTimeConditionSql">
<if test="loc_no!=null and loc_no!='' ">
- and loc_no like '%' + #{loc_no} + '%'
+ and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
</if>
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
@@ -40,7 +40,7 @@
</sql>
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewStayTimeList" resultType="com.zy.asrs.entity.ViewStayTimeBean">
+<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
select
*
from (
@@ -52,7 +52,7 @@
SELECT
GETDATE() AS today
, CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , dbo.asr_loc_detl.*
+ , asr_loc_detl.*
FROM asr_loc_detl
INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
where 1=1
@@ -61,7 +61,7 @@
) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
-<select id="getViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
+<select id="getViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
select
count(1)
from (
--
Gitblit v1.9.1