From c7ac8c338be2f1976836e570a05a893ed87bd9be Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 11 十一月 2025 17:34:15 +0800
Subject: [PATCH] 成品下单撤销报错问题修复&原材料下单下发时间过滤条件调整为报检时间
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 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..b4b0a48 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -149,21 +149,36 @@
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="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