From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ee58380..900ece5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -110,7 +110,7 @@
and a.owner = #{owner}
</if>
<if test="batch !=null and batch!='' ">
- and a.batch like #{batch}
+ and a.batch like '%' + #{batch} + '%'
</if>
</sql>
@@ -148,14 +148,14 @@
left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- <choose>
- <when test="owner != null and owner != 0">
- and owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner != 0">-->
+<!-- and owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<!-- <choose>-->
<!-- <when test="payment != null and payment != 0">-->
<!-- and payment = #{payment}-->
@@ -175,14 +175,14 @@
left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- <choose>
- <when test="owner != null and owner != 0">
- and owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner != 0">-->
+<!-- and owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<!-- <choose>-->
<!-- <when test="payment != null and payment != 0">-->
<!-- and payment = #{payment}-->
@@ -278,14 +278,14 @@
<!-- </otherwise>-->
<!-- </choose>-->
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -448,14 +448,14 @@
<!-- </otherwise>-->
<!-- </choose>-->
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -574,12 +574,13 @@
</select>
<select id="getStockStatisAll" resultType="com.zy.asrs.entity.result.LocDetlAll">
- select t.*,m.specs from
+ select t.* from
(
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr,a.batch
, sum(a.anfme) as anfme
+ ,sum (a.weight) as weight
,owner
,payment
from asr_loc_detl_all a
@@ -587,7 +588,7 @@
<include refid="stockOutCondition"></include>
group by a.matnr,a.batch,a.owner,a.payment
) t
- LEFT JOIN man_mat m on t.matnr = m.matnr
+
where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -651,24 +652,24 @@
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- <!-- <choose>-->
- <!-- <when test="batch != null and batch != ''">-->
- <!-- and a.batch = #{batch}-->
- <!-- </when>-->
- <!-- <otherwise>-->
- <!-- and (a.batch IS NULL OR a.batch = '')-->
- <!-- </otherwise>-->
- <!-- </choose>-->
-
<choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
</when>
<otherwise>
- and 1!=1
+ and (a.batch IS NULL OR a.batch = '')
</otherwise>
</choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
+
order by
a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
--
Gitblit v1.9.1