物资-库存统计sql修改

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/mapper/xml/PsiWareHouseBasicMapper.xml

@@ -91,7 +91,7 @@
 			a.shelf_life_unit,
 			a.spec,
 			pmcdra.returned_num as returnedNum,
-			sum(pmcdra.not_surplus_stock) as notSurplusStock
+			pmcdra.not_surplus_stock as notSurplusStock
 		FROM
 			psi_management_warehouse_detailed a
 			left join
@@ -121,15 +121,17 @@
 			left join
 			(
 				select
-					returned_num as returned_num,
-					not_surplus_stock as not_surplus_stock,
+					sum(returned_num) AS returned_num,
+					sum(not_surplus_stock) AS not_surplus_stock,
 					inventory_id,
+					goods_name,
 					status
 				from psi_management_collect_detailed_record e
 						 left join psi_management_collect_basics pmcba on e.basic_id = pmcba.id and pmcba.del_flag = 0
 				WHERE pmcba.`status` = 5 and e.del_flag = 0
+				group BY e.goods_name
 			) pmcdra
-			on a.id = pmcdra.inventory_id
+			on a.trade_name = pmcdra.goods_name
 			LEFT JOIN psi_management_warehouse_basics bas on a.basic_id = bas.id
 			left join psi_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}