From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 98e9e39..c666f54 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -7,7 +7,6 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
-import com.ruoyi.stock.word.WeighbridgeDocGenerator;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +23,6 @@
public class StockInRecordController {
@Autowired
private StockInRecordService stockInRecordService;
- @Autowired
- private WeighbridgeDocGenerator weighbridgeDocGenerator;
-
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@@ -40,13 +36,7 @@
@PreAuthorize("@ss.hasPermi('receipt_edit')")
@ApiOperation("缂栬緫鍏ュ簱璁板綍")
public AjaxResult editStockInStock(@RequestBody StockInRecordDto stockInRecordDto) {
- if (stockInRecordDto.getId() == null) {
- return AjaxResult.error("鍏ュ簱璁板綍ID涓嶈兘涓虹┖");
- }
- stockInRecordDto.setStockInNum(stockInRecordDto.getNetWeight());
- String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
- stockInRecordDto.setWeighbridgeDocPath(absoluteDocPath);
- return AjaxResult.success(stockInRecordService.updateById(stockInRecordDto));
+ return AjaxResult.success(stockInRecordService.editStockInStock(stockInRecordDto));
}
@DeleteMapping("")
--
Gitblit v1.9.3