From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/java/com/ruoyi/production/controller/ProductionPlanController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
index 6190a47..e736f1e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -14,6 +15,7 @@
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -53,6 +55,9 @@
if (productionPlanDto.getTotalAssignedQuantity() == null || productionPlanDto.getTotalAssignedQuantity().compareTo(BigDecimal.ZERO) <= 0) {
return R.fail("璇疯緭鍏ヤ笅鍙戞暟閲�");
}
+ if(productionPlanDto.getWorkshopId() == null){
+ throw new BaseException("璇烽�夋嫨杞﹂棿淇℃伅");
+ }
return R.ok(productionPlanService.combine(productionPlanDto));
}
@@ -85,10 +90,10 @@
excelUtil.importTemplateExcel(response, "涓荤敓浜ц鍒掑鍏ユā鏉�");
}
- @PostMapping("/import")
+ @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍏�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍏�", businessType = BusinessType.IMPORT)
- public R importProdData(@RequestParam("file") MultipartFile file) {
+ public R importProdData(@RequestPart("file") MultipartFile file) {
productionPlanService.importProdData(file);
return R.ok("瀵煎叆鎴愬姛");
}
@@ -96,8 +101,8 @@
@PostMapping("/export")
@Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍑�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍑�", businessType = BusinessType.EXPORT)
- public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
- productionPlanService.exportProdData(response, ids);
+ public void exportProdData(HttpServletResponse response, @RequestBody(required = false) ProductionPlanDto requestDto) {
+ productionPlanService.exportProdData(response, requestDto);
}
}
--
Gitblit v1.9.3