From e50a43bb067adff10cd1dcc81349b1aafdfda882 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 22 一月 2026 13:18:44 +0800
Subject: [PATCH] 业务管理：IFS域区分【ZTNS】和【KJNS】
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 0a64bc3..256e792 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -326,6 +326,7 @@
ORDER BY COUNT(*) DESC
LIMIT 1;
</select>
+
<select id="selectSampleCableTag" resultType="java.lang.String">
SELECT ip.cable_tag
FROM ins_sample isa
@@ -333,10 +334,11 @@
LEFT JOIN ins_product ip ON isa.id = ip.ins_sample_id
WHERE ip.state = 1
AND isa.id = #{id}
- and ip.cable_tag is not null
+ AND ip.cable_tag IS NOT NULL
GROUP BY ip.cable_tag
- order by ip.cable_tag
+ ORDER BY MIN(ip.id)
</select>
+
<select id="selectSampleItemS" resultType="java.lang.Integer">
select count(*)
from (select distinct ip.inspection_item
@@ -400,9 +402,46 @@
) 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">
+ #{val}
+ </foreach>
+ </select>
+
+ <!-- 澶栬喘涓嬪崟鎴愬搧鏍囩鎵撳嵃 -->
+ <select id="labelOutsideOrderPrinting" resultType="com.ruoyi.basic.dto.InventoryDetailDTO">
+ SELECT
+ iiq.id,
+ 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,
+ -- 妫�楠屼汉鏌ヨ锛氫紭鍏堝彇鎸囨淳鐨勮礋璐ｄ汉锛屽鏋滄病鏈夊垯鍙栬鍗曞垱寤轰汉
+ COALESCE(isu.userName, u.name) AS inspector_name
+ FROM ifs_inventory_quantity iiq
+ LEFT JOIN ifs_part_props_record ippr ON ippr.ifs_inventory_id = iiq.id
+ LEFT JOIN ins_order io ON io.ifs_inventory_id = iiq.id AND io.state != -1
+ -- 鍏宠仈鐢ㄦ埛琛紝鐢ㄤ簬鑾峰彇璁㈠崟鍒涘缓浜哄鍚�
+ LEFT JOIN user u ON io.create_user = u.id
+ -- 鍏宠仈瀛愭煡璇紝鐢ㄤ簬鑾峰彇 ins_sample_user 琛ㄤ腑鎸囨淳鐨勬楠岃礋璐ｄ汉
+ LEFT JOIN (
+ SELECT
+ ins_sample_id,
+ GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
+ FROM ins_sample_user isu_inner
+ LEFT JOIN user uu ON isu_inner.user_id = uu.id
+ WHERE isu_inner.state = 0
+ GROUP BY ins_sample_id
+ ) isu ON isu.ins_sample_id = io.id
+ WHERE iiq.id IN
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -471,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,
--
Gitblit v1.9.3