手动下单：检验中订单撤销报错问题修复

zouyu

2026-05-07 2eaeb19b16af087d17c186c6220bf64f2fc07f4f

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

@@ -396,12 +396,19 @@
                     io2.entrust_code,
                     io2.test_quantity,
                     io2.ins_state,
                     CASE
                      WHEN pp.color IS NOT NULL
                      THEN pp.color
                      ELSE sto.color
                     END  part_color,
                     JSON_OBJECT(
                             'sample_name', io2.sample_view,
                             'entrust_code', io2.entrust_code
                     )                                                 labelBarCode
              from ins_order io2
                       LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
                LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
                LEFT JOIN product_part pp ON pp.part_no = io2.part_no COLLATE utf8mb4_general_ci
                LEFT JOIN structure_test_object_part sto ON sto.part_no = io2.part_no COLLATE utf8mb4_general_ci
              where type_source = -1
              GROUP BY io2.id) a
        where insOrderId in
@@ -509,8 +516,68 @@
              group by io.id) a
    </select>
    <select id="selectOrderInfoById" resultType="com.ruoyi.inspect.vo.IfsOrderVO">
        select  io.*,
                iiq.contract,
        select
                io.id,
                io.entrust_code,
                io.custom,
                io.company,
                io.code,
                io.type,
                io.appointed,
                io.state,
                io.tell,
                io.remark,
                io.remark_en,
                io.otc_code,
                io.user_id,
                io.mating,
                io.create_user,
                io.create_time,
                io.update_user,
                io.update_time,
                io.send_time,
                io.ins_state,
                io.factory,
                io.laboratory,
                io.sample_type,
                io.sample,
                io.ins_result,
                io.ins_time,
                io.processing,
                io.is_leave,
                io.order_type,
                io.send,
                io.form_type,
                io.phone,
                io.examine_time,
                io.engineering,
                io.engineering_en,
                io.production,
                io.production_en,
                io.company_id,
                io.prepare_user_id,
                io.prepare_user,
                io.prepare_user_en,
                io.prepare_code,
                io.out_entrust_code,
                io.is_revocation,
                io.revocation_ins_product_ids,
                io.type_source,
                io.ifs_inventory_id,
                io.test_quantity,
                io.part_detail,
                io.is_exemption,
                io.temperature,
                io.humidity,
                io.sample_status,
                io.quarter_item_id,
                io.sample_view,
                io.sample_view_en,
                io.is_first_submit,
                io.first_submit_date,
                io.update_batch_no,
                io.part_desc,
                io.supplier_name,
                iiq.is_split_order,
                iiq.order_type AS ifs_order_type,
                iiq.part_no,
@@ -532,6 +599,10 @@
                    when ipps.lettering_info is not null and ipps.lettering_info!='' then ipps.lettering_info
                    else isor.lettering_info
                    end AS lettering_info,
                case
                    when io.ifs_inventory_id is not null and io.ifs_inventory_id!='' then iiq.contract
                    else io.contract
                    end AS contract,
                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