From 0fba727faf69181a627b95b9a2eaf6064bfe1968 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 15:32:33 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 5 +++--
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 10 ++++++++++
2 files changed, 13 insertions(+), 2 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 b14e242..d5ac1f4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -125,10 +125,11 @@
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
+ String number = "PR-" + String.valueOf(nextId).substring(0, 15);
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
}
- return R.ok().add(String.valueOf(nextId));
+ return R.ok().add(number);
}
@RequestMapping("/order/init")
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index b10d741..45bf08c 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -63,6 +63,16 @@
}
Date now = new Date();
String docNum = String.valueOf(snowflakeIdWorker.nextId());
+ switch (param.getDocType()) {
+ case 34: // 閲囪喘鍗�
+ docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ case 45: // 閿�鍞��璐у崟
+ docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ default:
+ break;
+ }
for (Comb comb : combs) {
// 鏀瑰彉缁勬墭妗ｇ姸鎬�
comb.setIoStatus(4);
--
Gitblit v1.9.1