From 349f2493cfee8d705c434032d6882f8909c8be9d Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 18 Dec 2025 16:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/MaterialStorageExportInfo.java | 4 ++++ .../material/clz/MaterialMachineMapper.xml | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageExportInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageExportInfo.java index d81f5fbc..3efb2394 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageExportInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageExportInfo.java @@ -61,6 +61,10 @@ public class MaterialStorageExportInfo { @Excel(name = "规格型号") private String typeModelName; + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String unit; + @ApiModelProperty(value = "入库数量") @Excel(name = "数量", cellType = Excel.ColumnType.NUMERIC) private BigDecimal storeNum; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 9507f939..c094b0a4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -2861,7 +2861,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END AS directFlag, df.project_dept AS departName, sd.dept_name AS impUnitName, - bz.ssfbdw AS subUnitName + cla.sub_unit_name AS subUnitName, + mt.unit_name AS unit FROM clz_slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id @@ -2873,7 +2874,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id LEFT JOIN bm_unit bu ON bai.unit_id = bu.unit_id AND bu.del_flag = '0' LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit - LEFT JOIN `micro-tool`.bzgl_bz bz ON bp.external_id = bz.project_id AND bz.bzmc = bu.unit_name + LEFT JOIN clz_lease_apply_info cla ON cla.id = sai.lease_id LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id WHERE sai.`status` = '0' @@ -2903,7 +2904,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt.type_name = #{typeModelName} - AND bz.ssfbdw = #{subUnitName} + AND cla.sub_unit_name = #{subUnitName} AND bp.external_id in @@ -2941,7 +2942,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" THEN '1' ELSE '0' END AS directFlag, df.project_dept AS departName, - sd.dept_name AS impUnitName + sd.dept_name AS impUnitName, + mt.unit_name AS unit FROM slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id @@ -3026,7 +3028,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.manage_type AS manageType, bp.pro_id AS proId, df.project_dept AS departName, - sd.dept_name AS impUnitName + sd.dept_name AS impUnitName, + mt.unit_name AS unit FROM slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id @@ -3077,7 +3080,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.direct_id IS NULL THEN '1' ELSE '0' END AS directFlag, - bp.pro_id AS proId + bp.pro_id AS proId, + mt.unit_name AS unit FROM clz_slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id