From c13485e1b87832c1971d54d83ea2465eb5b15223 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 16 Jan 2026 16:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../largeScreen/mapper/LargeScreenMapper.java   |  2 ++
 .../service/impl/LargeScreenServiceImpl.java    | 17 +++++++++++++++--
 .../sgzb/material/domain/StorageStatus.java     |  1 -
 .../impl/SecondaryWarehouseServiceImpl.java     |  1 +
 .../resources/mapper/base/MaLabelBindMapper.xml |  2 +-
 .../resources/mapper/base/MaMachineMapper.xml   |  3 ++-
 .../mapper/largeScreen/LargeScreenMapper.xml    | 15 +++++++++++++++
 .../mapper/material/StorageStatusMapper.xml     |  6 ------
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
index 6b9e627..8193490 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java
@@ -176,4 +176,6 @@ public interface LargeScreenMapper {
     List<EquipmentDisVo> getEquipmentDis(ParamsDto dto);
 
     List<IotMaCodeMachine> getIotMaCodeMachine(String province);
+
+    int getSecondaryWarehouse(String companyId);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
index 35a65b1..25f307e 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
@@ -99,9 +99,22 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
            //查询所有公司
             list=mapper.getCompany();
             if (list.size()>0){
+                int countAll = 0;
                 for (TotalOwnershipVo vo:list){
-                    TotalOwnershipVo  vos=  countNum(null,null,vo.getCompanyId(), "2");
-                    vo.setTotalOwnershipNum(vos.getTotalOwnershipNum());
+                    if(vo.getCompanyId().equals("101")){
+                        TotalOwnershipVo  vos =  countNum(null,null,vo.getCompanyId(), "2");
+                        vo.setTotalOwnershipNum(vos.getTotalOwnershipNum());
+                    }else{
+                        int count  = mapper.getSecondaryWarehouse(vo.getCompanyId());
+                        countAll += count;
+                        vo.setTotalOwnershipNum(count);
+                    }
+                }
+                for (TotalOwnershipVo vo:list){
+                    if(vo.getCompanyId().equals("101")){
+                        vo.setTotalOwnershipNum(vo.getTotalOwnershipNum()-countAll);
+                        break;
+                    }
                 }
             }
         } catch (Exception e) {
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java
index 81e90fc..e45a7c1 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java
@@ -64,7 +64,6 @@ public class StorageStatus {
 
     /** 资产属性名称 */
     @ApiModelProperty(value = "资产属性名称")
-    @Excel(name = "资产属性")
     private String propName;
 
     /**
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java
index f0858e8..7ce7c34 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java
@@ -286,6 +286,7 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService
             }
         }
         List<SecondaryWarehouse> list = mapper.getList(bean);
+
         for (SecondaryWarehouse secondaryWarehouse : list) {
             Integer warehouse = mapper.selectStockNum(secondaryWarehouse);
             if (warehouse == null) {
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 3f36c10..f5d3b64 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -75,7 +75,7 @@
     <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
         SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
         mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
-        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name
+        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name,ma.assets_code
         FROM ma_machine_label b
         left join ma_label_bind a on a.ma_id = b.ma_id
         LEFT JOIN ma_type mt  ON a.type_id = mt.type_id
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
index bf0c7dc..4beb699 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -314,6 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ownHouse != null and ownHouse != ''">own_house = #{ownHouse},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
             <if test="pushStatus != null and pushStatus != ''">push_status = #{pushStatus},</if>
+            <if test="remark != null and remark!= ''">remark = #{remark},</if>
             update_time = sysdate()
         </set>
         where ma_id = #{maId}
@@ -343,7 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
                m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
                m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
-               dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId,m.push_status
+               dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId,m.push_status,m.remark
         from ma_machine m
          left join ma_type mt on m.type_id = mt.type_id
          left join ma_type mt1 on mt.parent_id = mt1.type_id
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index 2663335..eb5d1b5 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -906,5 +906,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             im.bind_status = 0
           AND imb.unbind_time IS NULL and sai.`status` = 0 and bpl.province = #{province}
     </select>
+    <select id="getSecondaryWarehouse" resultType="java.lang.Integer">
+        SELECT
+        IFNULL(SUM( lod.out_num ),0) AS Num
+        from lease_out_details lod
+        left join lease_apply_info lai on lod.parent_id=lai.id
+        left join tm_task_agreement tta on lai.task_id=tta.task_id
+        LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+        LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
+        LEFT JOIN ma_type mt ON lod.type_id = mt.type_id
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+        WHERE 1=1
+        <if test="companyId != null">
+            and bui.dept_id = #{companyId}
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file
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 d0b7b31..463d51b 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
@@ -9,7 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt2.type_name AS typeName,
         mt.type_name AS typeModelName,
         mt.unit_name AS unit,
-        mpi.prop_name  as propName,
         CASE
         mt.manage_type
         WHEN 0 THEN
@@ -188,8 +187,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         lad.type_id
         ) AS subquery7 ON subquery7.type_id = mt.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
-        left join ma_prop_set mps on mt.type_id = mps.type_id
-        left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
         WHERE
         mt.`level` = 4
         AND mt.del_flag = '0'
@@ -199,8 +196,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeModelName != null and typeModelName != ''">
             and mt.type_name like concat('%',#{typeModelName},'%')
         </if>
-        <if test="propId != null">
-            and mpi.prop_id = #{propId}
-        </if>
     </select>
 </mapper>
\ No newline at end of file