From 34f448ffe2aacb496c15ab5da44a24128e0682be Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 24 二月 2025 17:30:26 +0800
Subject: [PATCH] 修改

---
 hazmat-system/src/main/resources/mapper/system/HzProductMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hazmat-system/src/main/resources/mapper/system/HzProductMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzProductMapper.xml
index 9667570..816e1d1 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzProductMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzProductMapper.xml
@@ -5,6 +5,7 @@
         <result property="id"       column="id"       />
         <result property="basicId"    column="basic_id"    />
         <result property="warehouseId"     column="warehouse_id"     />
+        <result property="cupboardId"     column="cupboard_id"     />
         <result property="remaining"  column="remaining"  />
         <result property="state"  column="state"  />
         <result property="code"  column="code"  />
@@ -17,6 +18,7 @@
         <result property="updateTime"     column="update_time"     />
         <result property="remark"         column="remark"          />
         <result property="warehouseName"         column="warehouse_name"          />
+        <result property="cupboardName" column="cupboard_name"/>
         <association property="productBasic" javaType="com.gkhy.hazmat.system.domain.HzProductBasic" resultMap="productBasicResult" />
     </resultMap>
 
@@ -37,10 +39,12 @@
     <sql id="selectProductVo">
         select a.id, a.basic_id,a.code, a.warehouse_id, a.remaining, a.state,a.company_id,a.version, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
                b.id as basic_id,b.name as basic_name,b.cas as basic_cas,b.product_type as basic_product_type,b.product_character as basic_product_character,
-               b.supplier as basic_supplier,b.manufacturer as basic_manufacturer,b.metering as basic_metering,b.unit as basic_unit,b.product_sn,b.min_package as basic_min_package,c.name as warehouse_name
+               b.supplier as basic_supplier,b.manufacturer as basic_manufacturer,b.metering as basic_metering,b.unit as basic_unit,b.product_sn,
+               b.min_package as basic_min_package,c.name as warehouse_name,d.cupboard_name
         from hz_product a
         left join hz_product_basic b on b.id=a.basic_id
         left join hz_warehouse c on c.id=a.warehouse_id
+        left join hz_warehouse_cupboard d on d.id = a.cupboard_id
     </sql>
 
     <update id="deleteProductById" parameterType="java.lang.Long">

--
Gitblit v1.9.2