From 4f671756a2fe8b6e305c0fe3fd5d7ec42b9b2fb8 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Fri, 14 Apr 2023 15:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E7=BB=8F=E8=90=A5=E6=8C=87?=
 =?UTF-8?q?=E6=95=B0=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messageCenter/MessageCenterMapper.xml     | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
index 6377792b..e2a8e2b8 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
@@ -456,10 +456,27 @@
             (
                 SELECT
                     count(*) poundNum,
-                    IFNULL(ROUND( SUM( CASE a.unit WHEN '0' THEN a.buckle_weight WHEN '1' THEN a.buckle_weight / 1000 END ), 6 ),0) buckleWeightSum,
-                    IFNULL(ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ),0) settlementSum,
-                    IFNULL(ROUND( SUM( a.settlement * a.purchase_price ), 6 ),0) purchaseAmountSum,
-                    IFNULL(ROUND( SUM( a.settlement * a.sales_price ), 6 ),0) salesAmountSum
+                    IFNULL(
+                            ROUND( SUM( CASE a.unit WHEN '0' THEN a.net_weight WHEN '1' THEN a.net_weight / 1000 END ), 6 ),
+                            0
+                        ) buckleWeightSum,
+                    IFNULL(
+                            ROUND(
+                                    SUM(
+                                            CASE
+                                                a.unit
+                                                WHEN '0' THEN
+                                                    ( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END )
+                                                WHEN '1' THEN
+                                                    ( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END ) / 1000
+                                                END
+                                        ),
+                                    6
+                                ),
+                            0
+                        ) settlementSum,
+                    IFNULL( ROUND( SUM( a.settlement * a.purchase_price ), 6 ), 0 ) purchaseAmountSum,
+                    IFNULL( ROUND( SUM( a.settlement * a.sales_price ), 6 ), 0 ) salesAmountSum
                 FROM
                     jg_poundlist a
                 WHERE