From 4f08374c14dd723feae9b84eeb959803f3378cf7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 17:24:54 +0800
Subject: [PATCH] fix: 生产订单返回产品ID

---
 src/main/resources/mapper/production/ProductOrderMapper.xml |    3 ++-
 src/main/java/com/ruoyi/production/dto/ProductOrderDto.java |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 589f885..10c476c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -39,6 +39,9 @@
     @Excel(name = "鐗╂枡缂栫爜")
     private String materialCode;
 
+    @ApiModelProperty(value = "浜у搧ID")
+    private Long productId;
+
     @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
     @Excel(name = "宸ヨ壓璺嚎缂栧彿")
     private String processRouteCode;
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index f18e454..c758af7 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -49,7 +49,8 @@
         pb.bom_no AS bomNo,
         ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
         pms.model,
-        pms.material_code AS materialCode
+        pms.material_code AS materialCode,
+        pms.id AS productId
         FROM product_order po
         LEFT JOIN process_route pr ON po.route_id = pr.id
         LEFT JOIN product_bom pb ON pr.bom_id = pb.id

--
Gitblit v1.9.3