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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 47649e2..d5ac1f4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -86,7 +86,7 @@
         }
         Long sts = pakouts.get(0).getWrkSts();
         if (sts == 1) {
-            sts =2L;
+            sts = 2L;
         }
         WrkSts wrkSts = wrkStsService.selectById(sts);
         return R.ok().add(Cools
@@ -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")

--
Gitblit v1.9.1