From 93a16e3707b870856594e89b950174b64bb7d6cd Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 01 三月 2023 10:55:34 +0800
Subject: [PATCH] ecr提交前一步执行原文件存储
---
src/main/java/com/whyc/controller/ProductController.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductController.java b/src/main/java/com/whyc/controller/ProductController.java
index 72c41df..8bcf27a 100644
--- a/src/main/java/com/whyc/controller/ProductController.java
+++ b/src/main/java/com/whyc/controller/ProductController.java
@@ -14,7 +14,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.Date;
@Api(tags = "浜у搧绠＄悊")
@RestController
@@ -81,6 +80,18 @@
return bomHistoryService.getBomHistoryAndMaterial(productId,version);
}
+ @ApiOperation(value = "鍘嗗彶浜у搧淇℃伅鏌ョ湅锛堜骇鍝佷腑鏈�0120寮�澶寸殑鐗╂枡鍏跺疄鏄骇鍝侊紝鏌ョ湅浜у搧淇℃伅锛�",notes = "2.8淇敼鍚庝娇鐢紒锛侊紒鏆傛椂鏃犵敤锛侊紒锛侊紒")
+ @GetMapping("getBomHistoryAndMaterial_0120")
+ public Response getBomHistoryAndMaterial_0120( @RequestParam String parentCode, @RequestParam String parentName, @RequestParam String parentModel){
+ return bomHistoryService.getBomHistoryAndMaterial_0120(parentCode,parentName,parentModel);
+ }
+
+ @ApiOperation(value = "鏍规嵁浜у搧姣嶆枡鍨嬪彿锛屽畾鍒跺崟鍙凤紝鐗堟湰涓嬭浇鍘熷鍘嬬缉鍖呮枃浠�",notes = "11.17淇敼鍚庝娇鐢�")
+ @GetMapping("getOriginalZip")
+ public Response getOriginalZip( @RequestParam String parentModel,@RequestParam(required = false) String customCode,@RequestParam int version){
+ return bomHistoryService.getOriginalZip(parentModel,customCode,version);
+ }
+
@ApiOperation(value = "鍘嗗彶浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<涓嬭浇鐨勭増鏈�>)",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("downloadProductHistory")
@@ -101,6 +112,13 @@
return service.zipParse(file,baseProduct);
}
+ /**
+ * 杩欎釜鎺ュ彛鏄繘琛屼骇鍝佹柊澧�,浜у搧bom鏂板鐨勬帴鍙�.
+ * 鏂板鏂瑰紡鏈夊緢澶�,鏈夌洿鎺ヤ粠zip瑙ｆ瀽鏂板浜у搧,涔熷彲浠ュ熀浜庡師鏈変骇鍝佸鍒惰繘琛屽畾鍒剁瓑.闇�瑕佹敞鎰忓吋瀹�!
+ * @param product 浜у搧鏂板,bom鏂板,浜у搧鐗堟湰鏇存柊
+ * @return
+ * @throws IOException
+ */
@PostMapping
@ApiOperation(value = "鏂板",notes = "瑙ｆ瀽鏃惰繑鍥炵殑缁濆璺緞,闇�瑕佸洖浼犲埌瀛楁fileUrl")
public Response add(@RequestBody Product product) throws IOException {
@@ -112,4 +130,24 @@
public Response getLockedByProductId( @RequestParam int productId){
return service.getLockedByProductId(productId);
}
+
+ /*@GetMapping("manualUpdate")
+ @Transactional
+ public void manualUpdate(){
+ //material灞炴�ц浆绉诲埌bom鍜宐omHistory
+ bomHistoryService.updateMaterialField2BomHistory();
+ bomService.updateMaterialField2Bom();
+ }*/
+
+ @ApiOperation(tags = "鍙嶉绠＄悊",value = "鏌ヨ褰撳墠浣跨敤鐨勬墍鏈夌殑浜у搧")
+ @GetMapping("getFkProduct")
+ public Response getFkProduct(){
+ return service.getFkProduct();
+ }
+
+ @ApiOperation(value = "浜у搧瀵规瘮涓嬫媺閫変腑")
+ @GetMapping("getCompareProduct")
+ public Response getCompareProduct(){
+ return service.getCompareProduct();
+ }
}
--
Gitblit v1.9.1