From 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 18:06:06 +0800
Subject: [PATCH] feat(production): 更新生产核算逻辑以支持设备和工时计算
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index d622379..58f14d8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -213,8 +213,8 @@
return "SC" + datePrefix + formatOrderSequence(datePrefix);
}
- public String generateNextOrderByContractNo(String datePrefix, String contractNo) {
- return contractNo + formatOrderSequence(datePrefix);
+ public String generateNextOrderByContractNo(String contractNo) {
+ return contractNo + formatOrderSequenceByContractNo(contractNo);
}
private String formatOrderSequence(String datePrefix) {
@@ -233,4 +233,12 @@
return String.format("%04d", sequence);
}
+
+ private String formatOrderSequenceByContractNo(String contractNo) {
+ LambdaQueryWrapper<ProductOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.likeRight(ProductOrder::getNpsNo, contractNo);
+ Long count = productOrderMapper.selectCount(queryWrapper);
+ return String.format("%04d", count+1);
+ }
+
}
--
Gitblit v1.9.3