From b5d26b09f8a757788d38a44160fecd85e16520d2 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Thu, 15 Aug 2019 09:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/wms/bd/rest/SupplierInfoController.java | 12 ++++--------
 .../modules/wms/bd/rest/WareHouseController.java    | 13 +++++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java
index 5512b1f6..f49c9648 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java
@@ -13,6 +13,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 
 /**
@@ -40,14 +42,8 @@ public class SupplierInfoController {
     @GetMapping(value = "/initSupplierCode")
     @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')")
     public ResponseEntity initSupplierCode(){
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH);
-        int day = calendar.get(Calendar.DAY_OF_MONTH);
-        int hour = calendar.get(Calendar.HOUR_OF_DAY);
-        int minute = calendar.get(Calendar.MINUTE);
-        int second = calendar.get(Calendar.SECOND);
-        String supplierCode = "GYS" + year + month + day + hour + minute + second;
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");//设置日期格式
+        String supplierCode = "GYS"+ LocalDateTime.now().format(fmt);
         return new ResponseEntity(supplierCode,HttpStatus.OK);
     }
 
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
index f60bcb00..c335633e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
@@ -12,6 +12,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+
 
 /**
  * @author 黄星星
@@ -35,6 +39,15 @@ public class WareHouseController {
         return new ResponseEntity(wareHouseService.create(resources), HttpStatus.CREATED);
     }
 
+
+    @Log("初始化仓库编号")
+    @GetMapping(value = "/initWareHouseCode")
+    public ResponseEntity initWareHouseCode(){
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");//设置日期格式
+        String supplierCode = "CK"+ LocalDateTime.now().format(fmt);
+        return new ResponseEntity(supplierCode,HttpStatus.OK);
+    }
+
     @Log("查看仓库详情")
     @GetMapping(value = "/wareHouse/{id}")
     public ResponseEntity getMessureUnits(@PathVariable Long id){