From 877504ede165b8c965b6cf6599708e7e48778034 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 15:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index e1fdbd6..6c05996 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -24,10 +24,12 @@
         pp.NAME as processName,
         pm.model,
         pm.unit,
-        p.product_name AS productName
+        p.product_name AS productName,
+        po.nps_no AS productOrderNpsNo
         FROM
         `product_work_order` pwo
         LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
+        LEFT JOIN product_order po ON po.id = pwo.product_order_id
         LEFT JOIN product_process pp ON pp.id = ppri.process_id
         LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
         LEFT JOIN product p ON p.id = pm.product_id

--
Gitblit v1.9.3