From 541a7312433855c6b28afe4af8bdbaa0ee4441b9 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Mon, 10 Jul 2023 17:53:48 +0800
Subject: [PATCH] =?UTF-8?q?APP=E6=9F=A5=E8=AF=A2=E6=85=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservoirarea/ReservoirareaMapper.xml      | 18 ++++++++++++++++--
 .../resources/mapper/vehicle/VehicleMapper.xml |  3 +--
 .../mapper/warehouse/WareHouseMapper.xml       | 18 ++++++++++++++++--
 3 files changed, 33 insertions(+), 6 deletions(-)

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 1cde21d1..11e3ff8f 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,7 +3,7 @@
 <mapper namespace="jnpf.reservoirarea.mapper.ReservoirareaMapper">
 
     <select id="getReservoirareaListData" resultMap="getReservoirareaListDataMap">
-		SELECT
+		/*SELECT
 			*
 		FROM
 			(
@@ -92,7 +92,21 @@
 					a.id
 				ORDER BY
 					a.areaname
-			) aaa ${ew.customSqlSegment}
+			) 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
+							IFNULL( num, 0 )
+							WHEN '1' THEN
+							IFNULL( num / 1000, 0 ) ELSE 0
+						END),6) num from jg_receiptin_item0 WHERE reservoirarea_id is not null and delete_mark = 0 GROUP BY reservoirarea_id) c on a.id = c.reservoirarea_id
+LEFT JOIN (SELECT reservoirarea_id,ROUND(SUM(CASE unit WHEN '0' THEN
+							IFNULL( delivery_num, 0 )
+							WHEN '1' THEN
+							IFNULL( delivery_num / 1000, 0 ) ELSE 0
+						END),6) num from jg_receiptout_item0 WHERE reservoirarea_id is not null and delete_mark = 0 GROUP BY reservoirarea_id) d on a.id = d.reservoirarea_id
+LEFT JOIN jg_warehouse e ON a.warehouse_id = e.id
+where a.delete_mark = 0) aaa  ${ew.customSqlSegment}
     </select>
 
     <resultMap id="getReservoirareaListDataMap" type="jnpf.reservoirarea.model.reservoirarea.MobileReservoirareaLIstVo">
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
index 019c5401..5e0f1763 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
@@ -30,8 +30,7 @@
                     jg_vehicle a
                         LEFT JOIN jg_poundlist b ON a.id = b.vehicle_id
                 WHERE
-                    ( a.delete_mark != 1 OR a.delete_mark IS NULL )
-                  AND ( b.delete_mark != 1 OR b.delete_mark IS NULL )
+                    a.delete_mark = 0 AND b.delete_mark = 0
                 GROUP BY
                     a.id
             ) a ${ew.customSqlSegment}
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
index 8e29b191..21277785 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="jnpf.warehouse.mapper.WareHouseMapper">
 
     <select id="getWareHouseMobileDate" resultMap="getWareHouseMobileDateMap">
-		SELECT
+		/*SELECT
 			*
 		FROM
 			(
@@ -87,7 +87,21 @@
 					b.material_id
 				ORDER BY
 					a.id
-			) aaa  ${ew.customSqlSegment}
+			) 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( d.F_FullName, '无对应公司' ) companyName from jg_warehouse a LEFT JOIN (SELECT bbb.warehouse_id,COUNT(1) materialNum from (SELECT DISTINCT * from (SELECT warehouse_id,material_id from jg_receiptin_item0 WHERE warehouse_id is not null and delete_mark = 0
+UNION ALL SELECT warehouse_id,material_id from jg_receiptout_item0 WHERE warehouse_id is not null and delete_mark = 0) aaa ) bbb GROUP BY bbb.warehouse_id) b on a.id = b.warehouse_id
+LEFT JOIN (SELECT warehouse_id,ROUND(SUM(CASE unit WHEN '0' THEN
+							IFNULL( num, 0 )
+							WHEN '1' THEN
+							IFNULL( num / 1000, 0 ) ELSE 0
+						END),6) num from jg_receiptin_item0 WHERE warehouse_id is not null and delete_mark = 0 GROUP BY warehouse_id) c on a.id = c.warehouse_id
+LEFT JOIN (SELECT warehouse_id,ROUND(SUM(CASE unit WHEN '0' THEN
+							IFNULL( delivery_num, 0 )
+							WHEN '1' THEN
+							IFNULL( delivery_num / 1000, 0 ) ELSE 0
+						END),6) num from jg_receiptout_item0 WHERE warehouse_id is not null and delete_mark = 0 GROUP BY warehouse_id) d on a.id = d.warehouse_id
+LEFT JOIN base_organize d ON a.company_code = d.F_Id
+where a.delete_mark = 0) aaa  ${ew.customSqlSegment}
     </select>
 
 	<resultMap id="getWareHouseMobileDateMap" type="jnpf.warehouse.model.warehouse.MobileWareHouseVO">