From 7204baeea8ec45bf90113f7d812db30de65d1229 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:10 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index adccc5e..42162dc 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -17,7 +17,9 @@
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -145,13 +147,28 @@
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+ //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
}
return R.ok().add(orderNo);
}
+// @RequestMapping("/orderNo/init1")
+// @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
+// public R initOrderNo1() {
+// long nextId = snowflakeIdWorker.nextId();
+// SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+// String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+// //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+// if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
+// return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+// }
+// return R.ok().add(orderNo);
+// }
+
@RequestMapping("/receive/init")
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
public R initReceive(@RequestBody InitOrderParam param) {
--
Gitblit v1.9.1