From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作
---
src/main/java/com/whyc/controller/ProductBomController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductBomController.java b/src/main/java/com/whyc/controller/ProductBomController.java
index d1b66de..efc350d 100644
--- a/src/main/java/com/whyc/controller/ProductBomController.java
+++ b/src/main/java/com/whyc/controller/ProductBomController.java
@@ -13,10 +13,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
@Api(tags = "鍥剧焊绠＄悊")
@RestController
@@ -33,12 +30,12 @@
public Response searchCadDrawer(@RequestBody ProductBom productBom, @RequestParam int pageCurr, @RequestParam int pageSize){
return service.searchCadDrawer(productBom,pageCurr,pageSize);
}
-
+/*
@ApiOperation("鍥剧焊鏂囦欢鎵撳寘涓嬭浇")
@PostMapping("downloadCadDrawer")
- public void downloadCadDrawer(HttpServletRequest req, HttpServletResponse resp,@RequestBody ArrayList<String> pictureUrls){
- service.downloadCadDrawer(req,resp,pictureUrls);
- }
+ public void downloadCadDrawer(HttpServletRequest req, HttpServletResponse resp,@RequestBody List<ProductBom> boms){
+ service.downloadCadDrawer(req,resp,boms);
+ }*/
@ApiOperation(value = "鏍规嵁瀛愪欢code鑾峰彇鏈�缁堢殑淇℃伅")
@GetMapping("getBomBySubcode")
public Response getBomBySubcode(@RequestParam String scode){
@@ -56,16 +53,27 @@
return new Response().set(1,true,"璁板綍涓嬭浇鏃ュ織");
}
- @ApiOperation(tags = "浜у搧绠＄悊",value = "鑾峰彇鎵�鏈変骇鍝佷俊鎭�")
+ /* @ApiOperation(tags = "浜у搧绠＄悊",value = "鑾峰彇鎵�鏈変骇鍝佷俊鎭�")
@GetMapping("getAllBom")
- public Response getAllBom(){
- return service.getAllBom();
- }
+ public Response getAllBom( @RequestParam(required = false) String parentCode,@RequestParam(required = false) String parentName, @RequestParam(required = false) String parentModel, @RequestParam int pageCurr, @RequestParam int pageSize){
+ return service.getAllBom(parentCode,parentName,parentModel,pageCurr,pageSize);
+ }*/
- @ApiOperation(tags = "浜у搧绠＄悊",value = "浜у搧鎵撳寘涓嬭浇")
+ /*@ApiOperation(tags = "浜у搧绠＄悊",value = "鏍规嵁姣嶆枡鍨嬪彿鏌ヨ瀛愪欢淇℃伅鍙婃湁鏈�鏂扮増鏈叧鑱旂殑鏁ｈ浠朵俊鎭�")
+ @GetMapping("getSubByMaterialProduct")
+ public Response getSubByMaterialProduct(@RequestParam String parentModel){
+ return service.getSubByMaterialProduct(parentModel);
+ }*/
+
+ /*@ApiOperation(tags = "浜у搧绠＄悊",value = "浜у搧鎵撳寘涓嬭浇")
@GetMapping("downloadBom")
- public Response downloadBom(HttpServletRequest req, HttpServletResponse resp,@RequestParam String parentModel){
- return service.downloadBom(req,resp,parentModel);
+ public void downloadBom(HttpServletRequest req, HttpServletResponse resp,@RequestParam String parentModel){
+ service.downloadBom(req,resp,parentModel);
+ }*/
+ @ApiOperation(tags = "鏁ｈ浠剁鐞�",value = "鏌ヨ鎵�鏈変骇鍝佷腑娌℃湁涓庢寚瀹氭暎瑁呬欢鍏宠仈鐨勫瓙浠�")
+ @GetMapping("getAllSubWithOutMaterial")
+ public Response getAllSubWithOutMaterial(@RequestParam int materialId){
+ return service.getAllSubWithOutMaterial(materialId);
}
}
--
Gitblit v1.9.1