blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
@@ -27,4 +27,8 @@ * 工艺版次 */ public static final String CRAFT_EDITION = "craftEdition"; /** * 产品型号 */ public static final String PRODUCT_MODEL = "productModel"; } blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
@@ -1,7 +1,6 @@ package org.springblade.mdm.flow.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -10,16 +9,10 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.mdm.flow.entity.FlowProgramFile; import org.springblade.mdm.flow.service.ApproveRecordService; import org.springblade.mdm.flow.service.FlowProgramFileService; import org.springblade.mdm.flow.vo.ApproveRecordVO; import org.springblade.mdm.flow.vo.ProgramUploadVO; import org.springblade.mdm.flow.vo.TaskTraceVO; import org.springblade.mdm.program.service.NcProgramService; import org.springblade.mdm.program.service.ProcessProgRefService; import org.springblade.mdm.program.vo.NcNodeProgramQueryVO; import org.springblade.mdm.program.vo.NcProgramUploadVO; import org.springblade.mdm.program.vo.NcProgramVO; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -38,6 +38,8 @@ programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO))); programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION))); programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL))); programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO))); programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次 programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE))); blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -12,14 +12,10 @@ import org.springblade.core.oss.OssTemplate; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.IResultCode; import org.springblade.core.tool.api.ResultCode; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.NumberUtil; import org.springblade.mdm.flow.entity.FlowProgramFile; import org.springblade.mdm.flow.mapper.FlowProgramFileMapper; import org.springblade.mdm.flow.vo.ProgramUploadVO; import org.springblade.mdm.program.entity.NcProgram; import org.springblade.mdm.program.service.ProcessProgRefService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -27,8 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; /** * 流程程序处理，包括上传，查询展示 @@ -47,49 +41,27 @@ public void uploadFlowProgramFile(ProgramUploadVO uploadVO) { //Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId()); FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId()); checkFilenames(uploadVO.getFiles(),progProps); MultipartFile file = uploadVO.getFile(); checkFilename(file.getOriginalFilename(),progProps); String programName = getProgramName(progProps); for(MultipartFile file : uploadVO.getFiles()) { BladeFile bfile = ossTemplate.putFile(file); FlowProgramFile progFile = new FlowProgramFile(); progFile.setName(file.getOriginalFilename()); progFile.setOssName(bfile.getName()); progFile.setProcessInstanceId(uploadVO.getProcessInstanceId()); BladeFile bfile = ossTemplate.putFile(file); progFile.setProgramName(programName); FlowProgramFile progFile = new FlowProgramFile(); progFile.setName(file.getOriginalFilename()); progFile.setOssName(bfile.getName()); progFile.setProcessInstanceId(uploadVO.getProcessInstanceId()); save(progFile); } // //BladeFile bfile = ossTemplate.putFile(uploadVO.getFile()); //String link = bfile.getLink(); //保存profame /* NcProgram prog = new NcProgram(); prog.setCode(generageCode()); prog.setName(file.getOriginalFilename()); prog.setNcNodeId(uploadVO.getNodeId()); prog.setOssName(bfile.getName()); prog.setDrawingNo(uploadVO.getDrawingNo()); prog.setProcessEdition(uploadVO.getProcessEdition()); prog.setIsLastEdition(1); progFile.setProgramName(programName); */ save(progFile); } String getProgramName(FlowProgramProperties progProps){ return progProps.getDrawingNo()+"-"+progProps.getProcessNo(); } public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){ for (MultipartFile file : files){ checkFilename(file.getOriginalFilename(),programProperties); } } /** blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java
@@ -13,7 +13,7 @@ public class ProgramUploadVO { @Schema(description = "流程实例id") private String processInstanceId; @Schema(description = "文件集合") private MultipartFile[] files; @Schema(description = "文件") private MultipartFile file; } blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
@@ -17,7 +17,7 @@ @Schema(description = "设备编号") private String machineCode; @Schema(description = "设备编号") @Schema(description = "文件") private MultipartFile file; @Schema(description = "零组件号/图号")
