From 50c79a58f4519b801aa5a3a47e343a70c06588c6 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 18 Jun 2026 14:00:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8B=BC=E5=8D=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/SendDisassemblyAgvTask.java | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java index b71afc1d5..aa963255b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java @@ -129,64 +129,6 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask { BstIvtCutpointivt endPointObj = bcutpointivtService.getPintByAgvCode(endPoint, false); TaskUtils.pointMaintenanceInventory(task, endPointObj, "2"); bcutpointivtService.updateById(endPointObj); - List 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 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() -// .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 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() -// .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); - } } // 取消