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

Compare commits

base: mt-ck:5aa655b2b048f07788febbc1fa967f914c8bc2c1
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
...
compare: mt-ck:f2de6a3a04c91348dc9e35596230bea4f994128d
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

2 Commits
5aa655b2b0 ... f2de6a3a04

Author SHA1 Message Date
LGH
f2de6a3a04 bug修改 2022-07-19 14:09:51 +08:00
LGH
1f7332fdbb logger打印信息修改,不打印用户信息 2022-07-19 12:24:30 +08:00
3 changed files with 9 additions and 3 deletions
Show Stats Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public class AsynRunTaskService extends BaseService {
//工业炉可用未满的情况下，调用车辆起点为提升台终点为工业炉 //工业炉可用未满的情况下，调用车辆起点为提升台终点为工业炉
@Async("asyncServiceExecutor") @Async("asyncServiceExecutor")
public void asynRunTask(Long currTaskId, Long vehicleId) throws IOException { public void asynRunTask(Long currTaskId, Long vehicleId) throws IOException, InterruptedException {
CurrTask currTask = currTaskServiceBiz.getById(currTaskId); CurrTask currTask = currTaskServiceBiz.getById(currTaskId);
VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId); VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId);
List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, currTask)); List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, currTask));
@ -103,7 +103,9 @@ public class AsynRunTaskService extends BaseService {
runTaskServiceBiz.save(runTask); runTaskServiceBiz.save(runTask);
//调用车辆填入起终点,得到车辆执行结果 //调用车辆填入起终点,得到车辆执行结果
Long startPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getStartPosition())).getCode(); Long startPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getStartPosition())).getCode();
Long endPoint = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getEndPosition())).getCode(); PointInfo pointInfo = pointInfoServiceBiz.getOne(new QueryWrapper<PointInfo>().eq(PointInfo.NOTE, runTask.getEndPosition()));
Long endPoint = pointInfo.getCode();
logger.info("加工炉: "+pointInfo.getName()+"可用未满,调用车辆: "+vehicleId+" 起点为提升台终点为工业炉");
Integer status = sendTaskToRgv(vehicleId, currTaskId, startPoint, endPoint, currTask.getPlcValue()); Integer status = sendTaskToRgv(vehicleId, currTaskId, startPoint, endPoint, currTask.getPlcValue());
logger.info(String.valueOf(status)); logger.info(String.valueOf(status));
//执行成功,托盘进炉 //执行成功,托盘进炉
@ -121,6 +123,8 @@ public class AsynRunTaskService extends BaseService {
currTask.setUpdateTime(LocalDateTime.now()); currTask.setUpdateTime(LocalDateTime.now());
currTask.setBeginTime(LocalDateTime.now()); currTask.setBeginTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask); currTaskServiceBiz.updateById(currTask);
//程序休眠10秒.防止进炉后允许入炉信号还没消失,就又发了下一个入炉任务.
Thread.sleep(10000);
//更新小车状态 //更新小车状态
vehicle.setStatus(0); vehicle.setStatus(0);
vehicleInfoServiceBiz.updateById(vehicle); vehicleInfoServiceBiz.updateById(vehicle);

1
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
View File

@ -559,6 +559,7 @@ public class ScheduledTask extends BaseService {
vehicleInfoServiceBiz.updateById(vehicleInfo); vehicleInfoServiceBiz.updateById(vehicleInfo);
asynRunTaskService.asynRunTaskForStockToKiln(inStockInfo.getId(), vehicleId); asynRunTaskService.asynRunTaskForStockToKiln(inStockInfo.getId(), vehicleId);
} }
logger.info("当前两辆车都不在线.无法发起任务!");
} }
} }
} }

3
6.program/wms-gateway/src/main/java/com/mt/wms/gateway/filter/GatewayFilter.java
View File

@ -107,7 +107,8 @@ public class GatewayFilter implements Filter {
if (r != null && r.ok()) { if (r != null && r.ok()) {
if (r.getData() != null) { if (r.getData() != null) {
log.info("loginUser={}", JSON.toJSONString(r.getData())); //不打印
//log.info("loginUser={}", JSON.toJSONString(r.getData()));
} }
chain.doFilter(request, response); chain.doFilter(request, response);
} else { } else {