From 5bd1e846de7587f39d3edacfed58bfa8325c8758 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 30 一月 2026 15:09:07 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整2
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 18f7a41..2fa7666 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,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">
@@ -415,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
@@ -507,7 +509,68 @@
group by io.id) a
</select>
<select id="selectOrderInfoById" resultType="com.ruoyi.inspect.vo.IfsOrderVO">
- select io.*,
+ select
+ io.id,
+ io.entrust_code,
+ io.custom,
+ io.company,
+ io.code,
+ io.type,
+ io.appointed,
+ io.state,
+ io.tell,
+ io.remark,
+ io.remark_en,
+ io.otc_code,
+ io.user_id,
+ io.mating,
+ io.create_user,
+ io.create_time,
+ io.update_user,
+ io.update_time,
+ io.send_time,
+ io.ins_state,
+ io.factory,
+ io.laboratory,
+ io.sample_type,
+ io.sample,
+ io.ins_result,
+ io.ins_time,
+ io.processing,
+ io.is_leave,
+ io.order_type,
+ io.send,
+ io.form_type,
+ io.phone,
+ io.examine_time,
+ io.engineering,
+ io.engineering_en,
+ io.production,
+ io.production_en,
+ io.company_id,
+ io.prepare_user_id,
+ io.prepare_user,
+ io.prepare_user_en,
+ io.prepare_code,
+ io.out_entrust_code,
+ io.is_revocation,
+ io.revocation_ins_product_ids,
+ io.type_source,
+ io.ifs_inventory_id,
+ io.test_quantity,
+ io.part_detail,
+ io.is_exemption,
+ io.temperature,
+ io.humidity,
+ io.sample_status,
+ io.quarter_item_id,
+ io.sample_view,
+ io.sample_view_en,
+ io.is_first_submit,
+ io.first_submit_date,
+ io.update_batch_no,
+ io.part_desc,
+ io.supplier_name,
iiq.is_split_order,
iiq.order_type AS ifs_order_type,
iiq.part_no,
@@ -529,6 +592,10 @@
when ipps.lettering_info is not null and ipps.lettering_info!='' then ipps.lettering_info
else isor.lettering_info
end AS lettering_info,
+ case
+ when io.ifs_inventory_id is not null and io.ifs_inventory_id!='' then iiq.contract
+ else io.contract
+ end AS contract,
ipps.start_meter_mark,
ipps.end_meter_mark
from ins_order io left join ifs_inventory_quantity iiq on io.ifs_inventory_id=iiq.id
--
Gitblit v1.9.3