From 0066150978efa004da69e580390a021ebef1824e Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 25 六月 2025 17:06:41 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..fddb14f 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
@@ -44,10 +44,10 @@
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()));//璁㈠崟鏃堕棿
--
Gitblit v1.9.1