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

Compare commits

base: mt-ck:e3d17d19233c8a96240f84a0115557e7305d391b
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
...
compare: mt-ck:8b488b0f45ab82560d89179fcf4f8b3d11221cdd
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

3 Commits
e3d17d1923 ... 8b488b0f45

Author SHA1 Message Date
LGH
8b488b0f45 update: 
wcs任务状态记录
 2022-08-03 18:02:04 +08:00
LGH
1c0f610e52 Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-08-03 17:52:17 +08:00
LGH
95f1c30cad update: 
避让修改
 2022-08-03 17:51:57 +08:00
2 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

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

@ -165,7 +165,7 @@ public class AsynRunTaskService extends BaseService {
runTaskServiceBiz.updateById(runTask); runTaskServiceBiz.updateById(runTask);
currTask.setStatus(0); currTask.setStatus(0);
currTaskServiceBiz.updateById(currTask); currTaskServiceBiz.updateById(currTask);
logger.info(String.valueOf(status));
logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败===");
logger.info("任务 " + currTask.getTaskCode() + " 车辆从起点"+startPoint+"台到加工炉过程中失败。"); logger.info("任务 " + currTask.getTaskCode() + " 车辆从起点"+startPoint+"台到加工炉过程中失败。");
webSocketServer.sendtoAll("任务 " + currTask.getTaskCode() + " 车辆从起点"+startPoint+"台到加工炉过程中失败。"); webSocketServer.sendtoAll("任务 " + currTask.getTaskCode() + " 车辆从起点"+startPoint+"台到加工炉过程中失败。");
@ -264,6 +264,7 @@ public class AsynRunTaskService extends BaseService {
runTask.setStatus(3); runTask.setStatus(3);
runTask.setUpdateTime(LocalDateTime.now()); runTask.setUpdateTime(LocalDateTime.now());
runTaskServiceBiz.updateById(runTask); runTaskServiceBiz.updateById(runTask);
logger.info(String.valueOf(status));
logger.info("任务 " + currTask.getTaskCode() + " 车辆从缓存区到加工炉过程中失败。"); logger.info("任务 " + currTask.getTaskCode() + " 车辆从缓存区到加工炉过程中失败。");
logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败===");
// TODO: 2021/12/14 websocket推送到前端,小车管理界面添加一个重置小车状态的接口。 // TODO: 2021/12/14 websocket推送到前端,小车管理界面添加一个重置小车状态的接口。
@ -354,6 +355,7 @@ public class AsynRunTaskService extends BaseService {
runTask.setStatus(3); runTask.setStatus(3);
runTask.setUpdateTime(LocalDateTime.now()); runTask.setUpdateTime(LocalDateTime.now());
runTaskServiceBiz.updateById(runTask); runTaskServiceBiz.updateById(runTask);
logger.info(String.valueOf(status));
logger.info("任务 " + currTask.getTaskCode() + " 车辆从液压台到缓存区过程中失败。"); logger.info("任务 " + currTask.getTaskCode() + " 车辆从液压台到缓存区过程中失败。");
logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败==="); logger.info("===执行任务：" + currTaskId + " ，车辆搬运任务，车辆：" + vehicleId + " ，起点：" + startPoint + " ,终点：" + endPoint + "任务执行失败===");
webSocketServer.sendtoAll("任务 " + currTask.getTaskCode() + " 车辆从液压台到缓存区过程中失败。"); webSocketServer.sendtoAll("任务 " + currTask.getTaskCode() + " 车辆从液压台到缓存区过程中失败。");

4
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/TaskDistanceUtils.java
View File

@ -118,10 +118,10 @@ public class TaskDistanceUtils {
if (otherNowPosition>=minDistance&&otherNowPosition<=maxDistance){ if (otherNowPosition>=minDistance&&otherNowPosition<=maxDistance){
return true; return true;
}else { }else {
if (Math.abs(otherNowPosition-maxDistance)<4){ if (Math.abs(otherNowPosition-maxDistance)<2){
return true; return true;
} }
if (Math.abs(otherNowPosition-minDistance)<4){ if (Math.abs(otherNowPosition-minDistance)<2){
return true; return true;
} }
return false; return false;