|
@ -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.enums.WorkOrderStatusEnum; |
|
|
import org.nl.wms.sch.task_manage.task.AcsUtil; |
|
|
import org.nl.wms.sch.task_manage.task.AcsUtil; |
|
|
import org.nl.wms.sch.task_manage.task.core.TaskStatus; |
|
|
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.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Component; |
|
|
import org.springframework.stereotype.Component; |
|
|
|
|
|
|
|
@ -44,7 +45,7 @@ public abstract class AbstractTask { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ISchBasePointService pointService; |
|
|
private ISchBasePointService pointService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private IPdmBdWorkorderService workorderService; |
|
|
private IWorkorderService workorderService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private IMdBaseMaterialService materialService; |
|
|
private IMdBaseMaterialService materialService; |
|
|
|
|
|
|
|
@ -189,6 +190,16 @@ public abstract class AbstractTask { |
|
|
.eq(SchBasePoint::getPoint_code, apply_point_code)); |
|
|
.eq(SchBasePoint::getPoint_code, apply_point_code)); |
|
|
// 判断是否校验工单
|
|
|
// 判断是否校验工单
|
|
|
if (taskConfig.getIs_check_workorder()) { |
|
|
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<SchBasePoint>() |
|
|
/*SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>() |
|
|