From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index e566513..5bc29db 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -149,21 +149,60 @@
left join ins_sample is2 on is2.id = ip.ins_sample_id
where is2.ins_order_id = #{orderId}
</select>
- <select id="selectAnalysis" resultType="com.ruoyi.inspect.dto.InsProductAnalysisDto">
- select ip.id insProductId,
- ip.`last_value`,
- io.id insOrderId,
- is2.id insSampleId
+ <select id="selectAnalysis" resultType="com.ruoyi.inspect.pojo.InsProductDeviationWarningDetail">
+ select io.id insOrderId,
+ is2.id insSampleId,
+ ip.id insProductId,
+ io.entrust_code,
+ is2.sample_code,
+ iiq.supplier_name,
+ ip.`last_value` testValue,
+ ip.update_time detectionTime
from ins_product ip
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="selectInspectListByIfsIfs" resultType="com.ruoyi.inspect.vo.ProductVo">
+ select
+ iiq.order_no,
+ iiq.update_batch_no,
+ iiq.part_no,
+ iiq.part_desc,
+ io.entrust_code ,
+ isa.sample_code,
+ ip.inspection_item,
+ ip.inspection_item_subclass,
+ ip.tell,
+ ip.`last_value`,
+ case
+ when ip.ins_result = 0 then '涓嶅悎鏍�'
+ when ip.ins_result = 1 then '鍚堟牸'
+ when ip.ins_result = 3 then '涓嶅垽瀹�'
+ else ''
+ end AS ins_result,
+ u.name,
+ ipr.create_time
+ from ifs_inventory_quantity iiq
+ inner join ins_order io on iiq.id = io.ifs_inventory_id
+ left join ins_sample isa on io.id = isa.ins_order_id
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ inner join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join user u on ipr.create_user = u.id
+ WHERE
+ iiq.id in
+ <foreach collection="ifsIds" item="ifsId" separator="," open="(" close=")">
+ #{ifsId}
+ </foreach>
+ AND ip.state = 1
+ </select>
</mapper>
--
Gitblit v1.9.3