From 09a482e8fb4d4dac63aed1503fd91e738ddb070d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 04 七月 2024 10:42:24 +0800
Subject: [PATCH] # 并板出库
---
src/main/resources/mapper/MatMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 3a5c151..28a995c 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -34,7 +34,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
@@ -55,11 +55,13 @@
LEFT JOIN (
select
matnr,
- sum(anfme) as amount
+ sum(anfme) as amount,
+ batch
from man_loc_detl
- group by matnr
+ group by matnr,batch
) as mld on mld.matnr = mm.matnr
WHERE 1=1
+ and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
<if test="matnr != null and matnr != ''">
and mm.matnr like concat('%',#{matnr},'%')
@@ -67,6 +69,9 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="batch != null and batch != ''">
+ and mld.batch like concat('%',#{batch},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
--
Gitblit v1.9.1