dnc导出还没测

yangys

2025-08-04 a7426b81b0bd5b4bb1ed68fd6ecb98f405def280

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java

@@ -1,20 +1,15 @@

package org.springblade.mdm.program.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.program.service.DncSendBackService;
import org.springblade.mdm.program.service.NcProgramExchangeService;
import org.springblade.mdm.program.service.DNCSendBackService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.ProgramExchangeStatQueryVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -33,8 +28,7 @@
@Slf4j
public class DncSendBackController {

   //private final DncSendBackService dncSendBackService;
   private final NcProgramExchangeService ncProgramExchangeService;
   private final DNCSendBackService dncSendBackService;
   /**
    * 上传DNC回传文件
    *
@@ -45,7 +39,7 @@
   @Operation(summary = "DNC回传文件导入，上传文件", description = "上传DNC回传文件,并返回解析结果")
   public R<List<DncSendBackData>> dncSendBackUpload(@RequestParam MultipartFile file) {
      try {
         return R.data(ncProgramExchangeService.dncSendBackUpload(file));
         return R.data(dncSendBackService.dncSendBackUpload(file));
      }catch (Exception e){
         log.error("导入错误",e);
         return R.fail(e.getMessage());
@@ -64,7 +58,7 @@
   @Operation(summary = "DNC回传数据入库", description = "入库，同时启动固化流程,入参为上传是解析的数据列表")
   public R<Void> dncSendBackAccept(@RequestParam String ids) {
      try {
         ncProgramExchangeService.dncFileAccept(ids);
         dncSendBackService.dncFileAccept(ids);
      }catch (Exception e){
         log.error("入库错误",e);
         return R.fail(e.getMessage());