From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/controller/MaterialController.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialController.java b/src/main/java/com/whyc/controller/MaterialController.java
index 2604437..a6967d0 100644
--- a/src/main/java/com/whyc/controller/MaterialController.java
+++ b/src/main/java/com/whyc/controller/MaterialController.java
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -98,28 +99,15 @@
return service.updatePicOrDwg(file,material);
}
- /**
- * 1.bom瑙ｆ瀽鏃跺氨杩藉姞鐗瑰畾鐨�(浠�涔堟椂鍊欒拷鍔�? 瑙ｆ瀽杩囧悗,浠庣郴缁熸煡璇�,鍨嬪彿鐩稿悓绫诲埆涓嶅悓,鍒欏瀷鍙峰彉鏇�)
- * 绀轰緥:
- * 瀛樺湪 绫籄 鍨婣,
- * 杩藉姞 绫籄 鍨婣,鍒欏瀷鍙蜂笉鍙�,涔熶笉浼氶噸澶嶆坊鍔�
- * 杩藉姞 绫籅 鍨婣,鍒欏瀷鍙锋敼鍙�,妫�鏌ヤ篃涓嶄細琚幓閲�,鍏佽娣诲姞
- * 杩藉姞 绫籅 鍨婣,
- * 2.鐗╂枡鏂板
- * 蹇呴』鏂板绫诲埆
- * 3.淇鍘熸潵鏁版嵁涓彲浠ュ彉鏇寸殑閮ㄥ垎,涓嬮潰绀轰緥涓�1386鏃犳硶淇,涓嶅鐞�,鍥犱负涓�绉嶇墿鏂欏搴斾簡涓ょ绫诲埆,濉厖浠绘剰涓�绉嶄細瀵艰嚧璇В
- * material_id category
- * 1384 缁勮绫�
- * 1385 缁勮绫�
- * 1386 缁勮绫�
- * 1386 鍑鸿揣閰嶄欢绫�
- * 1387 缁勮绫�
- * @param sign 杈撳叆绠�鏄撶鍚�
- * @return
- */
- @GetMapping("fillCategory")
- public Response updateFillCategory(@RequestParam String sign){
- service.updateFillCategory(sign);
- return new Response().set(1,"瀹屾垚鐗╂枡绫诲埆鑷姩濉厖");
+ @PostMapping("checkNaming")
+ @ApiOperation("鍛藉悕瑙勮寖鏍￠獙")
+ public void checkNaming( HttpServletResponse response,@RequestParam MultipartFile file) throws IOException, InvalidFormatException {
+ service.checkNaming(file.getInputStream(),response);
+ }
+
+ @ApiOperation("鐗╂枡鎺ㄩ�佸脊绐椾娇鐢�")
+ @GetMapping("getMaterialDialog")
+ public Response getMaterialDialog(@RequestParam String subCode,@RequestParam String subName,@RequestParam String subModel) {
+ return service.getMaterialDialog(subCode,subName,subModel);
}
}
--
Gitblit v1.9.1