root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:春节放假问题修改

Browse Source
This commit is contained in:
ls
2025-02-08 13:43:41 +08:00
parent becdab82f9
commit 880df8de9e
7 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java
View File

@@ -101,6 +101,9 @@ public class InHotTrussTask extends AbstractTask {
SchBasePoint point = hotDjwList.get(0);
task.setPoint_code2(point.getPoint_code());
}
if (hotDjwList.size() == 0){
throw new BadRequestException("入烘箱没有找到存放母卷位置");
}
}
// todo: 需要烘烤，且是小卷，但是没有位置，需要将最快结束的烘箱组锁住
} else {
@@ -114,18 +117,17 @@ public class InHotTrussTask extends AbstractTask {
}
// 如果都没有位置, 就去未开启的烘箱的空位，也是区分大小卷
// todo: （有可能是待烘烤、也有可能是不需要烘烤做为暂存, 目前是判断未使用的点位，后期可能需要加字段）
if (ObjectUtil.isEmpty(task.getPoint_code2())) {
List<StIvtHotpointivt> notTaskHotOven = hotpointivtService.getNotTaskHotOven(order.getRoll_type(),
"0");
if (notTaskHotOven.size() == 0) {
throw new BadRequestException("未找到可用货位！");
}
// 代表是暂存
flag = "1";
StIvtHotpointivt stIvtHotpointivt = notTaskHotOven.get(0);
task.setPoint_code2(stIvtHotpointivt.getPoint_code());
}
// if (ObjectUtil.isEmpty(task.getPoint_code2())) {
// List<StIvtHotpointivt> notTaskHotOven = hotpointivtService.getNotTaskHotOven(order.getRoll_type(),
// "0");
//
// // 代表是暂存
// flag = "1";
// StIvtHotpointivt stIvtHotpointivt = notTaskHotOven.get(0);
// task.setPoint_code2(stIvtHotpointivt.getPoint_code());
// }
// 保存任务参数
requestObj.put("caching", flag);
task.setRequest_param(requestObj.toJSONString());

5
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java
View File

@@ -69,6 +69,11 @@ public class RawCallRollTrussTask extends AbstractTask {
if (endPoints.size() == 0) {
throw new BadRequestException("收卷辊出口查询失败！");
}
List<SchBaseTask> schBaseTasks = taskService.checkHaveTask(endPoints.get(0).getPoint_code());
if (schBaseTasks.size() > 0) {
throw new BadRequestException("已创建行架任务等待agv完成后再下生箔下料任务！");
}
// 获取点
SchBasePoint startPoint = startPoints.get(0);
SchBasePoint endPoint = endPoints.get(0);

10
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
View File

@@ -90,12 +90,20 @@ public class SlitterDownAGVTask extends AbstractTask {
.orElse(null);
task.setPoint_code1(requestObj.getString("device_code"));
// 查找终点，在内包间的区域找个空位.
// 校验acs点位信息与终点点位信息是否匹配
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bstIvtCutpointivtService.getAreaNotTaskPointByStatus("1",
"1", "0", "1");
if (areaEmptyNotTaskPoint.size() == 0) {
throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
}
BstIvtCutpointivt endPoint = areaEmptyNotTaskPoint.get(0);
BstIvtCutpointivt endPoint = null;
for (BstIvtCutpointivt bstIvtCutpointivt : areaEmptyNotTaskPoint) {
}
if (endPoint == null) {
throw new BadRequestException("请求搬运失败，缓存架没有匹配的位置！");
}
task.setPoint_code2(endPoint.getPoint_code());
// 设置气胀轴
task.setVehicle_code(currentUpPlan != null ? currentUpPlan.getQzzno() : "");