opt:B1呼叫母卷判断第三个点是否存在任务,行架任务完成时,判断agv目的点是否已有母卷
This commit is contained in:
@@ -128,6 +128,9 @@ public class OutHotTask extends AbstractAcsTask {
|
||||
jo.put("product_area", cut_jo.getString("product_area"));
|
||||
jo.put("task_type", "010302");
|
||||
} else {
|
||||
if(ObjectUtil.isNotEmpty(cut_jo.getString("container_name"))){
|
||||
throw new BadRequestException("点位:"+cut_jo.getString("full_point_code")+"已存在母卷:"+cut_jo.getString("container_name")+"");
|
||||
}
|
||||
jo.put("point_code1", jsonTask.getString("point_code2"));
|
||||
jo.put("point_code2", cut_jo.getString("full_point_code"));
|
||||
jo.put("point_code3", cut_jo.getString("empty_point_code"));
|
||||
@@ -243,13 +246,19 @@ public class OutHotTask extends AbstractAcsTask {
|
||||
|
||||
String point_code1 = form.getString("point_code1");
|
||||
String point_code2 = form.getString("point_code2");
|
||||
String point_code3 = form.getString("point_code3");
|
||||
if (cutConveyorTask.isSingleTask(point_code1)) {
|
||||
throw new BadRequestException("点位:" + point_code1 + "存在未完成的任务!");
|
||||
}
|
||||
if (cutConveyorTask.isSingleTask(point_code2)) {
|
||||
throw new BadRequestException("点位:" + point_code2 + "存在未完成的任务!");
|
||||
}
|
||||
|
||||
//第三个点不空位时,判断是否存在任务
|
||||
if (ObjectUtil.isNotEmpty(point_code3)) {
|
||||
if (cutConveyorTask.isSingleTask(point_code3)) {
|
||||
throw new BadRequestException("点位:" + point_code3 + "存在未完成的任务!");
|
||||
}
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
|
||||
json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
|
||||
|
||||
Reference in New Issue
Block a user