From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

---
 src/main/java/com/ruoyi/production/controller/ProductProcessController.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
new file mode 100644
index 0000000..cff0c60
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -0,0 +1,89 @@
+package com.ruoyi.production.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.device.pojo.DeviceRepair;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.oA.pojo.OaProject;
+import com.ruoyi.production.dto.ProductProcessDto;
+import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.service.impl.ProductProcessServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@Api(tags = "宸ュ簭")
+@RequestMapping("/productProcess")
+public class ProductProcessController extends BaseController {
+
+
+    @Autowired
+    private ProductProcessServiceImpl productProcessService;
+
+    @GetMapping("/listPage")
+    @Log(title = "宸ュ簭-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+    @ApiOperation("宸ュ簭-鍒嗛〉鏌ヨ")
+    public AjaxResult listPage(Page page, ProductProcessDto productProcessDto) {
+        IPage<ProductProcessDto> listPage = productProcessService.listPage(page, productProcessDto);
+        return AjaxResult.success(listPage);
+    }
+
+    @ApiModelProperty("鏂板宸ュ簭")
+    @PostMapping()
+    @Log(title = "鏂板", businessType = BusinessType.INSERT)
+    public AjaxResult add( @RequestBody ProductProcessDto productProcessDto) {
+        return productProcessService.add(productProcessDto);
+    }
+
+    @ApiOperation("鏇存柊宸ュ簭")
+    @Log(title = "淇敼", businessType = BusinessType.UPDATE)
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody ProductProcess productProcess) {
+        return AjaxResult.success(productProcessService.updateById(productProcess));
+    }
+
+    @ApiOperation("鍒犻櫎宸ュ簭")
+    @DeleteMapping("/batchDelete")
+    @Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
+    public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+    }
+
+    @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+    @GetMapping("/list")
+    public AjaxResult list() {
+        return AjaxResult.success(productProcessService.list());
+        }
+
+    /**
+     * 瀵煎叆宸ュ簭
+     */
+    @Log(title = "宸ュ簭", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        return productProcessService.importData(file);
+    }
+
+    @PostMapping("/downloadTemplate")
+    @Log(title = "宸ュ簭-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+    public void downloadTemplate(HttpServletResponse response) {
+        ExcelUtil<ProductProcess> util = new ExcelUtil<ProductProcess>(ProductProcess.class);
+        util.importTemplateExcel(response, "宸ュ簭妯℃澘");
+    }
+}

--
Gitblit v1.9.3