From 1c506371acbb461dd66773d40835fde6bfd67caf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 17:36:52 +0800
Subject: [PATCH] 显示料号
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 1
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 3 +
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 5 ++
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 11 ++++-
src/main/resources/mapper/production/ProductBomMapper.xml | 1
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 3 +
src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java | 3 +
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 3 +
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 3 +
src/main/resources/mapper/production/ProcessRouteMapper.xml | 2
src/main/resources/mapper/production/ProductOrderMapper.xml | 4 +
src/main/java/com/ruoyi/production/dto/ProductBomDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java | 4 ++
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 1
src/main/resources/mapper/production/ProductStructureMapper.xml | 3 +
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 2 +
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 3 +
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 4 ++
src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java | 7 +++
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 3 +
src/main/resources/mapper/production/ProductProcessRouteMapper.xml | 2
21 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 232a00c..80ae714 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -15,4 +15,7 @@
private String model;
private String bomNo;
+
+ //鐗╂枡缂栫爜
+ private String materialCode;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 705354c..3256eb6 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -28,4 +28,7 @@
private String model;
+
+ //鐗╂枡缂栫爜
+ private String materialCode;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
index ab695ca..30998d3 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
@@ -15,4 +15,6 @@
//浜у搧瑙勬牸鍨嬪彿
private String productModelName;
+ //鐗╂枡缂栫爜
+ private String materialCode;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index dc2185a..a9fedcc 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -35,6 +35,11 @@
@Excel(name = "瑙勬牸")
private String specificationModel;
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
+
@ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
index d6ec3f1..d205fa9 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -26,4 +26,7 @@
private String model;
private Boolean isComplete;
+
+ //鐗╂枡缂栫爜
+ private String materialCode;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index ec43eef..5f36d97 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -31,4 +31,7 @@
@TableField(exist = false)
private List<ProductStructureDto> children;
+
+ //鐗╂枡缂栫爜
+ private String materialCode;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index c6556f1..2ba3567 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -22,6 +22,10 @@
@ApiModelProperty(value = "瑙勬牸")
private String model;
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ private String materialCode;
+
//宸ュ簭
@ApiModelProperty(value = "宸ュ簭")
private String processName;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
index 13bb4a3..66179fe 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
@@ -12,6 +12,10 @@
@ApiModelProperty(value = "浜у搧鍨嬪彿")
private String model;
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ private String materialCode;
+
@ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 4618ba0..3108a30 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -50,6 +50,9 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ //鏂欏彿
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
//鍗曚綅
@Excel(name = "鍗曚綅")
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
index 33e758d..caa7d55 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
@@ -62,6 +62,13 @@
private String specificationModel;
/**
+ * 鏂欏彿
+ */
+ @Excel(name = "鏂欏彿")
+ @ApiModelProperty(value = "鏂欏彿")
+ private String materialCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 1b5e2b4..11cda74 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -21,7 +21,8 @@
pm.product_id,
pm.model,
p.product_name,
- pm.unit
+ pm.unit,
+ pm.material_code as materialCode
from
process_route_item pri
left join product_model pm on pri.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..a7aa633 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,7 +13,7 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+ select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no, pm.material_code as materialCode
from process_route ps
left join product_bom pb on ps.bom_id = pb.id
left join product_model pm on ps.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..4ac2125 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -18,6 +18,7 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductBomDto">
select * from (select pb.*,
pm.model productModelName,
+ pm.material_code as materialCode,
p.product_name productName
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index cc19fcd..f4db954 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -20,6 +20,7 @@
p.product_name as product_category,
pm.model as specification_model,
pm.unit,
+ pm.material_code as materialCode,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
@@ -82,7 +83,8 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pm.material_code as materialCode
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index 302a0fb..8942425 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -15,6 +15,7 @@
pp.name as process_name,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name,
case when pwo.complete_quantity>0 then true else false end as is_complete
from product_process_route_item ppri
diff --git a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
index dd4809f..48b99b4 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
@@ -15,7 +15,7 @@
<result column="product_order_id" property="productOrderId"/>
</resultMap>
<select id="listMain" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no
+ select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no, pm.material_code as materialCode
from product_process_route ppr
left join product_bom pb on ppr.bom_id = pb.id
left join product_model pm on ppr.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index e4a0795..61177af 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -16,7 +16,8 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pm.material_code as materialCode
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6c38212..417f029 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -26,6 +26,7 @@
pp.qualified_rate as processQualifiedRate,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name AS productName,
p.id AS productId,
po.nps_no AS productOrderNpsNo,
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index 65e2b96..3eb9bda 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -15,7 +15,8 @@
pm.model as model,
ppm.product_no as productNo,
p.product_name,
- pm.unit
+ pm.unit,
+ pm.material_code as materialCode
from
production_product_input ppi
left join production_product_main ppm on ppm.id = ppi.product_main_id
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 1b11d4c..5ea73fa 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -21,6 +21,7 @@
pp.name as process,
pp.qualified_rate as processQualifiedRate,
pm.model as productModelName,
+ pm.material_code as materialCode,
ppo.quantity,
ppo.scrap_qty,
(ppo.quantity - ppo.scrap_qty) as qualifiedQty,
@@ -99,6 +100,7 @@
p.product_name,
pm.model as product_model_name,
pm.unit,
+ pm.material_code as materialCode,
slpa.process,
ppo.quantity,
slpa.work_hours,
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index fdbe7cc..1db1229 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -18,11 +18,16 @@
T1.customer_name,
t3.product_category,
t3.specification_model,
- t3.unit
+ t3.unit,
+ pm.material_code as materialCode
FROM
sales_ledger_production_accounting t4
- LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
+ LEFT JOIN production_product_main ppm ON t4.product_main_id = ppm.id
+ LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_order po ON pwo.product_order_id = po.id
+ LEFT JOIN sales_ledger T1 ON T1.id = po.sales_ledger_id
+ LEFT JOIN sales_ledger_product t3 ON po.sale_ledger_product_id = t3.id
+ LEFT JOIN product_model pm ON po.product_model_id = pm.id
<where>
t3.type = 1
<if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
--
Gitblit v1.9.3