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/StockInRecordController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 94e4669..2b036e5 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockInRecordDto;
-import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,11 +33,30 @@
}
+ @GetMapping("/getById")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ鍏ュ簱璁板綍")
+ public AjaxResult getById(@RequestParam("id") Long id) {
+ if (id == null || id <= 0) {
+ return AjaxResult.error("鍙傛暟id涓嶈兘涓虹┖");
+ }
+ StockInRecordDto stockInRecordDto = stockInRecordService.selectByRecord(id);
+ if (stockInRecordDto == null) {
+ return AjaxResult.error("璁板綍涓嶅瓨鍦�");
+ }
+ return AjaxResult.success(stockInRecordDto);
+ }
+
+ @PostMapping("/updateStockInRecord")
+ @ApiOperation("鍏ュ簱璁板綍瀹℃牳")
+ public R updateStockInRecord(@RequestBody StockInRecordDto stockInRecordDto) {
+ return R.ok(stockInRecordService.updateStockInRecord(stockInRecordDto));
+ }
+
@DeleteMapping("")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
return AjaxResult.success(stockInRecordService.batchDelete(ids));
@@ -46,7 +65,7 @@
@PostMapping("/exportStockInRecord")
@ApiOperation("瀵煎嚭鍏ュ簱璁板綍")
public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
- stockInRecordService.exportStockInRecord(response,stockInRecordDto);
+ stockInRecordService.exportStockInRecord(response, stockInRecordDto);
}
}
--
Gitblit v1.9.3