From b10f7dc5c05062e6792f522ae1fb4de446189d3e Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期二, 16 七月 2024 17:44:39 +0800
Subject: [PATCH] 区间合并,检验下单时型号参数匹配

---
 inspect-server/src/main/resources/mapper/InsSampleMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 457fc59..f6c177f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/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.*,
@@ -304,6 +305,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,

--
Gitblit v1.9.3