From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 16 +++++++++++-----
1 files changed, 11 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..5299c2b 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -149,20 +149,26 @@
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>
--
Gitblit v1.9.3