From 895f4e2233847109c40c41a0e1ad0a5b169388db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Tue, 8 Aug 2023 15:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    |  2 +-
 .../reservoirarea/ReservoirareaMapper.xml     | 90 -------------------
 2 files changed, 1 insertion(+), 91 deletions(-)

diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
index 71fff0b8..dc94d755 100644
--- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml
+++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
@@ -20,7 +20,7 @@ spring:
     host: 222.71.165.188
     port: 3309
     username: root
-    password: qawsed,.123
+    password: linus,.123
     db-name: sc-boot
     db-schema: #金仓达梦选填
     prepare-url: #自定义url
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
index 11e3ff8f..412939ed 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/reservoirarea/ReservoirareaMapper.xml
@@ -3,96 +3,6 @@
 <mapper namespace="jnpf.reservoirarea.mapper.ReservoirareaMapper">
 
     <select id="getReservoirareaListData" resultMap="getReservoirareaListDataMap">
-		/*SELECT
-			*
-		FROM
-			(
-				SELECT
-					IFNULL( b.`name`, '无对应仓库' ) warehouseName,
-					(
-						SELECT
-							count( ab.material_id )
-						FROM
-							(
-								SELECT
-									a.*,
-									c.material_id
-								FROM
-									jg_reservoirarea a
-										LEFT JOIN jg_warehouse b ON a.warehouse_id = b.id
-										AND b.delete_mark = '0'
-										LEFT JOIN jg_receiptin_item0 c ON c.reservoirarea_id = a.id
-										AND c.delete_mark = '0'
-								WHERE
-									a.delete_mark = '0'
-								GROUP BY
-									a.id,
-									c.material_id
-							) ab
-						WHERE
-							ab.id = a.id
-					) itemName,
-					@num1 :=(
-		SELECT
-			ROUND(
-				IFNULL(
-					sum(
-					CASE
-							aa.unit
-							WHEN '0' THEN
-							IFNULL( aa.delivery_num, 0 )
-							WHEN '1' THEN
-							IFNULL( aa.delivery_num / 1000, 0 ) ELSE 0
-						END
-						),
-						0
-					),
-					6
-				)
-			FROM
-				jg_receiptout_item0 aa
-			WHERE
-				aa.reservoirarea_id = a.id
-				AND aa.delete_mark = '0'
-			) outDeliveryNum,
-			@num2 :=(
-			SELECT
-				ROUND(
-					IFNULL(
-						sum(
-						CASE
-								aa.unit
-								WHEN '0' THEN
-								IFNULL( aa.num, 0 )
-								WHEN '1' THEN
-								IFNULL( aa.num / 1000, 0 ) ELSE 0
-							END
-							),
-							0
-						),
-						6
-					)
-				FROM
-					jg_receiptin_item0 aa
-				WHERE
-					aa.reservoirarea_id = a.id
-					AND aa.delete_mark = '0'
-				) inputDeliveryNum,
-				ROUND( @num2 - @num1, 6 ) wareHouseSum,
-				a.*
-				FROM
-					jg_reservoirarea a
-					LEFT JOIN jg_warehouse b ON a.warehouse_id = b.id
-					AND b.delete_mark = '0'
-					LEFT JOIN jg_receiptin_item0 c ON c.reservoirarea_id = a.id
-					AND c.delete_mark = '0'
-				WHERE
-					a.delete_mark = '0'
-				GROUP BY
-					a.id
-				ORDER BY
-					a.areaname
-			) aaa ${ew.customSqlSegment}*/
 			select * from (SELECT a.*,IFNULL(b.materialNum,0) itemName,IFNULL(c.num,0) inputDeliveryNum,IFNULL(d.num,0) outDeliveryNum,IFNULL(c.num,0) - IFNULL(d.num,0) wareHouseSum,IFNULL( e.name, '无对应仓库' ) warehouseName from jg_reservoirarea a LEFT JOIN (SELECT bbb.reservoirarea_id,COUNT(1) materialNum from (SELECT DISTINCT * from (SELECT reservoirarea_id,material_id from jg_receiptin_item0 WHERE reservoirarea_id is not null and delete_mark = 0
 UNION ALL SELECT reservoirarea_id,material_id from jg_receiptout_item0 WHERE reservoirarea_id is not null and delete_mark = 0) aaa ) bbb GROUP BY bbb.reservoirarea_id) b on a.id = b.reservoirarea_id
 LEFT JOIN (SELECT reservoirarea_id,ROUND(SUM(CASE unit WHEN '0' THEN