From d74fa6d60337975c0e254d25d6235aaf1bd0e124 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 11 Sep 2024 18:35:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FilterOrderDetailDeptResultRequest.java   |  1 +
 .../mapper/inout/IoOrderDetailResultDao.xml   | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java
index 7094861de..8b36ed91d 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java
@@ -36,6 +36,7 @@ public class FilterOrderDetailDeptResultRequest extends ListPageRequest {
     private String confirmStarTime;  //发票确认起始日期
     private String confirmEndTime;   //发票确认结束日期
     private String corpName;//供应商名字
+    private String fromInvCode;//供应商名字
 
 
     private Boolean groupBuy;          //是否集采产品
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index a463b1237..0e689156a 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -120,15 +120,17 @@
     <select id="filterOrderDeptList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptResultResponse">
         SELECT
         aw.code as fromInvCode,
-        SUM(CASE WHEN a1.mainAction = 'WareHouseIn' THEN COALESCE(a2.price,0) * COALESCE(a2.count,0)
-        WHEN a1.mainAction = 'WareHouseOut' THEN -(COALESCE(a2.price,0) * COALESCE(a2.count,0))
+        aw.name as fromInvName,
+        SUM(CASE WHEN a1.mainAction = 'WareHouseOut' THEN COALESCE(a2.price,0) * COALESCE(a2.count,0)
+        WHEN a1.mainAction = 'WareHouseIn' THEN -(COALESCE(a2.price,0) * COALESCE(a2.count,0))
         ELSE 0
         END) AS amount,
-        SUM(CASE WHEN a1.mainAction = 'WareHouseIn' THEN COALESCE(a2.count,0)
-        WHEN a1.mainAction = 'WareHouseOut' THEN -(COALESCE(a2.count,0))
+
+        SUM(CASE WHEN a1.mainAction = 'WareHouseOut' THEN COALESCE(a2.count,0)
+        WHEN a1.mainAction = 'WareHouseIn' THEN -(COALESCE(a2.count,0))
         ELSE 0
-        END) AS `count`,
-        aw.name as fromInvName
+        END) AS `count`
+
         FROM auth_warehouse aw
         LEFT JOIN io_order a1 ON  a1.fromInvCode =  aw.CODE
         LEFT JOIN io_order_detail_result a2 ON a1.billNo = a2.orderIdFk
@@ -137,6 +139,9 @@
             <if test="invCode != null and invCode != ''">
                 AND a1.invCode = #{invCode}
             </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND a1.mainAction = #{mainAction}
+            </if>
             <if test="action != null and action != ''">
                 AND a1.action = #{action}
             </if>
@@ -146,6 +151,9 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND a1.fromCorp = #{fromCorp}
             </if>
+            <if test="fromInvCode != null and fromInvCode != ''">
+                AND a1.fromInvCode = #{fromInvCode}
+            </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
                 date_format(#{endAduditTime}, '%Y-%m-%d')