From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index bd1f580..af1965b 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -1,7 +1,18 @@
package com.ruoyi.productionPlan.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.productionPlan.dto.ProductionPlanDto;
+import com.ruoyi.productionPlan.service.ProductionPlanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <br>
@@ -15,5 +26,21 @@
@RestController
@RequestMapping("/productionPlan")
+@Api(tags = "涓荤敓浜ц鍒�")
public class ProductionPlanController {
+ @Resource
+ private ProductionPlanService productionPlanService;
+
+ @GetMapping("/listPage")
+ @ApiOperation("鑾峰彇鐢熶骇璁″垝鍒楄〃")
+ public AjaxResult productionPlanListPage(Page page, ProductionPlanDto productionPlanDto) {
+ return AjaxResult.success(productionPlanService.listPage(page, productionPlanDto));
+ }
+
+ @GetMapping("/loadProdData")
+ @Log(title = "鎷夊彇閿�鍞敓浜ц鍒�", businessType = BusinessType.INSERT)
+ public AjaxResult loadProdData() {
+ productionPlanService.loadProdData();
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.9.3