mdm.git - Gitblit

			@@ -34,8 +34,6 @@

			private final RuntimeService runtimeService;

			private final HistoryService historyService;
			private final TaskService taskService;
			private final IdentityService identityService;
			private final NodeDeptQueryService nodeDeptQueryService;
			private final NcNodeService ncNodeService;
			@@ -43,7 +41,7 @@
			private final FlowProgramFileService flowProgramFileService;
			private final ProduceDivisionService produceDivisionService;
			private final MachineService machineService;

			private final FlowCommonService flowCommonService;

			/**
			* 启动固化流程
			@@ -61,7 +59,7 @@
			private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
			Map<String, Object> vars = new HashMap<>();
			NcNode programPackage = this.ncNodeService.getById(nodeId);

			vars.put(FlowContants.NODE_ID,programPackage.getId());
			vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
			//机床型号
			//vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
			@@ -84,14 +82,16 @@
			vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

			vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
			/*

			ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
			vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
			vars.put(FlowContants.CHECKER,div.getCheckerId());
			vars.put(FlowContants.SENIOR,div.getSeniorId());
			vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());

			vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
			*/
			flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
			//ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
			vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));


			identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人