| | |
| | | import org.apache.commons.lang3.StringUtils; |
| | | import org.springblade.core.tool.api.R; |
| | | import org.springblade.core.tool.utils.DateUtil; |
| | | import org.springblade.mdm.basesetting.machine.entity.Machine; |
| | | import org.springblade.mdm.basesetting.machine.service.MachineService; |
| | | import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb; |
| | | import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService; |
| | | import org.springblade.mdm.flow.constants.FlowContants; |
| | | import org.springblade.mdm.flow.constants.FlowConstant; |
| | | import org.springblade.mdm.flow.entity.TaskDispatch; |
| | | import org.springblade.mdm.flow.excution.StartDispatcher; |
| | | import org.springblade.mdm.flow.service.TaskDispatchService; |
| | |
| | | private TaskDispatchService taskDispatchService; |
| | | @Autowired |
| | | private QinzheFgbService qinzheFgbService; |
| | | @Autowired |
| | | private MachineService machineService; |
| | | /** |
| | | * 新增 |
| | | */ |
| | |
| | | taskAssignVO.setCraftEdition(mesTaskVO.getRoutingVersion()); |
| | | taskAssignVO.setProcessEdition(mesTaskVO.getOperationVersion()); |
| | | taskAssignVO.setOperationId(mesTaskVO.getOperationId()); |
| | | taskAssignVO.setMachineCode(mesTaskVO.getEquipmentCode()); |
| | | |
| | | taskAssignVO.setEquipmentCode(mesTaskVO.getEquipmentCode()); |
| | | Machine machine = this.machineService.getByEquipmentCode(mesTaskVO.getEquipmentCode()); |
| | | if(machine != null) { |
| | | taskAssignVO.setMachineCode(machine.getCode()); |
| | | } |
| | | taskAssignVO.setMachineMode(mesTaskVO.getEquipmentModel()); |
| | | taskAssignVO.setDispatchBy(mesTaskVO.getDspatchBy()); |
| | | if (mesTaskVO.getProductModel() != null) { |
| | |
| | | } |
| | | |
| | | taskAssignVO.setTitle(taskAssignVO.getDrawingNo()+"-"+taskAssignVO.getProcessNo()+"-"+taskAssignVO.getProcessEdition()+"计划任务"); |
| | | taskAssignVO.setIsTempFlow(FlowContants.N); |
| | | taskAssignVO.setIsTempFlow(FlowConstant.N); |
| | | return taskAssignVO; |
| | | } |
| | | |
| | |
| | | if(StringUtils.isBlank(finishTaskVO.getOperationId())){ |
| | | errorList.add("工序唯一码不能为空"); |
| | | } |
| | | /* |
| | | if(StringUtils.isBlank(finishTaskVO.getInspector())){ |
| | | errorList.add("检验员不能为空"); |
| | | } |
| | | if(finishTaskVO.getAcruslEndEime() == null){ |
| | | if(finishTaskVO.getAcruslEndTime() == null){ |
| | | errorList.add("检验反馈时间不能为空"); |
| | | } |
| | | }*/ |
| | | return errorList; |
| | | |
| | | } |