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

opt: 卷号添加到任务里

Browse Source
This commit is contained in:
liyongde
2025-07-02 17:03:49 +08:00
parent 56285ab21c
commit a1d219ec6b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
View File

@@ -95,7 +95,7 @@ public class AutoSendAirShaftAgvTask {
} else { } else {
log.info("异常处理位无空位！"); log.info("异常处理位无空位！");
// 点位禁用 // 点位禁用
cutPoint.setRemark("计划状态已被改变！"); cutPoint.setRemark("找不到分切计划！");
cutPoint.setUpdate_time(DateUtil.now()); cutPoint.setUpdate_time(DateUtil.now());
bcutpointivtService.updateById(cutPoint); bcutpointivtService.updateById(cutPoint);
} }
@@ -154,6 +154,7 @@ public class AutoSendAirShaftAgvTask {
param.put("vehicle_code2", cutPoint.getQzz_no2()); param.put("vehicle_code2", cutPoint.getQzz_no2());
param.put("task_type", SlitterEnum.TASK_TYPE.code("送气胀轴到分切机任务")); param.put("task_type", SlitterEnum.TASK_TYPE.code("送气胀轴到分切机任务"));
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("containers", plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
sendAirShaftAgvTask.createTask(param); sendAirShaftAgvTask.createTask(param);
} else { } else {
throw new BadRequestException("系统繁忙，稍后在试!"); throw new BadRequestException("系统繁忙，稍后在试!");

5
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -668,6 +668,7 @@ public class SlitterServiceImpl implements SlitterService {
TaskUtils.updateOptMessageBySlitterPlan(plan); TaskUtils.updateOptMessageBySlitterPlan(plan);
}); });
// 创建任务 // 创建任务
taskParam.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
slitterDownTrussTask.createTask(taskParam); slitterDownTrussTask.createTask(taskParam);
slittingproductionplanService.updateBatchById(currentPlans); slittingproductionplanService.updateBatchById(currentPlans);
return res; return res;
@@ -742,6 +743,8 @@ public class SlitterServiceImpl implements SlitterService {
// 创建任务 // 创建任务
taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务"));
taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
taskParam.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
taskParam.put("u_containers", nextPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
slitterDownTrussTask.createTask(taskParam); slitterDownTrussTask.createTask(taskParam);
// 下来的分切计划修改状态：05 -> 06 // 下来的分切计划修改状态：05 -> 06
currentPlans.forEach(plan -> { currentPlans.forEach(plan -> {
@@ -1942,7 +1945,7 @@ public class SlitterServiceImpl implements SlitterService {
taskParam.put("empty_site", "0"); taskParam.put("empty_site", "0");
taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机上气胀轴")); taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机上气胀轴"));
taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
taskParam.put("u_containers", plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
// 创建任务 // 创建任务
upShaftTrussTask.createTask(taskParam); upShaftTrussTask.createTask(taskParam);
res.put("msg", containers); res.put("msg", containers);