修复重复派工验证错误

yangys

2025-08-24 15de9d8c750fc2561285f09f415f0e361bd3a57d

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java

@@ -6,7 +6,9 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
@@ -17,11 +19,13 @@
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
import org.springblade.mdm.commons.service.ParamService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

@@ -35,6 +39,10 @@
   private MachineService service;
   @Autowired
   private MachineImportService machineImportService;
   @Autowired
   private ParamService paramService;
   @Autowired
   private OssTemplate ossTemplate;
   /**
    * 新增
    */
@@ -119,6 +127,25 @@
      ExcelUtil.export(response, "机床数据" + DateUtil.time(), "机床数据表", list, MachineExcel.class);
   }

   @Operation(summary = "下载机床导入模板", description = "下载机床导入模板")
   @GetMapping("/download-template")
   public void downloadTemplate(HttpServletResponse response) {
      String PARAMKEY = "MACHINE_TEMPLATE";

      try {
         String filename = "machinetemplate.xlsx";
         response.setHeader("Content-Disposition", "attachment; filename="+filename);
         response.setContentType("application/octet-stream");
         String ossName  = paramService.getParamValue(PARAMKEY,"");
         try(InputStream ins = ossTemplate.statFileStream(ossName);){
            IOUtils.copy(ins,response.getOutputStream());
         }

      } catch (Exception e) {
         log.error("导出分机床模板异常", e);
      }
   }

   @Operation(summary = "产生机床回传结构树", description = "产生机床回传结构树")
   @PostMapping("/gen-fileback-dirs")
   public R<Void> genFileBackDirs(@RequestParam Long id) {