From 896aea7374cf621a0e16b9c90eadff763cad7677 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 10:53:29 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 1f38471..1ea5ec3 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -115,14 +115,14 @@
</choose>
</sql>
-<!-- <select id="selectItem" resultMap="BaseResultMap">-->
-<!-- select top 1 *-->
-<!-- from asr_loc_detl-->
-<!-- where 1=1-->
-<!-- and loc_no = #{locNo}-->
-<!-- and matnr = #{matnr}-->
-<!-- <include refid="batchSeq"></include>-->
-<!-- </select>-->
+ <!-- <select id="selectItem" resultMap="BaseResultMap">-->
+ <!-- select top 1 *-->
+ <!-- from asr_loc_detl-->
+ <!-- where 1=1-->
+ <!-- and loc_no = #{locNo}-->
+ <!-- and matnr = #{matnr}-->
+ <!-- <include refid="batchSeq"></include>-->
+ <!-- </select>-->
<select id="selectItem2" resultMap="BaseResultMap">
select top 1 *
@@ -220,7 +220,15 @@
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
</if>
-
+ <if test="proType!=null and proType!='' ">
+ and a.pro_type like '%' + #{proType} + '%'
+ </if>
+ <if test="temp1!=null and temp1!='' ">
+ and a.temp1 like '%' + #{temp1} + '%'
+ </if>
+ <if test="temp2!=null and temp2!='' ">
+ and a.temp2 like '%' + #{temp2} + '%'
+ </if>
<if test="sPgNO!=null and sPgNO!='' ">
and a.pg_no like '%' + #{sPgNO} + '%'
</if>
@@ -235,14 +243,14 @@
<select id="getStockOutPage" resultMap="BaseResultMap">
select * from
(
- select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
- a.*
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- <include refid="stockOutCondition"></include>
+ select
+ ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F'
+ <include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -264,6 +272,7 @@
a.model,
a.pro_type AS proType,
a.out_order_no AS outOrderNo,
+ a.temp2 AS temp2,
-- 闈炲垎缁勫瓧娈电敤鑱氬悎鍑芥暟鑾峰彇涓�涓唬琛ㄥ�硷紙渚嬪MAX鎴朚IN锛�
MAX(a.matnr) AS matnr,
MAX(a.specs) AS specs,
@@ -273,7 +282,7 @@
FROM asr_loc_detl a
WHERE 1=1
<include refid="stockOutConditionTwo"/>
- GROUP BY a.model, a.pro_type, a.out_order_no
+ GROUP BY a.model, a.pro_type, a.out_order_no, a.temp2
) t
WHERE t.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) AND (#{pageNumber}*#{pageSize})
</select>
@@ -282,7 +291,7 @@
<select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
- select count(1) as count from
+ select count(1) as count from
(
select
a.model
@@ -290,7 +299,7 @@
where 1=1
<include refid="stockOutCondition"></include>
group by a.model
- ) b
+ ) b
</select>
<select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">
@@ -369,7 +378,7 @@
<!-- </if>-->
<if test="matnr != null and matnr != ''">
and a.matnr = #{matnr}
--- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
+ -- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</if>
<if test="locNos != null and locNos.size > 0">
@@ -439,8 +448,8 @@
<select id="queryStockAnfme" resultType="java.lang.Double">
select sum(anfme) as count from man_loc_detl
- where 1=1
- and matnr = #{matnr}
+ where 1=1
+ and matnr = #{matnr}
<if test="batch != null and batch != ''">
and batch = #{batch}
</if>
--
Gitblit v1.9.1