修改

“djh”

2025-02-24 34f448ffe2aacb496c15ab5da44a24128e0682be

 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">
@@ -42,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,b.max_entry,
               c.id as warehouse_id,c.name as warehouse_name
               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">