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/InsReportMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index a5bc457..68615c0 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -20,9 +20,22 @@
iiq.is_copper,
iiq.material_prop,
ip.son_laboratory,
- iiq.update_batch_no,
- iiq.part_desc,
- iiq.supplier_name
+ CASE
+ WHEN io.ifs_inventory_id IS NOT NULL THEN iiq.update_batch_no
+ ELSE io.update_batch_no
+ END AS update_batch_no,
+ CASE
+ WHEN io.ifs_inventory_id IS NOT NULL THEN iiq.part_desc
+ ELSE io.part_desc
+ END AS part_desc,
+ CASE
+ WHEN io.ifs_inventory_id IS NOT NULL THEN iiq.supplier_name
+ ELSE io.supplier_name
+ END AS supplier_name,
+ CASE
+ WHEN io.ifs_inventory_id IS NOT NULL THEN iiq.contract
+ ELSE io.contract
+ END AS contract
from ins_report ir
left join ins_order io on io.id = ir.ins_order_id
LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id
--
Gitblit v1.9.3