feat: 设备台账与工序进行绑定

gongchunyi

12 小时以前 f32de021e7af1627b6d18e681b46dbc0a5b108f8

 src/main/resources/mapper/device/DeviceLedgerMapper.xml

@@ -31,9 +31,12 @@
        dl.tenant_id,
        dl.is_depr,
        dl.annual_depreciation_amount,
        dl.type
        dl.type,
        dl.product_process_id,
        pp.name AS productProcessName
        FROM device_ledger dl
        left join sys_user su on dl.create_user = su.user_id
        left join product_process pp on dl.product_process_id = pp.id
        <where>
            <!-- 设备名称 -->
            <if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -43,6 +46,11 @@
            <!-- 规格型号 -->
            <if test="deviceLedger.deviceModel != null and deviceLedger.deviceModel != ''">
                AND device_model LIKE CONCAT('%', #{deviceLedger.deviceModel}, '%')
            </if>

            <!-- 工序名称 -->
            <if test="deviceLedger.productProcessName != null and deviceLedger.productProcessName != ''">
                AND pp.name LIKE CONCAT('%', #{deviceLedger.productProcessName}, '%')
            </if>

            <!-- 供应商名称 -->
@@ -83,9 +91,11 @@

    </select>
    <select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
        select *
        from device_ledger
        where id = #{id}
        select dl.*,
               pp.name as productProcessName
        from device_ledger dl
                 left join product_process pp on dl.product_process_id = pp.id
        where dl.id = #{id}
    </select>
    <select id="getDeviceTypeDistributionByYear"
            resultType="com.ruoyi.account.dto.DeviceTypeDetail"