From d88e0057c906d3aa2cef697cc96041c8d750a8da Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 15:11:09 +0800
Subject: [PATCH] material/getMaterialLimit 查询所有物料(分页，模糊查询) 修改带上关联关系和包含物料编码的产品
---
src/main/java/com/whyc/controller/MaterialController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialController.java b/src/main/java/com/whyc/controller/MaterialController.java
index 7da6c64..493682c 100644
--- a/src/main/java/com/whyc/controller/MaterialController.java
+++ b/src/main/java/com/whyc/controller/MaterialController.java
@@ -17,25 +17,26 @@
@Autowired
private MaterialService service;
- @ApiOperation(value = "鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭垎椤碉紙甯︿笂鍏宠仈鐨勫瓙浠朵俊鎭紝status鐘舵�佷笉鍋氬鐞�)锛�")
+ /*@ApiOperation(value = "鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭垎椤碉紙甯︿笂鍏宠仈鐨勫瓙浠朵俊鎭紝status鐘舵�佷笉鍋氬鐞�)锛�")
@GetMapping("getAllMaterial")
public Response getAllMaterial(@RequestParam(required = false) String category,@RequestParam(required = false) String subCode,@RequestParam(required = false) String subName, @RequestParam(required = false) String subModel,@RequestParam int pageCurr, @RequestParam int pageSize){
return service.getAllMaterial(category,subCode,subName,subModel,pageCurr,pageSize);
- }
- @ApiOperation(tags = "浜у搧绠＄悊",value = "鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭笉鍒嗛〉(涓嶅寘鍚鏈�鏂扮増鏈叧鑱旂殑鏁ｈ浠讹紝status=1鍙敤)")
+ }*/
+ /* @ApiOperation(tags = "浜у搧绠＄悊",value = "鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭笉鍒嗛〉(涓嶅寘鍚鏈�鏂扮増鏈叧鑱旂殑鏁ｈ浠讹紝status=1鍙敤)")
@GetMapping("getMaterialWithoutSub")
public Response getMaterialWithoutSub(@RequestParam String parentModel, @RequestParam String subName, @RequestParam int version){
return service.getMaterialWithoutSub(parentModel,subName,version);
- }
- @ApiOperation(value = "鍒犻櫎鏁ｈ浠讹紙灏嗘暎瑁呬欢鏍囪瘑涓轰笉鍙敤锛�")
+ }*/
+ /*@ApiOperation(value = "鍒犻櫎鏁ｈ浠讹紙灏嗘暎瑁呬欢鏍囪瘑涓轰笉鍙敤锛�")
@GetMapping("deleteMaterial")
public Response deleteMaterial(@RequestParam int id){
return service.deleteMaterial(id);
- }
+ }*/
@ApiOperation(value = "鏌ヨ鎵�鏈夌墿鏂�(鍒嗛〉锛屾ā绯婃煡璇�)",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("getMaterialLimit")
public Response getMaterialLimit(@RequestParam(required = false) String subCode,@RequestParam(required = false) String subName, @RequestParam(required = false) String subModel,@RequestParam int pageCurr, @RequestParam int pageSize){
return service.getMaterialLimit(subCode,subName,subModel,pageCurr,pageSize);
}
+
}
--
Gitblit v1.9.1