From bdce31fd120537dc8eb4f3c53c7819f0cad4c177 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Mon, 15 May 2023 16:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BE=85=20=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messageCenter/MessageCenterMapper.xml     | 36 +++++++++++++++----
 .../admin/components/PurchasingTodayList.vue  |  2 +-
 2 files changed, 30 insertions(+), 8 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 b48a2677..126fbf7f 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
@@ -851,6 +851,7 @@
     </resultMap>
     <select id="getPurchaseorderData" resultMap="getPurchaseorderDataMap">
 
+
 SET @i = 0;
 SELECT
 	( @i := @i + 1 ) AS Number,
@@ -863,12 +864,13 @@ SELECT
 	IFNULL(
 		ROUND(
 			SUM( purchase_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
-			6
+			2
 		),
 		0
-	) amout,-- 	IF(is_pay=1,0,ROUND( SUM( purchase_price ) /COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ) , 6 )   )  AS notPaypalAmounts,
+	) amout,
 	notPaypalAmounts,
-	SUM( paypal_amounts ) paypalamounts
+-- 	SUM( paypal_amounts ) paypalamountsss,
+ROUND(paypalamounts,2) AS paypalamounts
 FROM
 	jg_poundlist a
 	LEFT JOIN base_organize z ON a.department_id = z.F_Id
@@ -880,13 +882,24 @@ FROM
 			0,
 			ROUND(
 				SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
-				6
+			2
 			)
 		) AS notPaypalAmounts,
+			IF
+		(
+			is_pay = 0,
+			0,
+			ROUND(
+				SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
+				6
+			)
+		) AS paypalamounts,
 		department_id AS cid
 	FROM
 		jg_poundlist
 	WHERE
+
+
 		to_days( pound_date ) = to_days(
 		now())
 	GROUP BY
@@ -921,12 +934,12 @@ SELECT
 	IFNULL(
 		ROUND(
 			SUM( sales_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
-			6
+		2
 		),
 		0
 	) amout,
 notCollectionAmounts,
-	SUM( collection_amounts ) collectionamounts
+ collectionamounts
 FROM
 	jg_poundlist a
 	LEFT JOIN base_organize z ON a.department_id = z.F_Id
@@ -938,9 +951,18 @@ FROM
 			0,
 			ROUND(
 				SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
-				6
+				2
 			)
 		) AS notCollectionAmounts,
+			IF
+		(
+			is_collection = 0,
+			0,
+			ROUND(
+				SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
+				2
+			)
+		) AS collectionamounts,
 		department_id AS cid
 	FROM
 		jg_poundlist
diff --git a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue
index b6bd5122..025f258f 100644
--- a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue
+++ b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue
@@ -16,7 +16,7 @@
         <el-table-column prop="settlement" label="吨位(吨)">
         </el-table-column>
         <el-table-column prop="amout" label="总额"> </el-table-column>
-        <el-table-column prop="notPaypalAmounts" label="代付款总额">
+        <el-table-column prop="notPaypalAmounts" label="待付款总额">
         </el-table-column>
         <el-table-column prop="paypalamounts" label="已付款总额">
         </el-table-column>