From 399e7d565f19f59a8da82277da8f3eab527c2c56 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 09 九月 2025 19:40:20 +0800
Subject: [PATCH] art: 上料接口，上下料查询接口
---
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
index b24ab65..9599a85 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
@@ -13,6 +13,7 @@
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
+import org.jeecg.modules.lsw.vo.MaterialInventoryVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,7 +46,7 @@
*/
@ApiOperation(value = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId") String materialId,
+ public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId", defaultValue = "null") String materialId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();
@@ -62,13 +63,20 @@
public Result<String> statisticsInventory(@RequestParam(name = "materialId") String materialId) {
//搴撳瓨缁熻鏁伴噺
List<MaterialInventoryStatisticsVO> list = lswMaterialInventoryService.statisticsInventory(materialId);
- if(CollectionUtil.isEmpty(list)){
+ if (CollectionUtil.isEmpty(list)) {
return Result.OK("0");
}
StringBuilder sb = new StringBuilder();
- for(MaterialInventoryStatisticsVO vo : list){
+ for (MaterialInventoryStatisticsVO vo : list) {
sb.append(vo.getWarehouseName()).append(": ").append(vo.getMaterialQuantity().stripTrailingZeros().toPlainString()).append(" | ");
}
return Result.OK(sb.toString());
}
+
+ @ApiOperation(value = "鐗╂枡搴撳瓨淇℃伅-鏍规嵁浜х嚎鏌ヨ搴撳瓨", notes = "鐗╂枡搴撳瓨淇℃伅-鏍规嵁浜х嚎鏌ヨ搴撳瓨")
+ @GetMapping(value = "/queryMaterialInventory")
+ public Result<List<MaterialInventoryVO>> queryMaterialInventory(@RequestParam(name = "factoryId") String factoryId) {
+ List<MaterialInventoryVO> list = lswMaterialInventoryService.queryMaterialInventory(factoryId);
+ return Result.OK(list);
+ }
}
--
Gitblit v1.9.3