From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index d635ad9..6b755bc 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -1,51 +1,18 @@
package com.ruoyi.production.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductProcessRouteItemDto;
-import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.service.ProductionProductMainService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.Arrays;
-
-@RequestMapping("productionProductMain")
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-04-21 03:55:52
+ */
@RestController
-@Api(value = "鐢熶骇鎶ュ伐")
+@RequestMapping("/productionProductMain")
public class ProductionProductMainController {
- @Autowired
- private ProductionProductMainService productionProductMainService;
-
- /**
- * 鎶ュ伐鏌ヨ
- * @param page
- * @param productionProductMainDto
- * @return
- */
- @GetMapping("listPage")
- public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
- return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
- }
-
- /**
- * 鎶ュ伐鏂板鏇存柊
- * @param productionProductMainDto
- * @return
- */
- @PostMapping("addProductMain")
- public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
- return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
- }
-
- @ApiOperation("鍒犻櫎鎶ュ伐")
- @DeleteMapping("/delete")
- @Transactional(rollbackFor = Exception.class)
- public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
- return R.ok(productionProductMainService.removeProductMain(productionProductMainDto));
- }
}
--
Gitblit v1.9.3