From 87d66c61fc5047fb5708d609f4a5f1f868cd646c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 18:04:30 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
index c12db65..96005af 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -7,11 +7,8 @@
 import com.zy.asrs.wms.asrs.entity.Wave;
 import com.zy.asrs.wms.asrs.mapper.OrderNoRuleMapper;
 import com.zy.asrs.wms.asrs.entity.OrderNoRule;
-import com.zy.asrs.wms.asrs.service.OrderNoRuleService;
+import com.zy.asrs.wms.asrs.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wms.asrs.service.OrderService;
-import com.zy.asrs.wms.asrs.service.OrderTypeService;
-import com.zy.asrs.wms.asrs.service.WaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +29,8 @@
     private OrderTypeService orderTypeService;
     @Autowired
     private WaveService waveService;
+    @Autowired
+    private CacheSiteService cacheSiteService;
 
     @Override
     public String getOrderNo(Integer orderType) {
@@ -44,14 +43,13 @@
         StringBuffer buffer = new StringBuffer();
         buffer.append(orderNoRule.getOrderConst());//璁㈠崟甯搁噺
 
-        String pattern = "yyyyMMddHHmmss";
-        if (orderNoRule.getTimeRule() == 0) {
-            pattern = "yyyyMMdd";
-        }
+        String pattern = "yyMMddHHmmss";
+//        if (orderNoRule.getTimeRule() == 0) {
+//            pattern = "yyyyMMdd";
+//        }
 
         SimpleDateFormat format = new SimpleDateFormat(pattern);
         buffer.append(format.format(new Date()));//璁㈠崟鏃堕棿
-
 
         if(orderType == 1 || orderType == 2) {
             //鏌ュ綋澶╄鍗曟暟閲�

--
Gitblit v1.9.1