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-03 18:46:41 +08:00
parent ccc46f2193
commit f4ee0d9aaa
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,11 +139,12 @@ public class EmisCommonController extends BaseController
public AjaxResult getPackNo() public AjaxResult getPackNo()
{ {
try { 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); 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); return AjaxResult.success("获取成功",packNo);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
@ -158,11 +159,12 @@ public class EmisCommonController extends BaseController
public AjaxResult getTmsGroupBatchNo() public AjaxResult getTmsGroupBatchNo()
{ {
try { 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); 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); return AjaxResult.success("获取成功",batchNo);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
@ -174,14 +176,17 @@ public class EmisCommonController extends BaseController
* 获取进仓单号 * 获取进仓单号
*/ */
@RequestMapping(value = "/getWareHouseInNo") @RequestMapping(value = "/getWareHouseInNo")
public AjaxResult getWareHouseInNo() public AjaxResult getWareHouseInNo(String simpleName)
{ {
try { try {
if(StringUtils.isEmpty(simpleName)){
simpleName="TL";
}
String YYMMDD = "yyMMdd"; String YYMMDD = "yyMMdd";
// TAN-7080-SMD-240603-01
String hbKey= "TAN-7080"+DateUtils.parseDateToStr(YYMMDD,new Date()); String hbKey= "TAN-7080-"+"-"+simpleName+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),4,"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();