From 8b1d6e1b442c1909bd747805bd1845b40caabe0c Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 06 三月 2025 09:03:59 +0800
Subject: [PATCH] data
---
hazmat-system/src/main/resources/mapper/system/HzProductEntryRecordMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzProductEntryRecordMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzProductEntryRecordMapper.xml
index 10232c4..0fd3ff1 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzProductEntryRecordMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzProductEntryRecordMapper.xml
@@ -20,6 +20,7 @@
<result property="remark" column="remark" />
<association property="productBasic" javaType="com.gkhy.hazmat.system.domain.HzProductBasic" resultMap="productBasicResult" />
<association property="warehouse" javaType="com.gkhy.hazmat.system.domain.HzWarehouse" resultMap="wareResult" />
+ <association property="cupboard" javaType="com.gkhy.hazmat.system.domain.HzWarehouseCupboard" resultMap="cupboardResult"/>
</resultMap>
<resultMap type="com.gkhy.hazmat.system.domain.HzProductBasic" id="productBasicResult">
@@ -34,6 +35,7 @@
<result property="metering" column="basic_metering" />
<result property="unit" column="basic_unit" />
<result property="productSn" column="product_sn" />
+ <result property="maxEntry" column="max_entry" />
</resultMap>
<resultMap id="wareResult" type="com.gkhy.hazmat.system.domain.HzWarehouse">
@@ -41,16 +43,22 @@
<result property="name" column="warehouse_name" />
</resultMap>
+ <resultMap id="cupboardResult" type="com.gkhy.hazmat.system.domain.HzWarehouseCupboard">
+ <id property="id" column="cupboard_id"/>
+ <id property="cupboardName" column="cupboard_name"/>
+ </resultMap>
+
<sql id="selectProductEntryRecordVo">
select a.id, a.warehouse_id, a.num,a.batch_no,a.state,a.basic_id,a.company_id,a.start_code,a.end_code,a.code_prex,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.id as warehouse_id,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,b.max_entry,
+ c.id as warehouse_id,c.name as warehouse_name,d.id as cupboard_id,d.cupboard_name
from hz_product_entry_record 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>
<select id="selectEntryRecordList" resultMap="HzProductEntryRecordResult"
parameterType="com.gkhy.hazmat.system.domain.HzProductEntryRecord">
@@ -62,6 +70,12 @@
<if test="companyId != null">
AND a.company_id =#{companyId}
</if>
+ <if test="params.warehouseId !=null">
+ and a.warehouse_id =#{params.warehouseId}
+ </if>
+ <if test="params.cupboardId !=null">
+ and a.cupboard_id = #{params.cupboardId}
+ </if>
</where>
order by a.id desc
</select>
--
Gitblit v1.9.2