From f291bdceba5d7549111deaa1fb413fae298a52b0 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Wed, 30 Oct 2024 22:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrderNoRuleController.java     |  6 ++++++
 .../orderNoRule/dto/CreateOrderNoRuleDto.java |  5 ++++-
 .../coal/orderNoRule/dto/OrderNoRuleDto.java  |  5 ++++-
 .../orderNoRule/dto/UpdateOrderNoRuleDto.java |  5 ++++-
 .../service/OrderNoRuleService.java           | 20 ++++++++++++-------
 .../orderNoRule/service/RuleCodeConstant.java | 13 ++++++++++++
 6 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/cn/lihongjie/coal/orderNoRule/service/RuleCodeConstant.java

diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/controller/OrderNoRuleController.java b/src/main/java/cn/lihongjie/coal/orderNoRule/controller/OrderNoRuleController.java
index 86ddfb7f..d5527cac 100644
--- a/src/main/java/cn/lihongjie/coal/orderNoRule/controller/OrderNoRuleController.java
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/controller/OrderNoRuleController.java
@@ -63,4 +63,10 @@ public class OrderNoRuleController {
         return R.success(this.service.genOrderNo(request.getId()));
     }
 
+
+    @PostMapping("/previewOrderNo")
+    public R<String> previewOrderNo(@RequestBody IdRequest request) {
+        return R.success(this.service.previewOrderNo(request.getId()));
+    }
+
 }
diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/CreateOrderNoRuleDto.java b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/CreateOrderNoRuleDto.java
index bd0774b7..94740278 100644
--- a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/CreateOrderNoRuleDto.java
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/CreateOrderNoRuleDto.java
@@ -5,4 +5,7 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import lombok.Data;
 
 @Data
-public class CreateOrderNoRuleDto extends OrgCommonDto {}
+public class CreateOrderNoRuleDto extends OrgCommonDto {
+
+    private String ruleTemplate;
+}
diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/OrderNoRuleDto.java b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/OrderNoRuleDto.java
index 667602a4..603fc3b9 100644
--- a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/OrderNoRuleDto.java
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/OrderNoRuleDto.java
@@ -5,4 +5,7 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import lombok.Data;
 
 @Data
-public class OrderNoRuleDto extends OrgCommonDto {}
+public class OrderNoRuleDto extends OrgCommonDto {
+
+    private String ruleTemplate;
+}
diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/UpdateOrderNoRuleDto.java b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/UpdateOrderNoRuleDto.java
index b9152e7c..8e9bda45 100644
--- a/src/main/java/cn/lihongjie/coal/orderNoRule/dto/UpdateOrderNoRuleDto.java
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/dto/UpdateOrderNoRuleDto.java
@@ -5,4 +5,7 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import lombok.Data;
 
 @Data
-public class UpdateOrderNoRuleDto extends OrgCommonDto {}
+public class UpdateOrderNoRuleDto extends OrgCommonDto {
+
+    private String ruleTemplate;
+}
diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/service/OrderNoRuleService.java b/src/main/java/cn/lihongjie/coal/orderNoRule/service/OrderNoRuleService.java
index e074f4fd..564f16ae 100644
--- a/src/main/java/cn/lihongjie/coal/orderNoRule/service/OrderNoRuleService.java
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/service/OrderNoRuleService.java
@@ -88,6 +88,12 @@ public class OrderNoRuleService extends BaseService<OrderNoRuleEntity, OrderNoRu
         return genOrderNo(ruleCode, Ctx.currentUser().getOrganizationId());
     }
 
+
+    public String previewOrderNo(String ruleCode) {
+        return genOrderNo(ruleCode, Ctx.currentUser().getOrganizationId() + "-preview" );
+    }
+
+
     public String genOrderNo(String ruleCode, String organizationId) {
         return orderNoGenService.genOrderNo(ruleCode, organizationId);
     }
@@ -106,17 +112,17 @@ public class OrderNoRuleService extends BaseService<OrderNoRuleEntity, OrderNoRu
         this.repository.deleteByOrganizationId(orgId);
 
 
-        insertOne(orgId, "MTCG", "煤炭采购订单号规则", "MTCG{yyyyMMdd}{seq:4}");
-        insertOne(orgId, "MTXS", "煤炭销售订单号规则", "MTXS{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.MTCG, "煤炭采购订单号规则", "MTCG{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.MTXS, "煤炭销售订单号规则", "MTXS{yyyyMMdd}{seq:4}");
 
         /**
          * 库房相关
          */
-        insertOne(orgId, "KF_QTRKD", "库房其他入库单", "QTRKD{yyyyMMdd}{seq:4}");
-        insertOne(orgId, "KF_QTCKD", "库房其他出库单", "QTCKD{yyyyMMdd}{seq:4}");
-        insertOne(orgId, "KF_RKD", "库房入库单", "RKD{yyyyMMdd}{seq:4}");
-        insertOne(orgId, "KF_CKD", "库房出库单", "CKD{yyyyMMdd}{seq:4}");
-        insertOne(orgId, "KF_PDD", "库房盘点单", "PDD{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.KF_QTRKD, "库房其他入库单", "QTRKD{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.KF_QTCKD, "库房其他出库单", "QTCKD{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.KF_RKD, "库房入库单", "RKD{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.KF_CKD, "库房出库单", "CKD{yyyyMMdd}{seq:4}");
+        insertOne(orgId, RuleCodeConstant.KF_PDD, "库房盘点单", "PDD{yyyyMMdd}{seq:4}");
 
     }
 
diff --git a/src/main/java/cn/lihongjie/coal/orderNoRule/service/RuleCodeConstant.java b/src/main/java/cn/lihongjie/coal/orderNoRule/service/RuleCodeConstant.java
new file mode 100644
index 00000000..fb4986f1
--- /dev/null
+++ b/src/main/java/cn/lihongjie/coal/orderNoRule/service/RuleCodeConstant.java
@@ -0,0 +1,13 @@
+package cn.lihongjie.coal.orderNoRule.service;
+
+import java.util.*;
+
+public class RuleCodeConstant {
+    public static final String MTCG = "MTCG";
+    public static final String MTXS = "MTXS";
+    public static final String KF_QTRKD = "KF_QTRKD";
+    public static final String KF_RKD = "KF_RKD";
+    public static final String KF_CKD = "KF_CKD";
+    public static final String KF_PDD = "KF_PDD";
+    public static final String KF_QTCKD = "KF_QTCKD";
+}