huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-11-22 14:28:04 +08:00
parent d52d500701
commit 63f799e345
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youchain-system/src/main/java/com/youchain/RequestData/TransTask.java
View File

@ -13,7 +13,7 @@ public class TransTask {
String createTime; String createTime;
@ApiModelProperty(value ="点位",required = true,example = "点位") @ApiModelProperty(value ="点位",required = true,example = "点位")
String pointCode; String pointCode;
@ApiModelProperty(value ="任务类型",required = true,example = "任务类型（Cp_Off_Line成品下线、Fx_Off_Line返修下线、Fx_Back返修载具送回）") @ApiModelProperty(value ="任务类型",required = true,example = "任务类型（Cp_Off_Up成品上线、Cp_Off_Line成品下线、Fx_Off_Line返修下线）")
String taskType; String taskType;
} }

7
youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java
View File

@ -439,8 +439,9 @@ public class KMReServiceImpl implements KMReService {
pointService.freePoint(startPoint); pointService.freePoint(startPoint);
} }
//更新状态 agvTask.setStockCode(stock.getCode());
this.updateAgvTaskStatus(agvTask, stock, BizStatus.UP_CONTAINER); agvTask.setStatus(BizStatus.UP_CONTAINER);
agvTaskService.update(agvTask);
} }
@ -771,7 +772,7 @@ public class KMReServiceImpl implements KMReService {
private void updateAgvTaskStatus(AgvTask agvTask, Stock stock, String status) { private void updateAgvTaskStatus(AgvTask agvTask, Stock stock, String status) {
agvTask.setStockCode(stock.getCode()); agvTask.setStockCode(stock.getCode());
agvTask.setStatus(status); agvTask.setStatus(status);
agvTask.setStartTime(new Timestamp(new Date().getTime())); agvTask.setEndTime(new Timestamp(new Date().getTime()));
agvTaskService.update(agvTask); agvTaskService.update(agvTask);
} }
} }

23
youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java
View File

@ -155,7 +155,7 @@ public class MesServiceImpl implements MesService {
public void performTransportTask(TransTask transTask) { public void performTransportTask(TransTask transTask) {
switch (transTask.getTaskType()) { switch (transTask.getTaskType()) {
case BizStatus.Cp_Off_Up: case BizStatus.Cp_Off_Up:
moveCpOffUp();//呼叫空货架 moveCpOffUp(transTask.getPointCode());//呼叫空货架
break; break;
case BizStatus.Cp_Off_Line: case BizStatus.Cp_Off_Line:
moveCpOffLine(transTask);//送满货架 moveCpOffLine(transTask);//送满货架
@ -253,24 +253,19 @@ public class MesServiceImpl implements MesService {
return pickDetail; return pickDetail;
} }
private void moveCpOffUp() { private void moveCpOffUp(String pointCode) {
// 尝试从成品入库缓存区查询空车
List<Stock> emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKHCQ); // 如果成品入库缓存区没有空车，则从入库区查询
List<Stock> emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKQ);
if (emptyStockList.isEmpty()) { if (emptyStockList.isEmpty()) {
// 如果成品入库缓存区没有空车，则从入库区查询 throw new BadRequestException("成品入库区没有空车,请稍后再试!");
emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKQ);
if (emptyStockList.isEmpty()) {
throw new BadRequestException("成品入库区没有空车,请稍后再试!");
}
} }
Stock emptyStock = emptyStockList.get(0); Stock emptyStock = emptyStockList.get(0);
Point srcPoint = emptyStock.getPoint(); Point srcPoint = emptyStock.getPoint();
List<Point> endPointList = pointService.queryPoints(null, BaseStatus.FREE, BaseStatus.BOX, AreaNameDic.CPXXQ);
if (endPointList.isEmpty()) { Point endPoint = pointService.validatePoint(pointCode);//终点
throw new BadRequestException("成品下线区没有空闲点位,请稍后再试!");
}
Point endPoint = endPointList.get(0);
// 创建并下发任务 // 创建并下发任务
List<AgvTask> agvTaskList = agvTaskService.findRepeat(emptyStock.getCode()); List<AgvTask> agvTaskList = agvTaskService.findRepeat(emptyStock.getCode());
if (agvTaskList.isEmpty()) { if (agvTaskList.isEmpty()) {