blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -47,6 +47,7 @@ machine.setPollingHours(vo.getPollingHours()); machine.setProgSendDir(vo.getProgSendDir()); machine.setProgReceiveDir(vo.getProgReceiveDir()); machine.setStatus(vo.getStatus()); machine.setRemark(vo.getRemark()); return this.updateById(machine); blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
@@ -8,8 +8,9 @@ @Setter @Getter public class MachineVO extends BaseVO { @Schema(description = "机床代码/设备编码") private String code; @Schema(description = "机床型号") private String name; /** * 所属机床组code blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -54,12 +54,12 @@ String partNo = generatePartNo(startVO); vars.put("partNo",partNo); NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineMode()); NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode()); vars.put("curedNcProgram",curedNcProgram); //设置是否有固化程序标记 vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N"); String businessKey = "0";//业务表key identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
