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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 d71b3bb..2d72acd 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -290,11 +290,13 @@
             Long productId = product.getProductId();
             if (productId != null && productMap.containsKey(productId)) {
                 product.setProductCategory(productMap.get(productId));
+                product.setProductId(productId);
             }
 
             Long productModelId = product.getProductModelId();
             if (productModelId != null && modelMap.containsKey(productModelId)) {
                 product.setSpecificationModel(modelMap.get(productModelId));
+                product.setProductModelId(productModelId);
             }
         }
 
@@ -511,6 +513,11 @@
         productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                 .eq(SalesLedgerProduct::getType, purchaseLedgerDto.getType());
         List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
+
+        for (SalesLedgerProduct product : products) {
+            ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
+            product.setMaterialCode(productModel.getMaterialCode());
+        }
 
         // 3.鏌ヨ涓婁紶鏂囦欢
         LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -778,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();

--
Gitblit v1.9.3