From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 4727424..b4b0a48 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -162,12 +162,23 @@
left join ins_sample is2 on is2.id = ip.ins_sample_id
left join ins_order io on io.id = is2.ins_order_id
left join ifs_inventory_quantity iiq on iiq.id = io.ifs_inventory_id
+ left join ins_product_deviation_warning ipdw on ipdw.ins_product_id = ip.id
where concat(ip.inspection_item, ip.inspection_item_subclass) = concat(#{insProduct.inspectionItem}, #{insProduct.inspectionItemSubclass})
and ip.model = #{insProduct.model}
and iiq.supplier_name = #{supplierName}
and io.state = 4
and ip.ins_result = 1
+ and ipdw.deviation_warning_id is null
order by io.first_submit_date desc
limit 10
</select>
+ <select id="getRevocationInsProductList" resultType="com.ruoyi.inspect.pojo.InsProduct">
+ select *
+ from ins_product
+ WHERE state = 1
+ AND id in
+ <foreach collection="ids" item="id" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3