From 04d778b74adfdbc3134b6d37cedc42d066b8cfb6 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 21 Feb 2025 09:18:15 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E8=A1=8C?= =?UTF-8?q?=E5=92=8C=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89=E5=92=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E5=88=B6?= =?UTF-8?q?=E7=A8=8B=E5=B7=A5=E5=BA=8F=E9=9B=86=E5=90=88=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=E6=98=8E?= =?UTF-8?q?=E7=BB=86=20=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=A4=9A=E4=BD=99=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8A=9B=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...QualityManufacturingProcessController.java | 22 ++++++++++--- .../QualityManufacturingProcessMapper.java | 5 +++ .../IQualityManufacturingProcessService.java | 5 +++ ...ualityManufacturingProcessServiceImpl.java | 10 ++++++ .../QualityManufacturingProcessMapper.xml | 9 ++++++ .../manufacturingProcess.html | 31 ++++++++++++++++++- 6 files changed, 77 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java index 842c62c6..8b4fc25a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java @@ -1,6 +1,10 @@ package com.ruoyi.quality.controller; import java.util.List; +import java.util.stream.Collectors; + +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.quality.domain.QualityOrder; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -57,11 +61,21 @@ public class QualityManufacturingProcessController extends BaseController @Log(title = "品质管理制程工序", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(QualityManufacturingProcess qualityManufacturingProcess) + public AjaxResult export(QualityManufacturingProcess qualityManufacturingProcess,String ids) { - List list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess); - ExcelUtil util = new ExcelUtil(QualityManufacturingProcess.class); - return util.exportExcel(list, "品质管理制程工序数据"); + + if(StringUtils.isEmpty(ids)){ + List list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess); + + ExcelUtil util = new ExcelUtil(QualityManufacturingProcess.class); + return util.exportExcel(list, "品质管理制程工序数据"); + }else{ + String[] manufacturingProcessIds = ids.split(","); + List list = qualityManufacturingProcessService.selectManufacturingProcessListByIds(manufacturingProcessIds); + ExcelUtil util = new ExcelUtil(QualityManufacturingProcess.class); + return util.exportExcel(list, "品质管理制程工序数据"); + } + } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java index cff33319..1cbde530 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java @@ -105,4 +105,9 @@ public interface QualityManufacturingProcessMapper * 查找与制程检验有关的制程工序通过制程工序名称 * */ QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName); + + /** + * 查找与制程检验有关的制程工序通过制程工序Id + * */ + List selectManufacturingProcessListByIds(String[] manufacturingProcessIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java index 725dbde3..e6b0b967 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java @@ -91,4 +91,9 @@ public interface IQualityManufacturingProcessService * 查找与制程检验有关的制程工序通过制程工序名称 * */ QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName); + + /** + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + List selectManufacturingProcessListByIds(String[] manufacturingProcessIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java index 3e077d69..062d1b50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java @@ -209,4 +209,14 @@ public class QualityManufacturingProcessServiceImpl implements IQualityManufactu return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByName(manufacturingProcessName); } + + + /** + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + @Override + public List selectManufacturingProcessListByIds(String[] manufacturingProcessIds) { + + return qualityManufacturingProcessMapper.selectManufacturingProcessListByIds(manufacturingProcessIds); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml index 7e0d5d67..4f4403ce 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml @@ -147,4 +147,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and manufacturing_process_autoid != #{manufacturingProcessAutoid} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html index 534921ff..f7f1522e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html +++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html @@ -49,6 +49,10 @@ 添加 + + 导出 + +
@@ -154,8 +158,33 @@ // 详情页面 function detail(manufacturingProcessAutoid){ var url = ctx+'quality/manufacturingProcess/detail/'+manufacturingProcessAutoid; - $.modal.open("制程工序详情",url); + $.modal.openFull("制程工序详情",url); + } + + + // 导出 + function exportExcel() { + var ids = $.table.selectColumns("warehouseStorageCode"); + var dataParam = $("#formId").serializeArray(); + + let tipMsg = "确定导出当前所有数据吗?"; + if ($.common.isNotEmpty(ids)) { + tipMsg = `确定导出 ${ids} 数据吗?`; + dataParam.push({ "name": "ids", "value": ids }); + } + $.modal.confirm(tipMsg, function () { + $.modal.loading("正在导出数据，请稍后..."); + $.post( prefix + "/export", dataParam, function (result) { + if (result.code === web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true; + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); } + \ No newline at end of file