From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/resources/mapper/InoutCommonMapper.xml | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
index c0a1fb2..aed17a0 100644
--- a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
@@ -293,14 +293,12 @@
<update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
update D_INOUT_NOTICE_IN t,(
SELECT
- r.CUSTOMER_ID_,
r.FOOD_VARIETY_,
r.NOTICE_ID_,
- sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
+ sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
from d_inout_record r
where r.COMPANY_ID_ = #{param.companyId}
and r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
and r.FOOD_VARIETY_ = #{param.foodVariety}
and r.NOTICE_ID_ = #{param.id}
and r.RECORD_STATUS_ != 'DEL'
@@ -308,8 +306,8 @@
GROUP BY r.FOOD_VARIETY_
) b
SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ WHERE
+ t.FOOD_VARIETY_ = b.FOOD_VARIETY_
AND t.ID_ = b.NOTICE_ID_
</update>
@@ -465,7 +463,6 @@
<update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
update D_INOUT_NOTICE_OUT t,(
SELECT
- r.CUSTOMER_ID_,
r.FOOD_VARIETY_,
r.DEPOT_ID_,
r.NOTICE_ID_,
@@ -473,7 +470,6 @@
from d_inout_record r
where r.COMPANY_ID_ = #{param.companyId}
AND r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
and r.DEPOT_ID_ = #{param.depotId}
and r.FOOD_VARIETY_ = #{param.foodVariety}
and r.RECORD_STATUS_ != 'DEL'
@@ -481,8 +477,7 @@
GROUP BY r.DEPOT_ID_
) b
SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ WHERE t.FOOD_VARIETY_ = b.FOOD_VARIETY_
AND t.DEPOT_ID_ = b.DEPOT_ID_
AND t.ID_ = b.NOTICE_ID_
</update>
--
Gitblit v1.9.3