From f45ba8d8e686efc508485e2b1d7ead4db271afb4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 18 Feb 2025 09:47:56 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=A7=94=E5=A4=96=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=A7=94=E5=A4=96=E7=AE=A1=E7=90=86=E5=A7=94=E5=A4=96?= =?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=A7=94?= =?UTF-8?q?=E5=A4=96=E7=AE=A1=E7=90=86=E5=A7=94=E5=A4=96=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutsourceProcessController.java | 33 ++++++++- .../ruoyi/system/domain/OutsourceProcess.java | 2 +- .../system/domain/Vo/OutsourceProcessVo.java | 67 ------------------- .../system/mapper/OutsourceProcessMapper.java | 5 ++ .../service/IOutsourceProcessService.java | 5 ++ .../impl/OutsourceProcessServiceImpl.java | 19 +++--- .../mapper/system/OutsourceProcessMapper.xml | 10 +++ .../outsource_process/outsource_process.html | 59 ++++++++++++++++ 8 files changed, 122 insertions(+), 78 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java index d31d35c1..d2f19005 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.OutsourceProcess; +import com.ruoyi.system.domain.SysSop; import com.ruoyi.system.service.IOutsourceProcessService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -56,16 +57,44 @@ public class OutsourceProcessController extends BaseController /** * 导出委外工序列表 */ +// @RequiresPermissions("system:outsource_process:export") +// @Log(title = "委外工序", businessType = BusinessType.EXPORT) +// @PostMapping("/exportAll") +// @ResponseBody +// public AjaxResult exportAll(OutsourceProcess outsourceProcess) +// { +// List list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess); +// ExcelUtil util = new ExcelUtil(OutsourceProcess.class); +// return util.exportExcel(list, "委外工序数据"); +// } + @RequiresPermissions("system:outsource_process:export") @Log(title = "委外工序", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(OutsourceProcess outsourceProcess) + public AjaxResult exportAll(OutsourceProcess outsourceProcess) { List list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess); ExcelUtil util = new ExcelUtil(OutsourceProcess.class); return util.exportExcel(list, "委外工序数据"); } + + + /** + * 导出委外工序列表 + */ + @RequiresPermissions("system:outsource_process:export") + @Log(title = "委外工序", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody String[] outsourceProcessCodes) + { + List list = outsourceProcessService.selectOutsourceProcessListByProcessCodes(outsourceProcessCodes); + ExcelUtil util = new ExcelUtil(OutsourceProcess.class); + return util.exportExcel(list, "委外工序数据"); + } + + /** * 表格细节视图 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java index 5a674b60..5e74e478 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceProcess.java @@ -72,7 +72,7 @@ public class OutsourceProcess extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("outsourceProcessId", getOutsourceProcessId()).append("outsourceProcessId", getOutsourceProcessId()) + .append("outsourceProcessId", getOutsourceProcessId()) .append("outsourceProcessCode", getOutsourceProcessCode()) .append("outsourceProcessName", getOutsourceProcessName()) .append("remark", getRemark()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java index de8b202d..a5692411 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/OutsourceProcessVo.java @@ -10,21 +10,6 @@ import java.util.List; public class OutsourceProcessVo extends OutsourceProcess { private static final long serialVersionUID = 1L; - /** 委外工序id */ -// @Excel(name = "委外工序id") - private Long outsourceProcessId; - - /** 委外工序ID */ - private String outsourceProcessCode; - - /** 委外工序编号 */ - private String outsourceProcessNo; - - /** 委外工序名称 */ - private String outsourceProcessName; - - private String remark; - private List weightSupplier; private List quantitySupplier; @@ -55,56 +40,4 @@ public class OutsourceProcessVo extends OutsourceProcess { this.areaSupplier = areaSupplier; } - - @Override - public Long getOutsourceProcessId() { - return outsourceProcessId; - } - - @Override - public void setOutsourceProcessId(Long outsourceProcessId) { - this.outsourceProcessId = outsourceProcessId; - } - - public String getOutsourceProcessCode() { - return outsourceProcessCode; - } - - public void setOutsourceProcessCode(String outsourceProcessCode) { - this.outsourceProcessCode = outsourceProcessCode; - } - - public void setOutsourceProcessNo(String outsourceProcessNo) - { - this.outsourceProcessNo = outsourceProcessNo; - } - - public String getOutsourceProcessNo() - { - return outsourceProcessNo; - } - - public void setOutsourceProcessName(String outsourceProcessName) - { - this.outsourceProcessName = outsourceProcessName; - } - - public String getOutsourceProcessName() - { - return outsourceProcessName; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("outsourceProcessId", getOutsourceProcessId()).append("outsourceProcessId", getOutsourceProcessId()) - .append("outsourceProcessCode", getOutsourceProcessCode()) - .append("outsourceProcessName", getOutsourceProcessName()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java index 7335f620..add2ede2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceProcessMapper.java @@ -92,4 +92,9 @@ public interface OutsourceProcessMapper * @param prefix 前面的：ZCGX年月日 */ public String findMaxRoundCode(@Param("prefix") String prefix); + + /** + * 根据委外工序编号数组查询委外工序 + * */ + List selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java index c9800a11..d885bb6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceProcessService.java @@ -81,4 +81,9 @@ public interface IOutsourceProcessService * @return 结果 */ public int deleteOutsourceProcessByOutsourceProcessId(Integer outsourceProcessId); + + /** + * 根据委外工序编号数组查询委外工序 + * */ + List selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java index 3acc2abb..bead66dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java @@ -64,17 +64,20 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService @Override public List selectOutsourceProcessList(OutsourceProcess outsourceProcess) { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - Page processList = (Page)outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess); - processList.setTotal(CollectionUtils.isEmpty(processList) ? 0 : processList.getTotal()); - processList.setPageNum(pageNum); - processList.setPageSize(pageSize); - return processList; + + return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess); } + /** + * 根据委外工序编号数组查询委外工序列表 + * */ + @Override + public List selectOutsourceProcessListByProcessCodes(String[] outsourceProcessCodes) { + List outsourceProcessList = outsourceProcessMapper.selectOutsourceProcessListByProcessCodes(outsourceProcessCodes); + return outsourceProcessList; + } + /** * 自动生成委外工序编号 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml index 8e63ad1e..3fb98e96 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml @@ -62,6 +62,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where outsource_process_no = #{outsourceProcessNo} + + + insert into outsource_process @@ -116,4 +125,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select max(substring(outsource_process_code,9)) from outsource_process WHERE outsource_process_code LIKE CONCAT(#{prefix}, '%') + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html index df66bbf1..82133c12 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html @@ -41,6 +41,9 @@ 添加 + + 导出 +
@@ -112,6 +115,62 @@ }; $.table.init(options); }); + + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var outsourceProcessCodeData = []; + 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 \ No newline at end of file