From 66db1d15cf5d4b51a346a42b66f0505bd7f31ce0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 03 一月 2024 15:23:47 +0800
Subject: [PATCH] 解压

---
 src/main/java/com/whyc/controller/ProductController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/ProductController.java b/src/main/java/com/whyc/controller/ProductController.java
index a554e01..ab02189 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);
     }
 
 
@@ -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