From ecbb572cf0a1b4a25fee8c5877059706f57996e7 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 21 Nov 2024 18:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=9C=BA=E5=85=B7=E5=8E=86=E5=8F=B2=E5=BD=92?= =?UTF-8?q?=E8=BF=98=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/StorageStatusMapper.xml | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml index d0cebd6d..0f06c73c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml @@ -217,40 +217,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ( SELECT + lod.ma_id AS maId, mt.type_id, - mt2.type_name AS typeName, - lod.ma_id as maId, - mt.type_name AS typeModelName, - SUM( - IFNULL( lod.out_num, 0 )) AS outNum + SUM(IFNULL(lod.out_num, 0)) AS outNum FROM lease_out_details lod LEFT JOIN ma_type mt ON mt.type_id = lod.type_id - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + WHERE + mt.type_id = #{typeId} GROUP BY - mt.type_id + lod.ma_id, mt.type_id ) AS subquery1 - LEFT JOIN ( + LEFT JOIN + ( SELECT + bcd.ma_id AS maId, mt.type_id, - mt2.type_name AS typeName, - mt.type_name AS typeModelName, - SUM( - IFNULL( bcd.back_num, 0 )) backNum + SUM(IFNULL(bcd.back_num, 0)) AS backNum FROM back_check_details bcd LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id - LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id + WHERE + mt.type_id = #{typeId} GROUP BY - mt.type_id - ) AS subquery2 ON subquery1.type_id = subquery2.type_id - LEFT JOIN ma_type mt on mt.type_id = subquery1.type_id - LEFT JOIN ma_machine mm on mm.ma_id = subquery1.maId - WHERE mt.manage_type = 0 - and mt.del_flag = 0 - and IFNULL( subquery1.outNum, 0 ) - IFNULL( subquery2.backNum, 0 ) > 0 - and subquery1.type_id = #{typeId} + bcd.ma_id, mt.type_id + ) AS subquery2 ON subquery1.maId = subquery2.maId + LEFT JOIN ma_type mt ON mt.type_id = subquery1.type_id + LEFT JOIN ma_machine mm ON mm.ma_id = subquery1.maId + WHERE + mt.manage_type = 0 + AND mt.del_flag = 0 + AND IFNULL(subquery1.outNum, 0) - IFNULL(subquery2.backNum, 0) > 0