From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 44fe885..14560d3 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -51,6 +51,48 @@
return R.ok(stockInventoryDtoIPage);
}
+ @GetMapping("/warnPage")
+ @Operation(summary = "搴撳瓨棰勮鍒嗛〉锛堝彲鐢ㄦ暟閲�<=棰勮鍊硷級")
+ public R warnPage(Page page, StockInventoryDto stockInventoryDto) {
+ stockInventoryDto.setWarnOnly(true);
+ return R.ok(stockInventoryService.pagestockInventory(page, stockInventoryDto));
+ }
+
+ @GetMapping("/warnExport")
+ @Operation(summary = "搴撳瓨棰勮瀵煎嚭")
+ public void warnExport(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
+ stockInventoryDto.setWarnOnly(true);
+ List<StockInventoryDto> list = stockInventoryService.pagestockInventory(new Page<>(1, -1), stockInventoryDto).getRecords();
+ List<StockInventoryExportData> exportList = new ArrayList<>();
+ for (StockInventoryDto item : list) {
+ StockInventoryExportData data = new StockInventoryExportData();
+ data.setProductName(item.getProductName());
+ data.setModel(item.getModel());
+ data.setUnit(item.getUnit());
+ data.setBatchNo(item.getBatchNo());
+ data.setQualifiedQuantity(item.getQualitity());
+ data.setWarnNum(item.getWarnNum());
+ data.setQualifiedLockedQuantity(item.getLockedQuantity());
+ data.setRemark(item.getRemark());
+ exportList.add(data);
+ }
+ ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
+ util.exportExcel(response, exportList, "搴撳瓨棰勮");
+ }
+
+ /**
+ * 鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�
+ * @param page
+ * @param stockInventoryDto
+ * @return
+ */
+ @GetMapping("/getBatchNoQty")
+ @Operation(summary = "鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�")
+ public R getBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.getBatchNoQty(page, stockInventoryDto);
+ return R.ok(stockInventoryDtoIPage);
+ }
+
@PostMapping("/addstockInventory")
@Operation(summary = "鏂板搴撳瓨")
public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
@@ -85,7 +127,7 @@
}
- @PostMapping("importStockInventory")
+ @PostMapping("/importStockInventory")
@Operation(summary = "瀵煎叆搴撳瓨")
public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
@@ -105,13 +147,13 @@
stockInventoryService.exportStockInventory(response, stockInventoryDto);
}
- @GetMapping("stockInventoryPage")
+ @GetMapping("/stockInventoryPage")
@Operation(summary = "搴撳瓨鎶ヨ〃鏌ヨ")
public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
}
- @GetMapping("stockInAndOutRecord")
+ @GetMapping("/stockInAndOutRecord")
@Operation(summary = "缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
@@ -128,7 +170,6 @@
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.thawStock(stockInventoryDto));
}
-
@GetMapping("/getByModelId")
@Operation(summary = "鏍规嵁浜у搧瑙勬牸ID鑾峰彇鍏ュ簱璁板綍")
--
Gitblit v1.9.3