From ee624f296881c9cd2f896c857b8b3574828e898f Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 17 Feb 2025 15:53:55 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=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=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=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=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=AE=A1=E7=90=86=E5=B7=A5=E5=BA=8F=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=BA=8F=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8D=95=E5=8F=B7=E6=95=B0=E7=BB=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=98=8E=E7=BB=86=E9=9B=86=E5=90=88=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/domain/SysProcedure.java | 2 + .../system/mapper/SysProcedureMapper.java | 4 + .../system/service/ISysProcedureService.java | 4 + .../service/impl/SysProcedureServiceImpl.java | 9 ++ .../system/SysProcedureController.java | 20 +++- .../mapper/system/SysProcedureMapper.xml | 10 +- .../templates/system/procedure/procedure.html | 105 +++++++++--------- 7 files changed, 99 insertions(+), 55 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcedure.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcedure.java index f0f42533..d89b789d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcedure.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcedure.java @@ -24,9 +24,11 @@ public class SysProcedure extends BaseEntity private String delFlag; /** 生产设备型号 */ + @Excel(name = "生产设备型号") private String produceEquipModel; /** 工序id */ + @Excel(name = "工序id") private String procedureId; /** 工序编号 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcedureMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcedureMapper.java index 8eee379f..75621f32 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcedureMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcedureMapper.java @@ -61,4 +61,8 @@ public interface SysProcedureMapper */ int deleteSysProcedureByIds(String[] ids); + /** + * 根据id数据查询生产加工明细表 + * */ + List selectSysProcedureListByIds(String[] procedureIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcedureService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcedureService.java index 0e5b399c..0824d2c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcedureService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcedureService.java @@ -61,4 +61,8 @@ public interface ISysProcedureService public int deleteSysProcedureById(Long procedureId); + /** + * 根据id数据查询生产加工明细表 + * */ + List selectSysProcedureListByIds(String[] procedureIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcedureServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcedureServiceImpl.java index d038caf4..d8eec8c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcedureServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcedureServiceImpl.java @@ -51,6 +51,15 @@ public class SysProcedureServiceImpl implements ISysProcedureService return sysProcedureMapper.selectSysProcedureList(sysProcedure); } + /** + * + * 根据id数据查询生产加工明细表 + * */ + @Override + public List selectSysProcedureListByIds(String[] procedureIds) { + return sysProcedureMapper.selectSysProcedureListByIds(procedureIds); + } + /** * 新增生产加工工序明细 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java index ad566769..0f092d65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java @@ -62,12 +62,26 @@ public class SysProcedureController extends BaseController */ @RequiresPermissions("system:procedure:export") @Log(title = "生产加工工序明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(SysProcedure sysProcedure) + public AjaxResult exportAll(SysProcedure sysProcedure) { List list = sysProcedureService.selectSysProcedureList(sysProcedure); -// System.out.println("list----"+list); + ExcelUtil util = new ExcelUtil(SysProcedure.class); + return util.exportExcel(list, "生产加工工序明细数据"); + } + + + /** + * 导出全部生产加工工序明细列表 + */ + @RequiresPermissions("system:procedure:export") + @Log(title = "生产加工工序明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody String[] procedureIds) + { + List list = sysProcedureService.selectSysProcedureListByIds(procedureIds); ExcelUtil util = new ExcelUtil(SysProcedure.class); return util.exportExcel(list, "生产加工工序明细数据"); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProcedureMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProcedureMapper.xml index c3e27ddc..09875b30 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysProcedureMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProcedureMapper.xml @@ -44,7 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + insert into sys_procedure diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html index 6087ef72..a0c361c5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html @@ -15,14 +15,6 @@ -
  • @@ -31,14 +23,6 @@
    • -
  •  搜索  重置 @@ -52,9 +36,9 @@ 添加 - - - + + 导出 +
    @@ -111,40 +95,59 @@ }); - function exportSelectedExcel(){ - table.set(); - var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); - if (rows.length == 0) { - $.modal.alert("请至少选择一条记录"); - return; - } else { - // rows为选中行的id - // alert(rows); - $.modal.confirm("确定导出选中的" + rows.length + "条数据吗?", function() { - axios({ - url: prefix + '/exportSelected/'+rows, - method: 'POST', - responseType: 'blob' - }).then(response => { - const URL = window.URL.createObjectURL(response.data) - // 创建隐藏标签进行下载 - const tempLink = document.createElement('a') - tempLink.style.display = 'none' - tempLink.href = URL - let time = new Date().toLocaleString() - tempLink.setAttribute('download', time + "生产加工工序明细.xlsx") - if (typeof tempLink.download === 'undefined') { - tempLink.setAttribute('target', '_blank') - } - document.body.appendChild(tempLink) - tempLink.click() - document.body.removeChild(tempLink)// 移除dom元素 - window.URL.revokeObjectURL(URL)//释放内存 - }) - }) + // 导出 + function exportExcel(formId) { + // $.table.set(); + var procedureIdData = []; + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length === 0){ + $.modal.confirm("确定导出所有工序明细吗？", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $("#bootstrap-table").bootstrapTable('getOptions'); + var dataParam = $("#" + currentId).serializeArray(); + dataParam.push({ "name": "orderByColumn", "value": params.sortName }); + dataParam.push({ "name": "isAsc", "value": params.sortOrder }); + $.modal.loading("正在导出数据，请稍后..."); + $.post(prefix + '/exportAll', dataParam, function(result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + }else { + $.modal.confirm("确定导出选中的所有工序明细吗？", function () { + //·拼接单号 + for(let i=0;i