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 | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3f5a495..4d9d046 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -345,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>
@@ -401,11 +404,15 @@
, 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>
@@ -417,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>
@@ -428,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">
--
Gitblit v1.9.1