From 4cc37cd3debd02f0c3a4aa7a0d9bd44b83c28b33 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 27 一月 2026 13:44:06 +0800
Subject: [PATCH] 修复对接不传full报错bug
---
src/main/resources/mapper/LocDetlMapper.xml | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 281 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e2ab2e7..91f37f4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -52,7 +52,16 @@
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
</resultMap>
-
+ <sql id="batchSeq123">
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and a.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (a.box_type3 IS NULL OR a.box_type3 = '')
+ </otherwise>
+ </choose>
+ </sql>
<sql id="batchSeq">
<choose>
<when test="batch != null and batch != ''">
@@ -136,6 +145,56 @@
and (a.brand IS NULL OR a.brand = '')
</otherwise>
</choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and a.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (a.standby1 IS NULL OR a.standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and a.standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (a.standby2 IS NULL OR a.standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and a.standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (a.standby3 IS NULL OR a.standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and a.box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (a.box_type1 IS NULL OR a.box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and a.box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (a.box_type2 IS NULL OR a.box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and a.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (a.box_type3 IS NULL OR a.box_type3 = '')
+ </otherwise>
+ </choose>
+ </sql>
+ <sql id="batchSeq7">
<choose>
<when test="standby1 != null and standby1 != ''">
and a.standby1 = #{standby1}
@@ -354,6 +413,27 @@
<if test="standby2!=null and standby2!='' ">
and a.standby2 like '%' + #{standby2} + '%'
</if>
+ <if test="standby3!=null and standby3!='' ">
+ and a.standby3 like '%' + #{standby3} + '%'
+ </if>
+ <if test="boxType3!=null and boxType3!='' ">
+ and a.box_type3 like '%' + #{boxType3} + '%'
+ </if>
+ </sql>
+
+ <sql id="stockOutCondition1">
+ <if test="matnr!=null and matnr!='' ">
+ and a.matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="standby1!=null and standby1!='' ">
+ and a.standby1 like '%' + #{standby1} + '%'
+ </if>
+ <if test="standby2!=null and standby2!='' ">
+ and a.standby2 like '%' + #{standby2} + '%'
+ </if>
+ <if test="boxType3!=null and boxType3!='' ">
+ and a.box_type3 like '%' + #{boxType3} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -380,21 +460,48 @@
<include refid="stockOutCondition"></include>
</select>
- <select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
- select * from
- (
- select
- ROW_NUMBER() over (order by sum(a.anfme) desc) as row
- , a.matnr
- , a.batch
- , a.standby1
- , a.standby2
- , sum(a.anfme) as anfme
- from asr_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr, a.batch, a.standby1, a.standby2
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ <select id="getStockStatis" resultMap="BaseResultMap">
+ SELECT * FROM (
+ SELECT
+ ROW_NUMBER() OVER (ORDER BY SUM(a.anfme) DESC) AS row,
+ a.matnr,
+ a.batch,
+ a.standby1,
+ a.standby2,
+ MAX(a.box_type3) AS box_type3, -- 鍏抽敭锛氱敤 MAX 閬垮厤 null 鎴栦笉纭畾鎬�
+ SUM(a.anfme) AS anfme
+ FROM asr_loc_detl a
+ WHERE 1=1
+ <include refid="stockOutCondition"/>
+ GROUP BY
+ a.matnr,
+ a.batch,
+ a.standby1,
+ a.standby2,
+ a.box_type3 -- 淇濈暀锛屽洜涓轰笟鍔￠渶瑕佹寜閲囪喘鍗曞尯鍒�
+ ) t
+ WHERE t.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) AND (#{pageNumber}*#{pageSize})
+ </select>
+
+ <!-- 搴撳瓨缁熻瀵煎嚭锛氬叏閲忔眹鎬绘暟鎹紙涓嶅垎椤碉級 -->
+ <select id="selectStockStatisExport" resultMap="BaseResultMap">
+ SELECT
+ a.matnr,
+ a.batch,
+ a.standby1,
+ a.standby2,
+ MAX(a.box_type3) AS box_type3,
+ SUM(a.anfme) AS anfme
+ FROM asr_loc_detl a
+ WHERE 1=1
+ <include refid="stockOutCondition1"/>
+ GROUP BY
+ a.matnr,
+ a.batch,
+ a.standby1,
+ a.standby2,
+ a.box_type3
+ ORDER BY SUM(a.anfme) DESC
</select>
<select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -692,6 +799,164 @@
desc
</select>
+ <select id="queryStockAll7" resultMap="BaseResultMap">
+ select 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'
+ and a.matnr = #{matnr}
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeq7"></include>
+
+
+ <if test="locNos != null and locNos.size > 0">
+ and b.loc_no not in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ order by
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ desc,
+ NEWID(),
+ case
+ when (left(a.loc_no, 2) = '01') then 0
+ when (left(a.loc_no, 2) = '02') then 1
+ when (left(a.loc_no, 2) = '03') then 1
+ when (left(a.loc_no, 2) = '04') then 0
+ when (left(a.loc_no, 2) = '05') then 0
+ when (left(a.loc_no, 2) = '06') then 1
+ when (left(a.loc_no, 2) = '07') then 1
+ when (left(a.loc_no, 2) = '08') then 0
+ when (left(a.loc_no, 2) = '09') then 0
+ when (left(a.loc_no, 2) = '10') then 1
+ when (left(a.loc_no, 2) = '11') then 1
+ when (left(a.loc_no, 2) = '12') then 0
+ when (left(a.loc_no, 2) = '13') then 0
+ when (left(a.loc_no, 2) = '14') then 1
+ when (left(a.loc_no, 2) = '15') then 1
+ when (left(a.loc_no, 2) = '16') then 0
+ when (left(a.loc_no, 2) = '17') then 0
+ when (left(a.loc_no, 2) = '18') then 1
+ when (left(a.loc_no, 2) = '19') then 1
+ when (left(a.loc_no, 2) = '20') then 0
+ when (left(a.loc_no, 2) = '21') then 0
+ when (left(a.loc_no, 2) = '22') then 1
+ when (left(a.loc_no, 2) = '23') then 1
+ when (left(a.loc_no, 2) = '24') then 0
+ when (left(a.loc_no, 2) = '25') then 0
+ when (left(a.loc_no, 2) = '26') then 1
+ when (left(a.loc_no, 2) = '27') then 1
+ when (left(a.loc_no, 2) = '28') then 0
+ when (left(a.loc_no, 2) = '29') then 0
+ when (left(a.loc_no, 2) = '30') then 1
+ when (left(a.loc_no, 2) = '31') then 1
+ when (left(a.loc_no, 2) = '32') then 0
+ when (left(a.loc_no, 2) = '33') then 0
+ when (left(a.loc_no, 2) = '34') then 1
+ when (left(a.loc_no, 2) = '35') then 1
+ when (left(a.loc_no, 2) = '36') then 0
+ when (left(a.loc_no, 2) = '37') then 0
+ when (left(a.loc_no, 2) = '38') then 1
+ when (left(a.loc_no, 2) = '39') then 1
+ when (left(a.loc_no, 2) = '40') then 0
+ when (left(a.loc_no, 2) = '41') then 0
+ when (left(a.loc_no, 2) = '42') then 1
+ when (left(a.loc_no, 2) = '43') then 1
+ when (left(a.loc_no, 2) = '44') then 0
+ when (left(a.loc_no, 2) = '45') then 0
+ when (left(a.loc_no, 2) = '46') then 1
+ when (left(a.loc_no, 2) = '47') then 1
+ when (left(a.loc_no, 2) = '48') then 0
+ else 0
+ end
+ desc
+ </select>
+
+ <select id="queryStockAll123" resultMap="BaseResultMap">
+ select 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'
+ and a.matnr = #{matnr}
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeq123"></include>
+
+
+ <if test="locNos != null and locNos.size > 0">
+ and b.loc_no not in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ order by
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ desc,
+ NEWID(),
+ case
+ when (left(a.loc_no, 2) = '01') then 0
+ when (left(a.loc_no, 2) = '02') then 1
+ when (left(a.loc_no, 2) = '03') then 1
+ when (left(a.loc_no, 2) = '04') then 0
+ when (left(a.loc_no, 2) = '05') then 0
+ when (left(a.loc_no, 2) = '06') then 1
+ when (left(a.loc_no, 2) = '07') then 1
+ when (left(a.loc_no, 2) = '08') then 0
+ when (left(a.loc_no, 2) = '09') then 0
+ when (left(a.loc_no, 2) = '10') then 1
+ when (left(a.loc_no, 2) = '11') then 1
+ when (left(a.loc_no, 2) = '12') then 0
+ when (left(a.loc_no, 2) = '13') then 0
+ when (left(a.loc_no, 2) = '14') then 1
+ when (left(a.loc_no, 2) = '15') then 1
+ when (left(a.loc_no, 2) = '16') then 0
+ when (left(a.loc_no, 2) = '17') then 0
+ when (left(a.loc_no, 2) = '18') then 1
+ when (left(a.loc_no, 2) = '19') then 1
+ when (left(a.loc_no, 2) = '20') then 0
+ when (left(a.loc_no, 2) = '21') then 0
+ when (left(a.loc_no, 2) = '22') then 1
+ when (left(a.loc_no, 2) = '23') then 1
+ when (left(a.loc_no, 2) = '24') then 0
+ when (left(a.loc_no, 2) = '25') then 0
+ when (left(a.loc_no, 2) = '26') then 1
+ when (left(a.loc_no, 2) = '27') then 1
+ when (left(a.loc_no, 2) = '28') then 0
+ when (left(a.loc_no, 2) = '29') then 0
+ when (left(a.loc_no, 2) = '30') then 1
+ when (left(a.loc_no, 2) = '31') then 1
+ when (left(a.loc_no, 2) = '32') then 0
+ when (left(a.loc_no, 2) = '33') then 0
+ when (left(a.loc_no, 2) = '34') then 1
+ when (left(a.loc_no, 2) = '35') then 1
+ when (left(a.loc_no, 2) = '36') then 0
+ when (left(a.loc_no, 2) = '37') then 0
+ when (left(a.loc_no, 2) = '38') then 1
+ when (left(a.loc_no, 2) = '39') then 1
+ when (left(a.loc_no, 2) = '40') then 0
+ when (left(a.loc_no, 2) = '41') then 0
+ when (left(a.loc_no, 2) = '42') then 1
+ when (left(a.loc_no, 2) = '43') then 1
+ when (left(a.loc_no, 2) = '44') then 0
+ when (left(a.loc_no, 2) = '45') then 0
+ when (left(a.loc_no, 2) = '46') then 1
+ when (left(a.loc_no, 2) = '47') then 1
+ when (left(a.loc_no, 2) = '48') then 0
+ else 0
+ end
+ desc
+ </select>
+
<select id="queryStockAnfme" resultType="java.lang.Double">
select sum(anfme) as count from man_loc_detl
where 1=1
--
Gitblit v1.9.1