工时的各需求+检验任务修改

zss

2024-07-17 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf

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

@@ -163,6 +163,7 @@
          and state = 1
          and ins_fiber_id is null
          and ins_fibers_id is null
        and isa.sample_code NOT REGEXP '/'
    </select>
    <select id="getInsOrderAndSample" resultMap="sampleDto">
        select isa.*,
@@ -253,7 +254,7 @@
               method,
               man_day,
               bsm,
               ask,
               tell as ask,
               `last_value`,
               ip.ins_result  ip_ins_result,
               state,
@@ -271,6 +272,7 @@
                 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 template_id is not null
          and state = 1
    </select>

@@ -304,6 +306,8 @@
        select ip.id          ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory     ip_factory,