From 2cf06285f64311722cbf79fd5635b16718635e5e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:16 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index ff26f13..eb6f9ec 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -193,7 +193,6 @@
ira.temp_url_pdf,
iiq.is_copper,
iiq.is_split_order,
-
CASE
WHEN io.ifs_inventory_id IS NOT NULL THEN iiq.update_batch_no
ELSE io.update_batch_no
@@ -208,6 +207,10 @@
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,
iiq.material_prop AS material_prop
FROM
@@ -483,7 +486,7 @@
ifs.supplier_id AS supplierId,
ifs.supplier_name AS supplierName,
ifs.part_no AS partNo,
- ifs.qty_arrived AS qtyArrived,
+ ifs.pur_qty_in_store AS qtyArrived,
ifs.receiver_date AS receiverDate,
ifs.update_batch_no AS updateBatchNo,
ifs.part_desc AS partDesc,
@@ -493,7 +496,8 @@
ifs.buy_unit_meas buyUnitMeas,
io.test_quantity testQuantity,
ifs.buy_unit_meas buyUnitMeas,
- ifs.declare_date declareDate
+ ifs.declare_date declareDate,
+ io.entrust_code AS entrustCode
FROM ifs_inventory_quantity ifs
LEFT JOIN ins_order io ON ifs.id = io.ifs_inventory_id
WHERE io.id = #{id}
--
Gitblit v1.9.3