From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
index b4bf7dc..c531cd0 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
@@ -3,14 +3,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductionProductInputDto;
+import com.ruoyi.production.pojo.ProductionProductInput;
import com.ruoyi.production.service.ProductionProductInputService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
-@RequestMapping("productionProductInput")
+import java.util.List;
+
+@RequestMapping("/productionProductInput")
@RestController
@Api(value = "鐢熶骇鎶曞叆")
public class ProductionProductInputController {
@@ -18,8 +21,16 @@
@Autowired
private ProductionProductInputService productionProductInputService;
- @GetMapping("listPage")
+ @GetMapping("/listPage")
public R page(Page<ProductionProductInputDto> page, ProductionProductInputDto productionProductInputDto) {
return R.ok(productionProductInputService.listPageProductionProductInputDto(page, productionProductInputDto));
}
+
+
+ @ApiOperation(value = "閫�鏂�")
+ @PostMapping("/returnMaterial")
+ @Transactional(rollbackFor = Exception.class)
+ public R returnMaterial(@RequestBody List<ProductionProductInput> productionProductInput) {
+ return R.ok(productionProductInputService.returnMaterial(productionProductInput));
+ }
}
--
Gitblit v1.9.3