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 | 112 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c710f9a..900ece5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -109,6 +109,9 @@
<if test="owner !=null and owner!='' ">
and a.owner = #{owner}
</if>
+ <if test="batch !=null and batch!='' ">
+ and a.batch like '%' + #{batch} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -145,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}-->
@@ -172,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}-->
@@ -221,10 +224,11 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ ,a.batch
, sum(a.anfme) as anfme
from asr_loc_detl_all a
where 1=1
- group by a.matnr
+ group by a.matnr,a.batch
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
@@ -274,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
@@ -434,7 +438,7 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -444,17 +448,17 @@
<!-- </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.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
@@ -570,20 +574,21 @@
</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.matnr,a.batch
, sum(a.anfme) as anfme
+ ,sum (a.weight) as weight
,owner
,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.owner,a.payment
+ 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>
@@ -592,12 +597,13 @@
(
select
a.matnr
+ ,a.batch
,owner
,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.owner,a.payment
+ group by a.matnr,a.batch,a.owner,a.payment
) b
</select>
@@ -645,27 +651,27 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
- <!-- <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.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
--
Gitblit v1.9.1