mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

Browse Source
This commit is contained in:
lgh 2022-11-10 10:30:15 +08:00
commit 605cdb5aa0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
6.program/wms-core/src/main/java/com/mt/wms/core/utils/IDGenerator.java
View File

@ -11,10 +11,8 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap; import java.util.concurrent.TimeUnit;
import java.util.List;
import java.util.Map;
/** /**
* id生成器，使用redis自增接口实现 * id生成器，使用redis自增接口实现
@ -153,6 +151,12 @@ public class IDGenerator {
} }
if (!isEmpty(sequenceName)) { if (!isEmpty(sequenceName)) {
long sequence = gen(sequenceName); long sequence = gen(sequenceName);
//设置key有效期为当天,次日凌晨失效
Calendar curDate = Calendar.getInstance();
Calendar tomorrowDate = new GregorianCalendar(curDate.get(Calendar.YEAR), curDate.get(Calendar.MONTH), curDate.get(Calendar.DATE) + 1, 0, 0, 0);
int second = (int)(tomorrowDate.getTimeInMillis() - curDate.getTimeInMillis()) / 1000;
idGenerator.redisTemplate.opsForValue().set(KEY_PREFIX_SEQUENCE + sequenceName, sequence, second, TimeUnit.SECONDS);
idGenerator.redisTemplate.opsForValue().getOperations();
if (sequenceLength > 0) { if (sequenceLength > 0) {
if (sequenceLength > MAX_SEQUENCE_LENGTH) { if (sequenceLength > MAX_SEQUENCE_LENGTH) {
sequenceLength = MAX_SEQUENCE_LENGTH; sequenceLength = MAX_SEQUENCE_LENGTH;

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
View File

@ -1222,7 +1222,7 @@ public class AsynRunTaskService extends BaseService {
currTask.setStoveCode(stoveCode); currTask.setStoveCode(stoveCode);
currTaskServiceBiz.updateById(currTask); currTaskServiceBiz.updateById(currTask);
}else { }else {
logger.info(currTask.getId()+"任务为多步骤任务且第一步为清洗,不生产清洗炉炉号."); logger.info(currTask.getId()+"任务为多步骤任务且第一步为清洗,不生成洗炉炉号.");
} }
} }
/** /**