From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 27ad046..76ac7c5 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -8,11 +8,15 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.stock.dto.FinishedProductTreeDto;
import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.execl.FinishedProductInventoryExportData;
+import com.ruoyi.stock.execl.NonFinishedProductInventoryExportData;
import com.ruoyi.stock.execl.StockInventoryExportData;
import com.ruoyi.stock.service.StockInventoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -46,6 +50,23 @@
return R.ok(stockInventoryDtoIPage);
}
+ /**
+ * 鏌ヨ鎴愬搧搴撳瓨鏍�
+ */
+ @ApiOperation("鏌ヨ鎴愬搧搴撳瓨鏍�")
+ @GetMapping("/finishedProductList")
+ public List<FinishedProductTreeDto> finishedProductList(StockInventoryDto stockInventoryDto) {
+ return stockInventoryService.finishedProductList(stockInventoryDto);
+ }
+
+
+ @GetMapping("/pageListCombinedStockInventory")
+ @Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+ public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+ return R.ok(stockInventoryDtoIPage);
+ }
+
@PostMapping("/addstockInventory")
@PreAuthorize("@ss.hasPermi('add:stockInventory')")
@ApiOperation("鏂板搴撳瓨")
@@ -68,22 +89,33 @@
@PostMapping("importStockInventory")
@ApiOperation("瀵煎叆搴撳瓨")
- public R importStockInventory(MultipartFile file) {
- return stockInventoryService.importStockInventory(file);
+ public R importStockInventory(MultipartFile file,
+ @RequestParam Integer productType) {
+ return stockInventoryService.importStockInventory(file, productType);
}
@Log(title = "涓嬭浇搴撳瓨瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/downloadStockInventory")
- public void downloadStockInventory(HttpServletResponse response) {
- List<StockInventoryExportData> list = new ArrayList<>();
- ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
- util.exportExcel(response, list, "搴撳瓨妯℃澘");
+ public void downloadStockInventory(HttpServletResponse response,
+ @RequestParam Integer productType) {
+ // productType: 1=鎴愬搧, 0=闈炴垚鍝�
+ if (productType == 1) {
+ List<FinishedProductInventoryExportData> list = new ArrayList<>();
+ ExcelUtil<FinishedProductInventoryExportData> util = new ExcelUtil<>(FinishedProductInventoryExportData.class);
+ util.exportExcel(response, list, "鎴愬搧搴撳瓨妯℃澘");
+ } else {
+ List<NonFinishedProductInventoryExportData> list = new ArrayList<>();
+ ExcelUtil<NonFinishedProductInventoryExportData> util = new ExcelUtil<>(NonFinishedProductInventoryExportData.class);
+ util.exportExcel(response, list, "闈炴垚鍝佸簱瀛樻ā鏉�");
+ }
}
@PostMapping("/exportStockInventory")
@ApiOperation("瀵煎嚭搴撳瓨")
- public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
- stockInventoryService.exportStockInventory(response, stockInventoryDto);
+ public void exportStockInventory(HttpServletResponse response,
+ StockInventoryDto stockInventoryDto,
+ @RequestParam Integer productType) {
+ stockInventoryService.exportStockInventory(response, stockInventoryDto, productType);
}
@GetMapping("stockInventoryPage")
--
Gitblit v1.9.3