From 24cb4c00895e93e3f54c6cc268ea2c44e17d1026 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 11 九月 2023 11:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/ProductBomHistoryController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductBomHistoryController.java b/src/main/java/com/whyc/controller/ProductBomHistoryController.java
index db1725b..e96ed4b 100644
--- a/src/main/java/com/whyc/controller/ProductBomHistoryController.java
+++ b/src/main/java/com/whyc/controller/ProductBomHistoryController.java
@@ -22,10 +22,31 @@
public Response getBomHistoryByPModelAndSName(@RequestParam String pmodel, @RequestParam String sname){
return service.getBomHistoryByPModelAndSName(pmodel,sname);
}
-
- /*@ApiOperation(tags="浜у搧绠＄悊",value = "鏌ヨ浜у搧鐨勬渶澶х増鏈俊鎭�")
- @GetMapping("getMaxBoom")
- public Response getMaxBoom(@RequestParam String parentCode,@RequestParam String parentName,@RequestParam String parentModel){
- return service.getMaxBoom(parentCode,parentName,parentModel);
+ /*
+ @ApiOperation(tags="浜у搧绠＄悊",value = "鏌ヨ鍏蜂綋鏌愪竴鐗堟湰浜у搧淇℃伅")
+ @GetMapping("getBoomByVersion")
+ public Response getBoomByVersion(@RequestParam String parentModel,@RequestParam int version){
+ return service.getBoomByVersion(parentModel,version);
}*/
+
+ /*
+ @ApiOperation(tags="浜у搧绠＄悊",value = "涓嬭浇鎸囧畾鐗堟湰鐨勪骇鍝�")
+ @GetMapping("downloaByVersion")
+ public void downloaByVersion(HttpServletRequest req, HttpServletResponse resp, @RequestParam String parentModel, @RequestParam int version){
+ service.downloaByVersion(req,resp,parentModel,version);
+ }*/
+
+ @GetMapping("compare")
+ @ApiOperation(value = "鐗堟湰瀵规瘮",notes = "preProductId:鏃х増鏈殑浜у搧id,productId:鏂扮増鏈殑浜у搧id;杩斿洖缁撴灉data,data2,data3鍒嗗埆瀵瑰簲diffList,addList,deleteList")
+ public Response compare(@RequestParam int preProductId,@RequestParam int productId){
+ return service.compare(preProductId,productId);
+ }
+
+
+ @ApiOperation("淇閫夐」鏌ヨ")
+ @GetMapping("fixItem")
+ public void getFixItem(){
+ service.getFixItem();
+ }
+
}
--
Gitblit v1.9.1