From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能
---
src/main/resources/mapper/LocDetlMapper.xml | 127 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 5effeea..4d9d046 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -185,6 +185,24 @@
</otherwise>
</choose>
</sql>
+ <sql id="batchSeqB">
+ <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="model != null and model != ''">
+ and a.model = #{model}
+ </when>
+ <otherwise>
+ and (a.model IS NULL OR a.model = '')
+ </otherwise>
+ </choose>
+ </sql>
<sql id="batchSeqNew">
<choose>
<when test="batch != null and batch != ''">
@@ -327,6 +345,9 @@
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
</if>
+ <if test="brand!=null and brand!='' ">
+ and a.brand like '%' + #{brand} + '%'
+ </if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
</if>
@@ -343,7 +364,10 @@
and a.specs like '%' + #{specs} + '%'
</if>
<if test="model!=null and model!='' ">
- and a.specs like '%' + #{model} + '%'
+ and a.model like '%' + #{model} + '%'
+ </if>
+ <if test="volume!=null and volume!='' ">
+ and a.volume like '%' + #{volume} + '%'
</if>
</sql>
@@ -375,16 +399,20 @@
select * from
(
select
- ROW_NUMBER() over (order by sum(a.anfme) desc) as row
+ ROW_NUMBER() over (order by matnr desc) as row
, a.matnr
, a.maktx
, a.model
, a.volume
+ ,manu_date manuDate
+ ,batch
, sum(a.anfme) as anfme
+ ,sum(a.weight) weight
+ ,sum(a.man_length) manLength
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.maktx,a.model,a.volume
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -396,10 +424,12 @@
, a.maktx
, a.model
, a.volume
+ ,manu_date manuDate
+ ,batch
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.maktx, a.model,a.volume
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
) b
</select>
@@ -407,10 +437,17 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ , a.maktx
+ , a.model
+ , a.volume
+ ,manu_date manuDate
+ ,batch
, sum(a.anfme) as anfme
+ ,sum(a.weight) weight
+ ,sum(a.man_length) manLength
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
@@ -617,6 +654,86 @@
desc
</select>
+ <select id="queryStockAllNew" 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}
+ and a.volume = #{volume}
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeqB"></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