From 554738e1e277a9aafda4c20d420cba252d5f528f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 15:16:50 +0800
Subject: [PATCH] 显示料号
---
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 4 ++++
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 2 +-
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 2 ++
src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java | 2 ++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 5 +++++
src/main/resources/mapper/stock/StockInventoryMapper.xml | 3 +++
src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java | 1 +
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 3 ++-
src/main/resources/mapper/stock/StockInRecordMapper.xml | 2 ++
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 3 ++-
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 4 ++++
src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java | 2 ++
src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java | 3 +++
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 3 +++
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 4 ++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 4 ++++
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 6 ++++++
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 2 ++
18 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index a154c94..cbbee11 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -33,6 +33,12 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
+ /**
+ * 鏂欏彿
+ */
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
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 37b6940..e874728 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -514,6 +514,11 @@
.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<>();
salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId())
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index fe3e20b..2e0b507 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
@@ -186,6 +187,9 @@
if (shippingInfo != null) {
product.setShippingStatus(shippingInfo.getStatus());
}
+
+ ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
+ product.setMaterialCode(productModel.getMaterialCode());
}
// 3.鏌ヨ涓婁紶鏂囦欢
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 34e57b8..a2df741 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -15,6 +15,10 @@
*/
private String model;
/**
+ * 浜у搧鏂欏彿
+ */
+ private String materialCode;
+ /**
* 浜у搧鍗曚綅
*/
private String unit;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index bfa6fe7..b376741 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -14,7 +14,7 @@
private String productName;
private String model;
private String unit;
-
+ private String materialCode;
//鍏ュ簱绫诲瀷
private String recordType;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 3e3abf9..880c524 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -18,6 +18,10 @@
*/
private String model;
/**
+ * 浜у搧鏂欏彿
+ */
+ private String materialCode;
+ /**
* 浜у搧鍗曚綅
*/
private String unit;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
index 404c58a..a9a77a3 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
@@ -10,6 +10,7 @@
private String productName;
private String model;
private String unit;
+ private String materialCode;
//鍏ュ簱绫诲瀷
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
index d705110..a1424b3 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
@@ -16,6 +16,8 @@
private String productName;
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
@Excel(name = "鍗曚綅")
private String unit;
@Excel(name = "鍏ュ簱鏉ユ簮")
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 4b7553f..b8b2bc4 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -19,6 +19,9 @@
@Excel(name = "鍗曚綅")
private String unit;
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
@Excel(name = "搴撳瓨鏁伴噺")
private BigDecimal qualitity;
diff --git a/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
index f120817..9f94c39 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
@@ -15,6 +15,8 @@
private String productName;
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
@Excel(name = "鍗曚綅")
private String unit;
@Excel(name = "鍑哄簱鏉ユ簮")
diff --git a/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
index 7fd6e36..cd17152 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockUnInventoryExportData.java
@@ -16,6 +16,9 @@
@Excel(name = "瑙勬牸")
private String model;
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
@Excel(name = "鍗曚綅")
private String unit;
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 4ffb6c5..34b6963 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
@@ -114,7 +115,7 @@
List<StockInRecordExportData> list = stockInRecordMapper.listStockInRecordExportData(stockInRecordDto);
for (StockInRecordExportData stockInRecordExportData : list) {
if (stockInRecordExportData.getType().equals("0")) {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
+ stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
} else {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInUnQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index e01fe5d..c6b9e6c 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.common.utils.OrderUtils;
@@ -107,7 +108,7 @@
if (stockInRecordExportData.getType().equals("0")) {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}else {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInUnQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
+ stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutUnQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}
}
ExcelUtil<StockOutRecordExportData> util = new ExcelUtil<>(StockOutRecordExportData.class);
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index d139950..e0f219f 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -110,6 +110,7 @@
slp.product_category AS productCategory,
slp.specification_model AS specificationModel,
sl.supplier_name AS supplierName,
+ pm.material_code AS materialCode,
SUM(slp.quantity) AS purchaseNum,
SUM(slp.tax_inclusive_total_price) AS purchaseAmount,
COUNT(DISTINCT slp.sales_ledger_id) AS purchaseTimes,
@@ -120,6 +121,9 @@
FROM sales_ledger_product slp
<!-- 鍏宠仈鍙拌处涓昏〃锛氳幏鍙栧綍鍏ユ棩鏈焑ntry_date -->
LEFT JOIN purchase_ledger sl ON slp.sales_ledger_id = sl.id
+ <!-- 鍏宠仈浜у搧鍨嬪彿琛細鑾峰彇鏂欏彿material_code -->
+ LEFT JOIN product_model pm ON pm.id = slp.product_model_id
+ <!-- 閲囪喘鏃ユ湡绛涢�夛細鍙�夋潯浠� -->
WHERE slp.type = 2 <!-- 鍥哄畾绛涢�夛細閲囪喘鍙拌处锛坱ype=2锛� -->
<!-- 閲囪喘鏃ユ湡绛涢�夛細鍙�夋潯浠� -->
<if test="req.entryDateStart != null and req.entryDateEnd != null">
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index dd99bbb..64d86ae 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -8,6 +8,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
@@ -37,6 +38,7 @@
SELECT
sir.*,
p.product_name as product_name,
+ pm.material_code as materialCode,
pm.model,
pm.unit,
u.nick_name as createBy
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index abdf94f..287d64a 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -65,6 +65,7 @@
pm.model,
si.remark,
pm.unit,
+ pm.material_code as materialCode,
p.product_name,
p.parent_id,
p2.product_name AS parent_name
@@ -82,6 +83,7 @@
select si.qualitity,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name,
coalesce(si.warn_num, 0) as warn_num,
coalesce(si.locked_quantity, 0) as locked_quantity,
@@ -99,6 +101,7 @@
select sir.*,si.qualitity as current_stock,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name,
su.nick_name as create_by
from
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 6b50711..6c25aa8 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,6 +23,7 @@
p.product_name as productName,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
@@ -52,6 +53,7 @@
p.product_name as productName,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 8b7c21a..9aed783 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -55,6 +55,7 @@
(su.qualitity - COALESCE(su.locked_quantity, 0)) AS un_locked_quantity,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name,
p2.product_name AS parent_name
FROM
@@ -73,6 +74,7 @@
select su.*,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
--
Gitblit v1.9.3