From 4353738ad67ea09e9db884f1e9f1287fe81c4883 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 12 十一月 2025 16:32:58 +0800
Subject: [PATCH] 外购下单、检验任务、报告编织页面添加供应商、零件描述等字段
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java | 6 ++++++
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 3 +++
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 4 +++-
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 ++-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
index d27c8c9..f5096eb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
@@ -45,4 +45,10 @@
@ApiModelProperty(value = "鏇存柊鍚庣殑ifs鎵规鍙�")
private String updateBatchNo;
+ @ApiModelProperty("闆朵欢鎻忚堪")
+ private String partDesc;
+
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index b6be44b..9755c40 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -15,6 +15,9 @@
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sample;
+ @ApiModelProperty("闆朵欢鎻忚堪")
+ private String partDesc;
+
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index 4cb4198..5014f27 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -19,7 +19,9 @@
io.ifs_inventory_id,
iiq.is_copper,
ip.son_laboratory,
- iiq.update_batch_no
+ iiq.update_batch_no,
+ iiq.part_desc,
+ iiq.supplier_name
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
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 9f9164c..cf45ff2 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -194,7 +194,8 @@
ira.temp_url_pdf,
iiq.is_copper,
iiq.is_split_order,
- iiq.update_batch_no
+ iiq.update_batch_no,
+ iiq.part_desc
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
--
Gitblit v1.9.3