From a6e6227728e9940a92bb1b0bd56274fc510c1c52 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Mon, 19 Aug 2024 15:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=87=BA=E5=BA=93=EF=BC=9A=E7=94=B3=E8=AF=B7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/task_manage/AbstractTask.java | 13 ++++++++++++- .../wms/sch/task_manage/task/tasks/YCLCKTask.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 831f9a0..930ce45 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -21,6 +21,7 @@ import org.nl.wms.sch.task_manage.enums.TaskDirectionEnum; import org.nl.wms.sch.task_manage.enums.WorkOrderStatusEnum; import org.nl.wms.sch.task_manage.task.AcsUtil; import org.nl.wms.sch.task_manage.task.core.TaskStatus; +import org.nl.wms.sch.workorder.service.IWorkorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -44,7 +45,7 @@ public abstract class AbstractTask { @Autowired private ISchBasePointService pointService; @Autowired - private IPdmBdWorkorderService workorderService; + private IWorkorderService workorderService; @Autowired private IMdBaseMaterialService materialService; @@ -189,6 +190,16 @@ public abstract class AbstractTask { .eq(SchBasePoint::getPoint_code, apply_point_code)); // 判断是否校验工单 if (taskConfig.getIs_check_workorder()) { + //如果点位上没货 + if(ObjectUtil.isNotEmpty(pointObj.getVehicle_code2())) { + throw new BadRequestException("点位:" + apply_point_code+ "上无托盘信息!"); + } + //设置载具信息 + param.put("vehicle_code2",pointObj.getVehicle_code2()); + param.put("vehicle_code",pointObj.getVehicle_code()); + //更新对应载具工单状态为已生成任务，不可在工单页面取消 + //pdm_bd_workorder_two任务生成时，status改为2 + workorderService.update(pointObj.getVehicle_code2(),"2"); // 校验工单 // 根据对接位的父点位编码(设备)找到工单设备 /*SchBasePoint one = pointService.getOne(new LambdaQueryWrapper() diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 375ebc5..f173c93 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -319,7 +319,7 @@ public class YCLCKTask extends AbstractTask { taskObj.setRemark("任务取消"); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); String vehicleCode2 = taskObj.getVehicle_code2(); - //pdm_bd_workorder_two任务完成时，status改为3 + //pdm_bd_workorder_two任务取消时，status改为1 if(ObjectUtil.isNotEmpty(vehicleCode2)){ workorderService.update(vehicleCode2,"1"); }