From fc588c6e5ccac038cab378931d9bac3033e28f98 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 11:29:16 +0800
Subject: [PATCH] 增加产品型号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index 9134b8e..a5bb5b7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -1,15 +1,20 @@
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.vo.DncSendBackData;
+import org.springblade.mdm.program.vo.ProgramExchangeStatQueryVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,42 +27,40 @@
*/
@NonDS
@RestController
-@RequestMapping("/program")
+@RequestMapping("/program/dncsendback/")
@AllArgsConstructor
-@Tag(name = "DNC鍥炰紶绋嬪簭鎺ュ彛", description = "DNC鍥炰紶绋嬪簭鎺ュ彛")
+@Tag(name = "DNC瀵煎叆", description = "DNC瀵煎叆鎺ュ彛")
@Slf4j
public class DncSendBackController {
private final DncSendBackService dncSendBackService;
-
- /**
- * dnc鍥炰紶鏂囦欢瀵煎叆
- *
- * @param file 娴佺▼鏂囦欢
- */
- /*
- @PostMapping("dnc-sendback-upload")
- @ApiOperationSupport(order = 4)
- @Operation(summary = "dnc鍥炰紶鏂囦欢瀵煎叆", description = "dnc鍥炰紶鏂囦欢瀵煎叆")
- public R dncSendBackUpload(@RequestParam MultipartFile file) {
- boolean temp = Objects.requireNonNull(file.getOriginalFilename()).endsWith("pkg");
- temp = true;//涓存椂鏀捐
- return R.data(Kv.create().set("name", file.getOriginalFilename()).set("success", temp));
- }
- */
+ private final NcProgramExchangeService ncProgramExchangeService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
* @param file dnc绋嬪簭鎵撳寘鏂囦欢
*/
- @PostMapping("dnc-sendback-upload")
+ @PostMapping("upload")
@ApiOperationSupport(order = 1)
- @Operation(summary = "涓婁紶DNC鍥炰紶鏂囦欢", description = "浼犲叆鏂囦欢")
- public R<List<DncSendBackData>> dncSendBackUpload(@RequestParam MultipartFile file) {
- return R.data(dncSendBackService.dncSendBackUpload(file));
+ @Operation(summary = "DNC鍥炰紶鏂囦欢瀵煎叆锛屼笂浼犳枃浠�", description = "涓婁紶DNC鍥炰紶鏂囦欢")
+ public R<Void> dncSendBackUpload(@RequestParam MultipartFile file) {
+ try {
+ ncProgramExchangeService.dncSendBackUpload(file);
+ }catch (Exception e){
+ log.error("瀵煎叆閿欒",e);
+ return R.fail(e.getMessage());
+ }
+ return R.success();
}
- @PostMapping("dnc-sendback-accept")
+ @Operation(summary = "dnc鍥炰紶鏁版嵁鍒嗛〉", description = "dnc鍥炰紶鏁版嵁鍒嗛〉")
+ @GetMapping("/page")
+ public R<IPage<DncSendBackData>> page(Query query) {
+ IPage<DncSendBackData> pages = ncProgramExchangeService.dncSendBackPageQuery(query);
+ return R.data(pages);
+ }
+
+ @PostMapping("accept")
@ApiOperationSupport(order = 2)
@Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�")
public R<Void> dncSendBackAccept(@RequestParam String ids) {
--
Gitblit v1.9.3