From 606d031bdb591611ee50007948082dd29e420c68 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 17:34:16 +0800
Subject: [PATCH] 出入库通知单--实时核算
---
igds-inout/src/main/resources/mapper/InoutCommonMapper.xml | 11 +++--------
igds-web/pom.xml | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
index 315bf8b..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_
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>
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 4c92a4d..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -144,15 +144,15 @@
</dependency>
- <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
+ <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-inte</artifactId>
<version>${igds.version}</version>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-fzzy3</artifactId>
@@ -167,7 +167,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
<!-- MODBUS-TCP
<dependency>
@@ -204,7 +204,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-es</artifactId>
@@ -236,9 +236,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -253,7 +253,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
@@ -272,7 +272,7 @@
</exclusions>
</dependency>-->
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK-->
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -287,7 +287,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
</dependencies>
<dependencyManagement>
--
Gitblit v1.9.3