From 6248c3f2d94debc1633cfcc66496263cef8b18b3 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 04 二月 2026 14:41:01 +0800
Subject: [PATCH] feat(production): 新增生产订单功能并优化工单号生成逻辑

---
 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index 0e8497a..f70321b 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -98,11 +98,7 @@
                             int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
                             if (insert > 0) {
                                 // 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶у伐鍗曞彿
-                                QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
-                                queryWrapper.likeRight("work_order_no", datePrefix)
-                                        .orderByDesc("work_order_no")
-                                        .last("LIMIT 1");
-                                ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectOne(queryWrapper);
+                                ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
                                 int sequenceNumber = 1; // 榛樿搴忓彿
                                 if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
                                     String lastNo = lastWorkOrder.getWorkOrderNo().toString();
@@ -116,7 +112,7 @@
                                     }
                                 }
                                 // 鐢熸垚瀹屾暣鐨勫伐鍗曞彿
-                                String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
+                                String workOrderNoStr ="FG" +String.format("%s%03d", datePrefix, sequenceNumber);
                                 ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                                 productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                                 productWorkOrder.setProductOrderId(order.getId());

--
Gitblit v1.9.3