From e1dcac581229d5f345e357132bbd9789d4e7544b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 05 二月 2026 17:51:22 +0800
Subject: [PATCH] feat(production): 添加图纸编号字段支持
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 2 +
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 1
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 3 +
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 3 -
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 2 +
src/main/resources/mapper/production/ProcessRouteMapper.xml | 2
src/main/resources/mapper/production/ProductOrderMapper.xml | 6 ++
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 1
src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java | 2 +
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 3 +
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java | 2 +
src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java | 2 +
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 4 ++
src/main/resources/mapper/production/ProductBomMapper.xml | 4 +
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProductBomDto.java | 2 +
src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java | 2 +
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 5 ++
src/main/resources/mapper/production/ProductStructureMapper.xml | 8 +++-
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 2 +
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 2 +
src/main/resources/mapper/production/ProductProcessRouteMapper.xml | 2
25 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 069b665..a60a339 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -61,6 +61,10 @@
@Excel(name = "鍓╀綑搴撳瓨")
private BigDecimal stockQuantity;
+ @ApiModelProperty(value = "鍥剧焊缂栧彿")
+ @Excel(name = "鍥剧焊缂栧彿")
+ private String drawingNumber;
+
@TableField(exist = false)
private LocalDateTime createTime;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 232a00c..62b9ad3 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -14,5 +14,7 @@
@ApiModelProperty("瑙勬牸")
private String model;
+ private String drawingNumber;
+
private String bomNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 705354c..d30ba92 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -21,6 +21,8 @@
@ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
+ private String drawingNumber;
+
@ApiModelProperty(value = "鍗曚綅")
private String unit;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
index ab695ca..dae8be1 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 drawingNumber;
+
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index dc2185a..f4aa238 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -31,6 +31,9 @@
@Excel(name = "浜у搧鍚嶇О")
private String productCategory;
+
+ private String drawingNumber;
+
@ApiModelProperty(value = "瑙勬牸")
@Excel(name = "瑙勬牸")
private String specificationModel;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
index d6ec3f1..a8fc5b5 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -21,6 +21,8 @@
private Long productId;
+ private String drawingNumber;
+
private String productName;
private String model;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index ec43eef..28c2e3a 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -21,6 +21,8 @@
@ApiModelProperty(value = "浜у搧id")
private Long productId;
+ private String drawingNumber;
+
private String model;
@TableField(exist = false)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..b4b013c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -43,4 +43,6 @@
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
+
+ private String drawingNumber;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java b/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
index 67a6332..334051f 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionDispatchAddDto.java
@@ -54,4 +54,6 @@
*/
private String specificationModel;
+ private String drawingNumber;
+
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
index 13bb4a3..1d808e5 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
@@ -15,6 +15,8 @@
@ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
+ private String drawingNumber;
+
@ApiModelProperty(value = "鍗曚綅")
private String unit;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 5ef224b..6d0d8ca 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -38,6 +38,8 @@
@Excel(name = "浜у搧鍚嶇О")
private String productName;
+ private String drawingNumber;
+
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
index f98cc80..8f85ba4 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
@@ -12,4 +12,6 @@
@ApiModelProperty(value = "浜у搧鍨嬪彿")
private String model;
+
+ private String drawingNumber;
}
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
index 33e758d..e879e97 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductDto.java
@@ -54,6 +54,8 @@
@ApiModelProperty(value = "浜у搧澶х被")
private String productCategory;
+ private String drawingNumber;
+
/**
* 瑙勬牸鍨嬪彿
*/
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 1b5e2b4..7e43b07 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.drawing_number
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..40a5b7f 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.drawing_number
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..0f2c27d 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.drawing_number,
p.product_name productName
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
@@ -39,7 +40,8 @@
<select id="getById" resultType="com.ruoyi.production.dto.ProductBomDto">
select pb.*,
pm.model productModelName,
- p.product_name productName
+ p.product_name productName,
+ pm.drawing_number
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
left join product p on pm.product_id = p.id
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index fdcb54e..ab4e290 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.drawing_number,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
@@ -79,14 +80,17 @@
ps.unit_quantity * po.quantity as demandedQuantity,
ps.unit,
p.product_name,
+ pm.drawing_number,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pb.bom_no
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join product_process pp on ps.process_id = pp.id
+ left join product_bom pb on ps.bom_id = pb.id
left join product_process_route ppr on ps.bom_id = ppr.bom_id
left join product_order po on po.id = ppr.product_order_id
where ppr.product_order_id = #{orderId}
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index 302a0fb..f62a1e8 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -15,11 +15,16 @@
pp.name as process_name,
pm.model,
pm.unit,
+ pm.drawing_number,
p.product_name,
+ ppr.process_route_Code,
+ pb.bom_no,
case when pwo.complete_quantity>0 then true else false end as is_complete
from product_process_route_item ppri
left join product_model pm on ppri.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join product_process_route ppr on ppr.id = ppri.product_route_id
+ left join product_bom pb on pb.id = ppr.bom_id
left join product_process pp on pp.id = ppri.process_id
left join product_work_order pwo on pwo.product_process_route_item_id = ppri.id
where ppri.product_order_id = #{orderId}
diff --git a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
index dd4809f..fe47270 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.drawing_number
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..aae9668 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -16,11 +16,14 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pm.drawing_number,
+ pb.bom_no
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join product_bom pb on ps.bom_id = pb.id
left join product_process pp on ps.process_id = pp.id
where ps.bom_id = #{bomId}
order by ps.id
@@ -30,7 +33,8 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pm.drawing_number
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 14b883e..b35349b 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -25,6 +25,7 @@
pm.model,
pm.unit,
p.product_name AS productName,
+ pm.drawing_number,
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
CASE
@@ -55,6 +56,7 @@
pp.NAME as processName,
pm.model,
pm.unit,
+ pm.drawing_number,
p.product_name AS productName,
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index bc1fdcf..a6998e3 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -15,6 +15,7 @@
pm.model as model,
ppm.product_no as productNo,
p.product_name,
+ pm.drawing_number,
pm.unit
from
production_product_input ppi
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 9c3bf3d..43de0c6 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -19,6 +19,7 @@
u.nick_name as nickName,
p.product_name as productName,
pm.model as productModelName,
+ pm.drawing_number,
ppo.quantity,
ppo.scrap_qty,
pm.unit,
@@ -64,6 +65,7 @@
sl.customer_name,
p.product_name,
pm.model as product_model_name,
+ pm.drawing_number,
pm.unit,
slpa.process,
ppo.quantity,
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index f73e5e4..7c85fe3 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -14,6 +14,7 @@
<select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
select ppo.*,
pm.model as model,
+ pm.drawing_number,
ppm.product_no as productNo
from
production_product_output ppo
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index fdbe7cc..ded1772 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -84,8 +84,7 @@
</if>
</where>
- GROUP BY slpa.scheduling_user_name
-
+ GROUP BY slpa.scheduling_user_name,slpa.scheduling_user_id
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
--
Gitblit v1.9.3