From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java |   68 ++++++++++++++++++++++++++++++++-
 1 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index 5a07915..9c18183 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -1,19 +1,22 @@
 package com.ruoyi.productionPlan.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 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.dto.ProductionPlanImportDto;
 import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
 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 org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -47,6 +50,41 @@
         return AjaxResult.success();
     }
 
+    @PostMapping("/combine")
+    @Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
+    @ApiOperation("鍚堝苟鐢熶骇璁″垝")
+    public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
+       if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+            return AjaxResult.error("璇烽�夋嫨瑕佷笅鍙戠殑鐢熶骇璁″垝");
+        }
+
+       if (productionPlanDto.getTotalAssignedQuantity() == null || productionPlanDto.getTotalAssignedQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+            return AjaxResult.error("璇疯緭鍏ヤ笅鍙戞暟閲�");
+        }
+        return AjaxResult.success(productionPlanService.combine(productionPlanDto));
+    }
+
+    @PostMapping("")
+    @Log(title = "鍒涘缓鐢熶骇璁″垝", businessType = BusinessType.INSERT)
+    @ApiOperation("鍒涘缓鐢熶骇璁″垝")
+    public AjaxResult add(@RequestBody ProductionPlanDto productionPlanDto) {
+        return AjaxResult.success(productionPlanService.add(productionPlanDto));
+    }
+
+    @PutMapping("")
+    @Log(title = "鏇存柊鐢熶骇璁″垝", businessType = BusinessType.UPDATE)
+    @ApiOperation("鏇存柊鐢熶骇璁″垝")
+    public AjaxResult update(@RequestBody ProductionPlanDto productionPlanDto) {
+        return AjaxResult.success(productionPlanService.update(productionPlanDto));
+    }
+
+    @DeleteMapping("")
+    @Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
+    @ApiOperation("鍒犻櫎鐢熶骇璁″垝")
+    public AjaxResult delete(@RequestBody List<Long> ids) {
+        return AjaxResult.success(productionPlanService.removeByIds(ids));
+    }
+
     @GetMapping("/summaryByProductType")
     @ApiOperation("鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺")
     @Log(title = "鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺", businessType = BusinessType.OTHER)
@@ -54,4 +92,28 @@
         List<ProductionPlanSummaryDto> list = productionPlanService.summaryByProductType(query);
         return AjaxResult.success(list);
     }
+
+    @PostMapping("/downloadTemplate")
+    @Log(title = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�", businessType = BusinessType.EXPORT)
+    @ApiOperation("涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
+        excelUtil.importTemplateExcel(response, "涓荤敓浜ц鍒掑鍏ユā鏉�");
+    }
+
+    @PostMapping("/import")
+    @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍏�")
+    @Log(title = "涓荤敓浜ц鍒掓暟鎹鍏�", businessType = BusinessType.IMPORT)
+    public AjaxResult importProdData(@RequestParam("file") MultipartFile file) {
+        productionPlanService.importProdData(file);
+        return AjaxResult.success("瀵煎叆鎴愬姛");
+    }
+
+    @PostMapping("/export")
+    @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍑�")
+    @Log(title = "涓荤敓浜ц鍒掓暟鎹鍑�", businessType = BusinessType.EXPORT)
+    public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
+        productionPlanService.exportProdData(response, ids);
+    }
+
 }

--
Gitblit v1.9.3