aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-19 13:39:39 +08:00
parent 7e153a21fd
commit 69be414eae
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -26,6 +26,7 @@ import com.xdadan.erp.common.utils.SecurityUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisBrand; import com.xdadan.erp.emis.domain.EmisBrand;
import com.xdadan.erp.emis.domain.EmisPrintTpl; 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.EmisWaybill;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.AddressParseResult; import com.xdadan.erp.emis.domain.vo.AddressParseResult;
@ -176,12 +177,21 @@ public class EmisCommonController extends EmisBaseController
public AjaxResult getPackNo() public AjaxResult getPackNo()
{ {
try { 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); 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); return AjaxResult.success("获取成功",packNo);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
@ -196,10 +206,17 @@ public class EmisCommonController extends EmisBaseController
public AjaxResult getTmsGroupBatchNo() public AjaxResult getTmsGroupBatchNo()
{ {
try { try {
// TB24060318081202 String yyMMdd = "yyMMdd";
String DTF = "yyMMddHHmmss"; // 站点三字码
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); Long lockNo = redissonService.addAndGetLong(batchKey,1L);
String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0"); String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),2,"0");
return AjaxResult.success("获取成功",batchNo); return AjaxResult.success("获取成功",batchNo);