完成光纤配置进行检验操作

value

2024-06-03 1c683ded6a17523c47d7e1d853736562007d26bc

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

@@ -113,8 +113,10 @@
        select isa.*,
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
               ip.laboratory ip_laboratory,
               ip.sample_type ip_sample_type,
@@ -160,8 +162,10 @@
        select isa.*,
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
               ip.laboratory ip_laboratory,
               ip.sample_type ip_sample_type,
@@ -211,6 +215,53 @@
        select name_en from `center-lims`.product
        where name = #{sample}
    </select>
    <select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
        select isa.*,
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
               ip.laboratory ip_laboratory,
               ip.sample_type ip_sample_type,
               ip.sample ip_sample,
               ip.model ip_model,
               son_laboratory,
               ip.unit ip_unit,
               price,
               man_hour,
               man_hour_group,
               inspection_item_type,
               inspection_value_type,
               device_group,
               checkout_number,
               section,
               value_type,
               method,
               man_day,
               bsm,
               ask,
               `last_value`,
               ip.ins_result ip_ins_result,
               state,
               ins_sample_id,
               ip.create_user ip_create_user,
               ip.update_user ip_update_user,
               ip.create_time ip_create_time,
               ip.update_time ip_update_time,
               template_id,
               ipr.ins_value,
               ipr.com_value,
               ipr.equip_value,
               ip.method_s
        from ins_sample isa
                 left join ins_product ip on isa.id = ip.ins_sample_id
                 left join ins_product_result ipr on ip.id = ipr.ins_product_id
        where ins_order_id = #{id}
          and state = 1
    </select>

    <resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
        <id property="id" column="id" jdbcType="INTEGER"/>
@@ -239,8 +290,10 @@
    <resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
        <id property="id" column="ip_id" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemEn" column="inspection_item_en" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclassEn" column="inspection_item_subclass_en" jdbcType="VARCHAR"/>
        <result property="factory" column="ip_factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="ip_laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="ip_sample_type" jdbcType="VARCHAR"/>