From 69be414eaecdbe1978fb127fff0133308a5b89c3 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Jun 2024 13:39:39 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 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 42c0f28c5..236732fd8 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
@@ -26,6 +26,7 @@ import com.xdadan.erp.common.utils.SecurityUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 import com.xdadan.erp.emis.domain.EmisBrand;
 import com.xdadan.erp.emis.domain.EmisPrintTpl;
+import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.AddressParseResult;
@@ -176,12 +177,21 @@ public class EmisCommonController extends EmisBaseController
     public AjaxResult getPackNo()
     {
         try {
-            String yyMMddHHmm = "yyMMddHHmm";
+            String yyMMdd = "yyMMdd";
 
-//            TP2406031808004
-            String hbKey= "TP"+DateUtils.parseDateToStr(yyMMddHHmm,new Date());
+            // 站点三字码
+            String siteThreeCode="--";
+            try{
+                EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode());
+                siteThreeCode=site.getSizeCode3();
+            }catch (Exception ex){
+                ex.printStackTrace();
+            }
+
+//            HNJ24061901
+            String hbKey= "H"+siteThreeCode+DateUtils.parseDateToStr(yyMMdd,new Date());
             Long lockNo = redissonService.addAndGetLong(hbKey,1L);
-            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),3,"0");
+            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0");
             return AjaxResult.success("获取成功",packNo);
         }catch (Exception ex){
             ex.printStackTrace();
@@ -196,10 +206,17 @@ public class EmisCommonController extends EmisBaseController
     public AjaxResult getTmsGroupBatchNo()
     {
         try {
-//            TB24060318081202
-            String DTF = "yyMMddHHmmss";
+            String yyMMdd = "yyMMdd";
+            // 站点三字码
+            String siteThreeCode="--";
+            try{
+                EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode());
+                siteThreeCode=site.getSizeCode3();
+            }catch (Exception ex){
+                ex.printStackTrace();
+            }
 
-            String batchKey= "TB"+DateUtils.parseDateToStr(DTF,new Date());
+            String batchKey= "B"+siteThreeCode+DateUtils.parseDateToStr(DTF,new Date());
             Long lockNo = redissonService.addAndGetLong(batchKey,1L);
             String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0");
             return AjaxResult.success("获取成功",batchNo);