From 1d273580e5c56e108ef64c7d4fa5964f975a2bfc Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 18 Aug 2024 09:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=AE=BE=E5=A4=87=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/StorageStatusMapper.xml   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 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 28b9058..3a3f7b6 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
@@ -8,12 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT mt2.type_name                       as typeName,
                mt.type_name                        as typeModelName,
                mt.unit_name                        as unit,
-               IFNULL(mt.num, 0)                   as num,
+               CASE mt.manage_type
+                    WHEN 0 THEN
+                    IFNULL(subquery0.num, 0)
+                    ELSE
+                    IFNULL(mt.num, 0)
+                    END                            as num,
                IFNULL(subquery1.usNum, 0)          as usNum,
                IFNULL(subquery2.repairNum, 0)      as repairNum,
                IFNULL(subquery3.repairInputNum, 0) as repairInputNum,
                IFNULL(subquery4.inputNum, 0)       as inputNum,
-               IFNULL(mt.num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0) as allNum,
+               CASE mt.manage_type
+                   WHEN 0 THEN
+                    IFNULL(subquery0.num, 0)+ IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0)
+                   ELSE
+                    IFNULL(mt.num, 0)+ IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) + IFNULL(subquery3.repairInputNum, 0)
+                   END                             as allNum,
                CASE mt.manage_type
                    WHEN 0 THEN
                        '否'
@@ -22,6 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    END                                manageType
 
         FROM ma_type mt
+                LEFT JOIN (SELECT mt.type_id,
+                            mt2.type_name AS             typeName,
+                            mt.type_name  AS             typeModelName,
+                            count(mm.ma_id) num
+                        FROM ma_machine mm
+                            LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+                            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+                        WHERE mm.ma_code is not null and mm.ma_status in (15)
+                        GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id
                  LEFT JOIN (SELECT subquery1.type_id,
                                    subquery1.typeName,
                                    subquery1.typeModelName,