From 44c14fe845ea66e64e2bb3e8bcd172f4a0840747 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 30 一月 2026 19:07:14 +0800
Subject: [PATCH] pda组托搜索按编号和名称查询
---
src/main/resources/mapper/ViewStayTimeMapper.xml | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index bb44371..2793723 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} + '%'
@@ -38,9 +38,66 @@
]]>
</if>
</sql>
+ <resultMap id="ViewStayTimeMap" type="com.zy.asrs.entity.ViewStayTimeBean">
+ <!-- 鍒嗛〉 / 琛屽彿 -->
+ <result column="row" property="row"/>
+ <result column="stay_time" property="stay_time"/>
+
+ <!-- 鏃堕棿鏉′欢 -->
+ <result column="begin_date" property="begin_date"/>
+ <result column="end_date" property="end_date"/>
+
+ <!-- 鍩虹淇℃伅 -->
+ <result column="loc_no" property="loc_no"/>
+ <result column="zpallet" property="zpallet"/>
+ <result column="anfme" property="anfme"/>
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="batch" property="batch"/>
+
+ <!-- 鈿狅笍 鐗瑰埆娉ㄦ剰杩欎釜 -->
+ <result column="order_no" property="orderNo"/>
+
+ <result column="specs" property="specs"/>
+ <result column="model" property="model"/>
+ <result column="color" property="color"/>
+ <result column="brand" property="brand"/>
+ <result column="unit" property="unit"/>
+ <result column="price" property="price"/>
+ <result column="sku" property="sku"/>
+ <result column="units" property="units"/>
+ <result column="barcode" property="barcode"/>
+ <result column="origin" property="origin"/>
+ <result column="manu" property="manu"/>
+ <result column="manu_date" property="manu_date"/>
+ <result column="item_num" property="item_num"/>
+ <result column="safe_qty" property="safe_qty"/>
+ <result column="weight" property="weight"/>
+ <result column="man_length" property="man_length"/>
+ <result column="volume" property="volume"/>
+ <result column="three_code" property="three_code"/>
+ <result column="supp" property="supp"/>
+ <result column="supp_code" property="supp_code"/>
+
+ <!-- 鏍囧織浣� -->
+ <result column="be_batch" property="be_batch"/>
+ <result column="dead_time" property="dead_time"/>
+ <result column="dead_warn" property="dead_warn"/>
+ <result column="source" property="source"/>
+ <result column="inspect" property="inspect"/>
+ <result column="danger" property="danger"/>
+
+ <!-- 瀹¤瀛楁 -->
+ <result column="modi_user" property="modi_user"/>
+ <result column="modi_time" property="modi_time"/>
+ <result column="appe_user" property="appe_user"/>
+ <result column="appe_time" property="appe_time"/>
+ <result column="memo" property="memo"/>
+
+ </resultMap>
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewStayTimeList" resultType="com.zy.asrs.entity.ViewStayTimeBean">
+<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultMap="ViewStayTimeMap">
select
*
from (
@@ -52,7 +109,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 +118,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