diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java index 370d2905..db27ea04 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java @@ -8,7 +8,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.erp.domain.ErpBom; import com.ruoyi.erp.domain.ErpMaterial; import com.ruoyi.erp.domain.ErpMaterialVo; import com.ruoyi.erp.mapper.ErpMaterialMapper; @@ -27,7 +26,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -103,11 +102,20 @@ public class ErpMaterialController extends BaseController @Log(title = "物料信息", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(ErpMaterialVo erpMaterialVo) - { - List list = erpMaterialMapper.selectErpMaterialList(erpMaterialVo); - ExcelUtil util = new ExcelUtil(ErpMaterialVo.class); - return util.exportExcel(list, "物料信息数据"); + public AjaxResult export(ErpMaterialVo erpMaterialVo, String ids) { + + if (StringUtils.isEmpty(ids)){ + List list = erpMaterialMapper.selectErpMaterialList(erpMaterialVo); + ExcelUtil util = new ExcelUtil<>(ErpMaterialVo.class); + return util.exportExcel(list, "物料信息数据"); + }else { + List erpMaterialList = erpMaterialService.selectErpMaterialByIds(ids); + System.out.println("list:"+erpMaterialList); + ExcelUtil util = new ExcelUtil<>(ErpMaterialVo.class); + + return util.exportExcel(erpMaterialList, "物料信息数据"); + + } } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 24424b2b..2ff610a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -29,7 +29,7 @@ public class ErpMaterial extends BaseEntity @Excel(name = "料号",sort = 1) private String materialNo; /** 物料名称 */ - @Excel(name = "物料名称",sort = 3) + @Excel(name = "物料名称",sort = 4) private String materialName; /** 审核状态 0-待审核 1-审核通过 2-审核拒绝*/ @@ -53,23 +53,23 @@ public class ErpMaterial extends BaseEntity /** 物料类型 */ private String materialType; /** 物料类型名称 */ - @Excel(name = "物料类型名称",sort = 4) + @Excel(name = "物料类型名称",sort = 5) private String materialTypeName; /** 加工方式 */ - @Excel(name = "加工方式",sort = 8,dictType = "processMethod") + @Excel(name = "加工方式",sort = 9,dictType = "processMethod") private String processMethod; /** 单位 */ - @Excel(name = "单位",sort = 5) + @Excel(name = "单位",sort = 6) private String unit; /** 品牌 */ - @Excel(name = "品牌",sort = 6) + @Excel(name = "品牌",sort = 7) private String brand; /** 描述 */ - @Excel(name = "描述",sort = 7) + @Excel(name = "描述",sort = 8) private String describe; /** 入库部门 */ @@ -102,6 +102,7 @@ public class ErpMaterial extends BaseEntity private Long photoAttachId; + /** 照片 */ private String photoUrl; private String fileIdStr; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java index 26762074..f0b16d32 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java @@ -30,6 +30,11 @@ public class ErpMaterialVo extends ErpMaterial { */ private String keyword; + /** + * 前端多选数据集合 + * */ + private String[] ids; + public String getApplyUserName() { return applyUserName; } @@ -102,6 +107,14 @@ public class ErpMaterialVo extends ErpMaterial { this.keyword = keyword; } + public String[] getIds() { + return ids; + } + + public void setIds(String[] ids) { + this.ids = ids; + } + @Override public String toString() { return "ErpMaterialVo{" + @@ -114,6 +127,7 @@ public class ErpMaterialVo extends ErpMaterial { ", todoUserId='" + todoUserId + '\'' + ", instanceTypeName='" + instanceTypeName + '\'' + ", keyword='" + keyword + '\'' + + ", keyword='" + ids + '\'' + "} " + super.toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java index 4a01844b..3431b774 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java @@ -93,4 +93,8 @@ public interface ErpMaterialMapper public int updateMaterialBomNo(ErpMaterial erpMaterial); ErpMaterialVo selectErpMaterialByMaterialNo(String materialNo); + /** + * 批量查找物料信息 + */ + List selectErpMaterialByIds(String[] ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java index a530f1f6..97740569 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java @@ -55,6 +55,14 @@ public interface IErpMaterialService */ public int deleteErpMaterialByIds(String ids); + /** + * 批量查找物料信息 + * + * @param ids 需要查找的数据ID + * @return 结果 + */ + public List selectErpMaterialByIds(String ids); + /** * 删除物料信息信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index e2c128f8..326511ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -247,6 +247,18 @@ public class ErpMaterialServiceImpl implements IErpMaterialService return erpMaterialMapper.deleteErpMaterialByIds(Convert.toStrArray(ids)); } + /** + * 批量查找物料信息 + * + * @param ids 需要查找的数据ID + * @return 结果 + */ + @Override + public List selectErpMaterialByIds(String ids) { + + return erpMaterialMapper.selectErpMaterialByIds(Convert.toStrArray(ids)); + } + /** * 删除物料信息信息 * diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml index b01fb245..d4d48d13 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml @@ -142,6 +142,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where erp.material_no = #{materialNo} + + + insert into erp_material diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html index 52a8d570..92fbc386 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html @@ -109,13 +109,7 @@ 技术团队配置 - - + 导出 @@ -274,89 +268,101 @@ aria-hidden="true">×

技术团队配置

-
-
-
- +
+ +
+
- +
-
- +
+
- +
- -
- + +
+
- +
-
- +
+
- +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
-
-
- -
- +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
@@ -498,7 +504,6 @@ removeUrl: prefix + "/remove", cancelUrl: prefix + "/cancel/{id}", restoreUrl: prefix + "/restore/{id}", - exportUrl: prefix + "/export", detailUrl: prefix + "/detail/{id}", modalName: "物料信息", fixedColumns: true, // 启用冻结列 @@ -1427,8 +1432,28 @@ $("input[name='director']").val(productItems[i].director); } }); - //技术团队选择赋值 + //导出数据 + function exportSelect() { + var ids = $.table.selectColumns("id"); + var dataParam = $("#formId").serializeArray(); + let tipMsg = "确定导出当前所有数据吗?"; + if ($.common.isNotEmpty(ids)) { + tipMsg = `确定导出当前勾选的 ${ids.length} 条数据吗?`; + dataParam.push({ "name": "ids", "value": ids }); + } + $.modal.loading("正在导出数据，请稍后..."); + $.modal.confirm(tipMsg, function () { + $.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