外购成品报检相关问题调整

zouyu

7 天以前 3793ba4a9b6be8faa6df0d4a76c06763ac03f873

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -471,13 +471,29 @@
    </select>
    <select id="selectOrderInfoById" resultType="com.ruoyi.inspect.vo.IfsOrderVO">
        select  io.*,
                isor.insulation_color,
                isor.outer_color,
                isor.drum_no,
                iiq.is_split_order,
                iiq.order_type AS ifs_order_type,
                iiq.part_no,
                iiq.update_batch_no AS lot_batch_no
                iiq.update_batch_no AS lot_batch_no,
                ipps.id AS lot_part_id,
                case
                    when ipps.drum_no is not null and ipps.drum_no!='' then ipps.drum_no
                    else isor.drum_no
                    end AS drum_no,
                case
                    when ipps.insulation_color is not null and ipps.insulation_color!='' then ipps.insulation_color
                    else isor.insulation_color
                    end AS insulation_color,
                case
                    when ipps.outer_color is not null and ipps.outer_color!='' then ipps.outer_color
                    else isor.outer_color
                    end AS outer_color,
                case
                    when ipps.lettering_info is not null and ipps.lettering_info!='' then ipps.lettering_info
                    else isor.lettering_info
                    end AS lettering_info,
                ipps.start_meter_mark,
                ipps.end_meter_mark
        from ins_order io left join ifs_inventory_quantity iiq on io.ifs_inventory_id=iiq.id
                          left join ifs_split_order_record isor
                                    on iiq.order_no=isor.order_no
@@ -486,6 +502,7 @@
                                        and iiq.receipt_no=isor.receipt_no
                                        and iiq.part_no=isor.part_no
                                        AND iiq.update_batch_no = isor.lot_batch_no
            LEFT JOIN ifs_part_props_record ipps ON iiq.id = ipps.ifs_inventory_id
        where io.state !=-1
        AND io.id = #{id}
        LIMIT 1