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

fix:拼单逻辑修改

Browse Source
This commit is contained in:
zhouz
2026-06-18 14:00:09 +08:00
parent b0a35eabf2
commit 50c79a58f4
1 changed files with 0 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java
View File

@@ -129,64 +129,6 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask {
BstIvtCutpointivt endPointObj = bcutpointivtService.getPintByAgvCode(endPoint, false);
TaskUtils.pointMaintenanceInventory(task, endPointObj, "2");
bcutpointivtService.updateById(endPointObj);
List<Deliverycachepointivt> list = deliverycachepointivtService.getAreaBCacheByConditionsAndNoTask(AreaBCachePointDto.builder()
.area(endPointObj.getProduct_area())
.location(endPointObj.getPoint_location())
.pointStatus("01")
.plan(endPointObj.getPlan()).build());
// 创建桁架任务
JSONObject trussTaskParam = new JSONObject();
if (ObjectUtil.isNotEmpty(task.getVehicle_code()) && ObjectUtil.isNotEmpty(task.getVehicle_code2())) {
if (list.size() < 2) {
log.info("原地等待，无可用架子...");
// 原地等待
// 分切计划状态修改02->03
// List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
// .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
// PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
// p.setStatus("03");
// TaskUtils.updateOptMessageBySlitterPlan(p);
// slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
// .in(PdmBiSlittingproductionplan::getQzzno, collect));
return;
}
Deliverycachepointivt d1 = list.get(0);
Deliverycachepointivt d2 = list.get(1);
// 四点
trussTaskParam.put("point_code1", endPointObj.getTruss_point_code1());
trussTaskParam.put("point_code2", d1.getPoint_code());
trussTaskParam.put("point_code3", endPointObj.getTruss_point_code2());
trussTaskParam.put("point_code4", d2.getPoint_code());
trussTaskParam.put("vehicle_code", task.getVehicle_code());
trussTaskParam.put("vehicle_code2", task.getVehicle_code2());
trussTaskParam.put("truss_type", "8");
trussTaskParam.put("task_type", SlitterEnum.TASK_TYPE.code("拆单桁架任务"));
trussTaskParam.put("product_area", endPointObj.getProduct_area());
trussDisassemblyCacheTask.createTask(trussTaskParam);
} else {
if (list.isEmpty()) {
log.info("原地等待，无可用架子...");
// 原地等待
// 分切计划状态修改02->03
// List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
// .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
// PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
// p.setStatus("03");
// TaskUtils.updateOptMessageBySlitterPlan(p);
// slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
// .in(PdmBiSlittingproductionplan::getQzzno, collect));
return;
}
// 两点
Deliverycachepointivt d1 = list.get(0);
trussTaskParam.put("point_code1", ObjectUtil.isNotEmpty(endPointObj.getQzz_no1())
? endPointObj.getTruss_point_code1() : endPointObj.getTruss_point_code2());
trussTaskParam.put("point_code2", d1.getPoint_code());
trussTaskParam.put("truss_type", "8");
trussTaskParam.put("task_type", SlitterEnum.TASK_TYPE.code("拆单桁架任务"));
trussTaskParam.put("product_area", endPointObj.getProduct_area());
trussDisassemblyCacheTask.createTask(trussTaskParam);
}
}
// 取消