From 61e45a2a7c94d845de5b9ace90bfee4bc9af4fd2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 四月 2026 11:32:21 +0800
Subject: [PATCH] 显示料号
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 4 ++++
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 17 ++++++-----------
src/main/resources/mapper/stock/StockInRecordMapper.xml | 1 +
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e874728..2d72acd 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -785,6 +785,10 @@
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
.eq(SalesLedgerProduct::getType, 2);
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
+ for (SalesLedgerProduct product : products) {
+ ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
+ product.setMaterialCode(productModel != null ? productModel.getMaterialCode() : "");
+ }
// 4. 杞崲 DTO
PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index a3d9a30..001a27c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -17,13 +17,10 @@
qu.deal_name,
qu.deal_time,
qu.quarantine_lifted,
+ qu.model,
pm.material_code as materialCode,
CASE
- WHEN qu.model = pm.id THEN pm.model
- ELSE qu.model
- END AS model,
- CASE
- WHEN qu.model = pm.id THEN true
+ WHEN qu.inspect_id is null THEN true
ELSE false
END AS method
FROM quality_unqualified qu
@@ -80,16 +77,14 @@
qu.deal_name,
qu.deal_time,
qi.process,
+ qu.model,
+ pm.material_code as materialCode,
CASE
- WHEN qu.model = pm.id THEN pm.model
- ELSE qu.model
- END AS model,
- CASE
- WHEN qu.model = pm.id THEN true
+ WHEN qu.inspect_id is null THEN true
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.model = pm.model
LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
where
1=1
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 64d86ae..a869ff2 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -70,6 +70,7 @@
p.product_name AS product_name,
pm.model,
pm.unit,
+ pm.material_code AS materialCode,
u.nick_name AS createBy
FROM
stock_in_record AS sir
--
Gitblit v1.9.3