From 6797af492e55d2e63a95ed8f6d86e274f85a09c3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 26 一月 2026 13:24:31 +0800
Subject: [PATCH] 6.8 查询所有库位状态和物料-二机床信息化数字孪生用
---
src/main/resources/mapper/ViewStayTimeMapper.xml | 165 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index bc23e60..2793723 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -4,9 +4,9 @@
<mapper namespace="com.zy.asrs.mapper.ReportQueryMapper">
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewStayTimeConditionSql">
+<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} + '%'
@@ -14,9 +14,6 @@
<if test="stay_time!=null and stay_time!='' ">
and stay_time > #{stay_time}
</if>
-<!-- <if test="appe_time!=null and appe_time!='' "> -->
-<!-- and appe_time > #{appe_time} -->
-<!-- </if> -->
<if test="maktx!=null and maktx!='' ">
and (maktx like '%' + #{maktx} + '%'
or lgnum like '%' + #{maktx} + '%'
@@ -32,56 +29,136 @@
</if>
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
- and appe_time >= #{begin_date}
- ]]>
- </if>
+ and appe_time >= #{begin_date}
+ ]]>
+ </if>
<if test="end_date!=null and end_date!='' ">
<![CDATA[
- and appe_time <= #{end_date}
- ]]>
+ and appe_time <= #{end_date}
+ ]]>
</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" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
-select * from (
-select *,ROW_NUMBER() OVER(Order by appe_time,loc_no,matnr) as rowid
- from asr_stk_staytime_view
-<where>
- 1=1
- <include refid="viewStayTimeConditionSql"></include>
-</where>
- ) as a
-<where>
- rowid between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- <![CDATA[
- order by a.appe_time asc
- ]]>
-</where>
+<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultMap="ViewStayTimeMap">
+ select
+ *
+ from (
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , 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
+ <include refid="viewStayTimeConditionSql"></include>
+ ) t
+ ) 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 count(1) from asr_stk_staytime_view a
-<where>
-<![CDATA[
- 1=1
-]]>
-<include refid="viewStayTimeConditionSql"></include>
-</where>
+<select id="getViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
+ select
+ count(1)
+ from (
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , dbo.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
+ <include refid="viewStayTimeConditionSql"></include>
+ ) t
+ ) a
</select>
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
-select * from asr_stk_staytime_view a
-<where>
- <![CDATA[
- 1=1
- ]]>
- <include refid="viewStayTimeConditionSql"></include>
- <![CDATA[
- order by appe_time asc
- ]]>
-</where>
+ select
+ *
+ from (
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , dbo.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
+ <include refid="viewStayTimeConditionSql"></include>
+ ) t
+ ) a
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.1