From e5cc807a611a078b1c152731ff7a07e765bbb9a5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 14:41:37 +0800
Subject: [PATCH] fix: 添加规格型号搜索
---
src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java b/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java
index efc98b7..da886ce 100644
--- a/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java
+++ b/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java
@@ -2,14 +2,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.consumables.dto.ConsumablesOutRecordDto;
import com.ruoyi.consumables.service.ConsumablesOutRecordService;
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.stock.dto.StockInRecordDto;
+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.*;
@@ -30,28 +34,41 @@
public class ConsumablesOutRecordController {
@Autowired
private ConsumablesOutRecordService consumablesUnInventoryDto;
+ @Autowired
+ private WeighbridgeDocGenerator weighbridgeDocGenerator;
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
- public AjaxResult listPage(Page page, ConsumablesOutRecordDto ConsumablesOutRecordDto) {
- IPage<ConsumablesOutRecordDto> result = consumablesUnInventoryDto.listPage(page, ConsumablesOutRecordDto);
+ public AjaxResult listPage(Page page, ConsumablesOutRecordDto consumablesOutRecordDto) {
+ IPage<ConsumablesOutRecordDto> result = consumablesUnInventoryDto.listPage(page, consumablesOutRecordDto);
return AjaxResult.success(result);
}
@PostMapping("")
@Log(title = "鍑哄簱绠＄悊-鏂板鍑哄簱", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody ConsumablesOutRecordDto ConsumablesOutRecordDto) {
- return AjaxResult.success(consumablesUnInventoryDto.add(ConsumablesOutRecordDto));
+ public AjaxResult add(@RequestBody ConsumablesOutRecordDto consumablesOutRecordDto) {
+ return AjaxResult.success(consumablesUnInventoryDto.add(consumablesOutRecordDto));
}
- @PutMapping("/{id}")
- @Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody ConsumablesOutRecordDto ConsumablesOutRecordDto) {
- return AjaxResult.success(consumablesUnInventoryDto.update(id, ConsumablesOutRecordDto));
+ @PostMapping("/editStockOut")
+ @PreAuthorize("@ss.hasPermi('c_dispatch_edit')")
+ @ApiOperation("缂栬緫鍑哄簱璁板綍")
+ public AjaxResult update(@RequestBody ConsumablesOutRecordDto consumablesOutRecordDto) {
+ if (consumablesOutRecordDto.getId() == null) {
+ return AjaxResult.error("鍑哄簱璁板綍ID涓嶈兘涓虹┖");
+ }
+ StockInRecordDto stockInRecordDto = new StockInRecordDto();
+ BeanUtils.copyProperties(consumablesOutRecordDto, stockInRecordDto);
+ stockInRecordDto.setStockInNum(consumablesOutRecordDto.getStockOutNum());
+ String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
+ consumablesOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
+ consumablesOutRecordDto.setStockOutNum(consumablesOutRecordDto.getQualitity());
+ return AjaxResult.success(consumablesUnInventoryDto.updateById(consumablesOutRecordDto));
}
@DeleteMapping("")
+ @PreAuthorize("@ss.hasPermi('c_dispatch_cancel')")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
@@ -62,8 +79,8 @@
@PostMapping("/exportConsumablesOutRecord")
@ApiOperation("瀵煎嚭鍑哄簱璁板綍")
- public void exportConsumablesOutRecord(HttpServletResponse response, ConsumablesOutRecordDto ConsumablesOutRecordDto) {
- consumablesUnInventoryDto.exportConsumablesOutRecord(response,ConsumablesOutRecordDto);
+ public void exportConsumablesOutRecord(HttpServletResponse response, ConsumablesOutRecordDto consumablesOutRecordDto) {
+ consumablesUnInventoryDto.exportConsumablesOutRecord(response,consumablesOutRecordDto);
}
}
--
Gitblit v1.9.3