From 1f97a20465e29c4ae1824aa66408c77213812c40 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:38:18 +0800
Subject: [PATCH] #新增erp中间表库存同步功能
---
src/main/resources/mapper/LocDetlMapper.xml | 238 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 191 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d45615b..f23abf1 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -52,7 +52,6 @@
<result column="temp3" property="temp3" />
<result column="pg_no" property="sPgNO" />
<result column="pro_type" property="proType" />
- <result column="auto_id" property="autoId" />
<result column="out_order_no" property="outOrderNo" />
<result column="lu_hao" property="luHao" />
<result column="ware_id" property="wareId" />
@@ -62,29 +61,90 @@
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
+ <when test="locDetl.batch != null and locDetl.batch != ''">
+ and batch = #{locDetl.batch}
</when>
<otherwise>
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+
+ <choose>
+ <when test="locDetl.proType != null and locDetl.proType != ''">
+ and pro_type = #{locDetl.proType}
+ </when>
+ <otherwise>
+ and (pro_type IS NULL OR pro_type = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.luHao != null and locDetl.luHao != ''">
+ and lu_hao = #{locDetl.luHao}
+ </when>
+ <otherwise>
+ and (lu_hao IS NULL OR lu_hao = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.packing != null and locDetl.packing != ''">
+ and packing = #{locDetl.packing}
+ </when>
+ <otherwise>
+ and (packing IS NULL OR packing = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.sPgNO != null and locDetl.sPgNO != ''">
+ and pg_no = #{locDetl.sPgNO}
+ </when>
+ <otherwise>
+ and (pg_no IS NULL OR pg_no = '')
+ </otherwise>
+ </choose>
+
+ <choose>
+ <when test="locDetl.outOrderNo != null and locDetl.outOrderNo != ''">
+ and out_order_no = #{locDetl.outOrderNo}
+ </when>
+ <otherwise>
+ and (out_order_no IS NULL OR out_order_no = '')
+ </otherwise>
+ </choose>
</sql>
- <select id="selectItem" resultMap="BaseResultMap">
+ <!-- <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 *
from asr_loc_detl
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ </select>
+
+ <select id="selectItem3" resultMap="BaseResultMap">
+ select *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
</select>
<delete id="deleteItem">
delete from asr_loc_detl
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</delete>
@@ -94,9 +154,43 @@
, modi_time = getdate()
where 1=1
and loc_no = #{locNo}
- and matnr = #{matnr}
+ and matnr = #{locDetl.matnr}
<include refid="batchSeq"></include>
</update>
+
+ <sql id="stockOutConditionTwo">
+ <if test="loc_no!=null and loc_no!='' ">
+ AND a.loc_no LIKE '%' + #{loc_no} + '%'
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ AND a.matnr LIKE '%' + #{matnr} + '%'
+ </if>
+ <if test="model!=null and model!='' ">
+ AND a.model LIKE '%' + #{model} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ AND a.specs LIKE '%' + #{specs} + '%'
+ </if>
+ <if test="batch!=null and batch!='' ">
+ AND a.batch LIKE '%' + #{batch} + '%'
+ </if>
+ <if test="supp!=null and supp!='' ">
+ AND a.supp LIKE '%' + #{supp} + '%'
+ </if>
+ <if test="outOrderNo!=null and outOrderNo!='' ">
+ AND a.out_order_no LIKE '%' + #{outOrderNo} + '%'
+ </if>
+ <if test="proType!=null and proType!='' ">
+ AND a.pro_type = #{proType}
+ </if>
+ <if test="temp1!=null and temp1!='' ">
+ AND a.temp1 LIKE '%' + #{temp1} + '%'
+ </if>
+ <!-- 浠ヤ笅瀛楁濡備笉鍦⊿ELECT鍜孏ROUP BY涓缓璁垹鍘绘垨鏀逛负HAVING -->
+ <!-- <if test="anfme!=null and anfme!='' ">
+ HAVING SUM(a.anfme) LIKE '%' + #{anfme} + '%'
+ </if> -->
+ </sql>
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
@@ -126,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>
@@ -141,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>
@@ -163,30 +265,41 @@
</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
- , sum(a.anfme) as anfme
- from asr_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ SELECT * FROM (
+ SELECT
+ ROW_NUMBER() OVER (ORDER BY SUM(a.anfme) DESC) AS row,
+ -- 鍒嗙粍瀛楁
+ 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,
+ MAX(a.temp1) AS temp1,
+ -- 鑱氬悎鏁伴噺
+ SUM(a.anfme) AS anfme
+ FROM asr_loc_detl a
+ WHERE 1=1
+ <include refid="stockOutConditionTwo"/>
+ 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>
+
+
+
<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.matnr
+ a.model
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
- ) b
+ group by a.model
+ ) b
</select>
<select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">
@@ -236,14 +349,15 @@
where 1=1
and b.loc_sts = 'F'
-<!-- <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="batch != null and batch != ''">-->
+ <!-- and a.batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (a.batch IS NULL OR a.batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+
<if test="sPgNO != null and sPgNO != ''">
and a.pg_no = #{sPgNO}
@@ -251,17 +365,41 @@
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
-<!-- <if test="orderNo != null and orderNo != ''">-->
-<!-- and a.order_no = #{orderNo}-->
-<!-- </if>-->
+ <if test="outOrderNo != null and outOrderNo != ''">
+ and a.out_order_no = #{outOrderNo}
+ </if>
+ <if test="temp2 != null and temp2 != ''">
+ and a.temp2 = #{temp2}
+ </if>
+ <if test="proType != null and proType != ''">
+ and a.pro_type = #{proType}
+ </if>
<if test="model != null and model != ''">
and a.model = #{model}
- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
+ </if>
+ <if test="luHao != null and luHao != ''">
+ and a.lu_hao = #{luHao}
+ </if>
+
+ <!-- <choose>-->
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (batch IS NULL OR batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+ <!-- <if test="orderNo != null and orderNo != ''">-->
+ <!-- and a.order_no = #{orderNo}-->
+ <!-- </if>-->
+ <if test="matnr != null and matnr != ''">
+ and a.matnr = #{matnr}
+ -- and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</if>
<if test="locNos != null and locNos.size > 0">
and b.loc_no not in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
@@ -326,8 +464,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>
@@ -452,6 +590,12 @@
<id column="outOrderNo" property="outOrderNo" />
<id column="batch" property="batch" />
<id column="model" property="model" />
+
+ <id column="luHao" property="luHao" />
+ <id column="packing" property="packing" />
+ <id column="proType" property="proType" />
+ <id column="color" property="color" />
+
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
--
Gitblit v1.9.1