From f4ee0d9aaa7907815c2013811172d95e9c100b03 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 18:46:41 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 6f1afc875..65447b3c5 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -139,11 +139,12 @@ public class EmisCommonController extends BaseController
     public AjaxResult getPackNo()
     {
         try {
-            String YYYYMMDDHH = "yyyyMMddHH";
+            String yyMMddHHmm = "yyMMddHHmm";
 
-            String hbKey= "THB-"+DateUtils.parseDateToStr(YYYYMMDDHH,new Date());
+//            TP2406031808004
+            String hbKey= "TP"+DateUtils.parseDateToStr(yyMMddHHmm,new Date());
             Long lockNo = redissonService.addAndGetLong(hbKey,1L);
-            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
+            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),3,"0");
             return AjaxResult.success("获取成功",packNo);
         }catch (Exception ex){
             ex.printStackTrace();
@@ -158,11 +159,12 @@ public class EmisCommonController extends BaseController
     public AjaxResult getTmsGroupBatchNo()
     {
         try {
-            String YYYYMMDDHH = "yyyyMMddHH";
+//            TB24060318081202
+            String DTF = "yyMMddHHmmss";
 
-            String batchKey= "TGB-"+DateUtils.parseDateToStr(YYYYMMDDHH,new Date());
+            String batchKey= "TB"+DateUtils.parseDateToStr(DTF,new Date());
             Long lockNo = redissonService.addAndGetLong(batchKey,1L);
-            String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
+            String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0");
             return AjaxResult.success("获取成功",batchNo);
         }catch (Exception ex){
             ex.printStackTrace();
@@ -174,14 +176,17 @@ public class EmisCommonController extends BaseController
      * 获取进仓单号
      */
     @RequestMapping(value = "/getWareHouseInNo")
-    public AjaxResult getWareHouseInNo()
+    public AjaxResult getWareHouseInNo(String simpleName)
     {
         try {
+            if(StringUtils.isEmpty(simpleName)){
+                simpleName="TL";
+            }
             String YYMMDD = "yyMMdd";
-
-            String hbKey= "TAN-7080"+DateUtils.parseDateToStr(YYMMDD,new Date());
+//    TAN-7080-SMD-240603-01
+            String hbKey= "TAN-7080-"+"-"+simpleName+DateUtils.parseDateToStr(YYMMDD,new Date());
             Long lockNo = redissonService.addAndGetLong(hbKey,1L);
-            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
+            String packNo =hbKey+"-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0");
             return AjaxResult.success("获取成功",packNo);
         }catch (Exception ex){
             ex.printStackTrace();