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/StockOutRecordController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index bf8a619..f8ac279 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -7,11 +7,15 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
+import com.ruoyi.stock.word.WeighbridgeDocGenerator;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -22,13 +26,16 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-21 05:27:04
*/
+@Api(tags = "鍑哄簱")
@RestController
@RequestMapping("/stockOutRecord")
public class StockOutRecordController {
@Autowired
private StockOutRecordService stockOutRecordService;
+ @Autowired
+ private WeighbridgeDocGenerator weighbridgeDocGenerator;
- @GetMapping("/listPageByProduction")
+ @GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
@@ -42,13 +49,16 @@
return AjaxResult.success(stockOutRecordService.add(stockOutRecordDto));
}
- @PutMapping("/{id}")
- @Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
- return AjaxResult.success(stockOutRecordService.update(id, stockOutRecordDto));
+ @PostMapping("/editStockOut")
+ @PreAuthorize("@ss.hasPermi('dispatch_edit')")
+ @ApiOperation("缂栬緫鍑哄簱璁板綍")
+ public AjaxResult editStockOut(@RequestBody StockOutRecordDto stockOutRecordDto) {
+ return AjaxResult.success(stockOutRecordService.editStockOut(stockOutRecordDto));
+
}
@DeleteMapping("")
+ @PreAuthorize("@ss.hasPermi('dispatch_cancel')")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
@@ -56,4 +66,11 @@
}
return AjaxResult.success(stockOutRecordService.batchDelete(ids));
}
+
+ @PostMapping("/exportStockOutRecord")
+ @ApiOperation("瀵煎嚭鍑哄簱璁板綍")
+ public void exportStockOutRecord(HttpServletResponse response, StockOutRecordDto stockOutRecordDto) {
+ stockOutRecordService.exportStockOutRecord(response,stockOutRecordDto);
+ }
+
}
--
Gitblit v1.9.3