业务管理：IFS域区分【ZTNS】和【KJNS】

zouyu

6 天以前 e50a43bb067adff10cd1dcc81349b1aafdfda882

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

@@ -402,7 +402,7 @@
                     )                                                 labelBarCode
              from ins_order io2
                       LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
              where type_source = 0
              where type_source = -1
              GROUP BY io2.id) a
        where insOrderId in
        <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
@@ -417,13 +417,13 @@
        iiq.part_desc,
        iiq.lot_batch_no,
        iiq.part_no,
        iiq.inspect_status as ins_state,
        ippr.insulation_color,
        ippr.outer_color,
        ippr.drum_no,
        ippr.start_meter_mark,
        ippr.end_meter_mark,
        io.update_time,
        io.ins_state,
        -- 检验人查询：优先取指派的负责人，如果没有则取订单创建人
        COALESCE(isu.userName, u.name) AS inspector_name
        FROM ifs_inventory_quantity iiq
@@ -510,6 +510,7 @@
    </select>
    <select id="selectOrderInfoById" resultType="com.ruoyi.inspect.vo.IfsOrderVO">
        select  io.*,
                iiq.contract,
                iiq.is_split_order,
                iiq.order_type AS ifs_order_type,
                iiq.part_no,