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/ProductController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductController.java b/src/main/java/com/whyc/controller/ProductController.java
index a554e01..9d78ceb 100644
--- a/src/main/java/com/whyc/controller/ProductController.java
+++ b/src/main/java/com/whyc/controller/ProductController.java
@@ -47,9 +47,10 @@
@RequestParam(required = false) String parentName,
@RequestParam(required = false) String parentModel,
@RequestParam(required = false) String customCode,
+ @RequestParam(required = false) Integer enabled,
@RequestParam int pageCurr,
@RequestParam int pageSize){
- return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
+ return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,enabled,pageCurr,pageSize);
}
@ApiOperation(value = "鏌ヨ鍑烘墍鏈夌殑浜у搧鏃犲弬涓嶅垎椤碉紙浜у搧涓婁紶鐨勬槸鐢級",notes = "9.2淇敼鍚庝娇鐢�")
@@ -89,8 +90,8 @@
@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);
+ public Response getOriginalZip(@RequestParam String parentCode, @RequestParam String parentModel,@RequestParam(required = false) String customCode,@RequestParam int version){
+ return bomHistoryService.getOriginalZip(parentCode,parentModel,customCode,version);
}
@@ -107,7 +108,7 @@
return historyService.setpHistoryEnable(parentCode, customCode, version, enabled,reason,versionTime);
}
@PostMapping("zipParse")
- @ApiOperation(value = "zip瑙ｆ瀽",notes = "杩斿洖缁撴灉涓�,杩藉姞data3涓哄姣旂粨鏋�,涓簁ey-value闆嗗悎,key涓篸iffList,addList,deleteList")
+ @ApiOperation(value = "zip瑙ｆ瀽",notes = "杩斿洖缁撴灉涓�,杩藉姞data3涓哄姣旂粨鏋�,涓簁ey-value闆嗗悎,key涓篸iffList,addList,deleteList,diffDwgList")
public Response zipParse(@RequestParam("file") MultipartFile file,@RequestParam(required = false) String baseStr) throws IOException, InvalidFormatException {
//瑕佸仛瀵规瘮鐨勪骇鍝�,浼犲叆浜嗙墿鏂�(parent_code)鍜屽畾鍒惰〃鍗曞彿(custom_code)
Product baseProduct = (baseStr==null?null:ActionUtil.getGson().fromJson(baseStr, Product.class));
@@ -152,4 +153,10 @@
public Response getCompareProduct(){
return service.getCompareProduct();
}
+
+ @ApiOperation(value = "楠岃瘉姣嶆枡缂栫爜鏄惁瀛樺湪浜у搧涓�")
+ @GetMapping("judgeParentCode")
+ public Response judgeParentCode(@RequestParam String parentCode,@RequestParam(required = false) String customCode){
+ return service.judgeParentCode(parentCode,customCode);
+ }
}
--
Gitblit v1.9.1