From 3d950b8475cc52084cb40ed7a9373900f0606167 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期一, 21 九月 2026 19:17:00 +0800
Subject: [PATCH] feat(production): 新增生产订单自动领料功能与订单号生成方法
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 4d98b79..a47c514 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -441,8 +441,20 @@
}
private String generateNextOrderNo() {
- // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿锛堥粯璁ゆ寜褰撳ぉ鏃ユ湡锛�
+ return generateNextOrderNo(LocalDate.now());
+ }
+
+ /**
+ * 鎸夋寚瀹氭棩鏈熺敓鎴愪笅涓�涓敓浜ц鍗曞彿
+ *
+ * @param orderDate 璁㈠崟鏃ユ湡锛堢敤浜庣敓鎴愭棩鏈熷墠缂�锛夛紝涓� null 鏃朵娇鐢ㄥ綋澶�
+ */
+ public String generateNextOrderNo(LocalDate orderDate) {
+ if (orderDate == null) {
+ orderDate = LocalDate.now();
+ }
+ String datePrefix = orderDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "SC" + datePrefix;
ProductionOrder latestOrder = this.getOne(Wrappers.<ProductionOrder>lambdaQuery()
.likeRight(ProductionOrder::getNpsNo, prefix)
@@ -802,6 +814,7 @@
status.setName(task.getOperationName() != null && !task.getOperationName().isBlank()
? task.getOperationName()
: "鏈煡宸ュ簭");
+ status.setColor(task.getOperationColor());
BigDecimal percentage = task.getCompletionStatus() == null
? BigDecimal.ZERO
: task.getCompletionStatus();
--
Gitblit v1.9.3