Browse Source

[feat] 生产管理

按照万材要求,生产管理制程明细新增导出功能,支持部分行和全部行导出,导出更多数据
新增导出所有和选择导出后端接口
新增 导出生产管理采购入库单明细方法
新增 根据制程明细单号数组查询制程明细集合方法
dev
liuxiaoxu 4 days ago
parent
commit
269f6b9791
  1. 19
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java
  2. 1
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java
  3. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java
  4. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java
  5. 9
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java
  6. 11
      ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml
  7. 61
      ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html

19
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java

@ -56,15 +56,30 @@ public class SysProcessCategoryController extends BaseController
*/
@RequiresPermissions("system:processCategory:export")
@Log(title = "制程类别明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@PostMapping("/exportAll")
@ResponseBody
public AjaxResult export(SysProcessCategory sysProcessCategory)
public AjaxResult exportAll(SysProcessCategory sysProcessCategory)
{
List<SysProcessCategory> list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory);
ExcelUtil<SysProcessCategory> util = new ExcelUtil<SysProcessCategory>(SysProcessCategory.class);
return util.exportExcel(list, "制程类别明细数据");
}
/**
* 导出制程类别明细列表
*/
@RequiresPermissions("system:processCategory:export")
@Log(title = "制程类别明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(@RequestBody String[] processCategoryIds)
{
List<SysProcessCategory> list = sysProcessCategoryService.selectSysProcessCategoryListByIds(processCategoryIds);
ExcelUtil<SysProcessCategory> util = new ExcelUtil<SysProcessCategory>(SysProcessCategory.class);
return util.exportExcel(list, "制程类别明细数据");
}
/**
* 新增制程类别明细
*/

1
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java

@ -22,6 +22,7 @@ public class SysProcessCategory extends BaseEntity
private String delFlag;
/** 制程类别id */
@Excel(name = "制程类别Id")
private String processCategoryId;
/** 制程类别编号 */

5
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java

@ -58,4 +58,9 @@ public interface SysProcessCategoryMapper
* @return 结果
*/
public int deleteSysProcessCategoryByIds(String[] ids);
/**
* 根据制程类别id集合查询制程类别集合
* */
List<SysProcessCategory> selectSysProcessCategoryListByIds(String[] processCategoryIds);
}

5
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java

@ -58,4 +58,9 @@ public interface ISysProcessCategoryService
* @return 结果
*/
public int deleteSysProcessCategoryById(Long processCategoryId);
/**
* 根据制程类别明细ID集合查询制程类别明细
* */
List<SysProcessCategory> selectSysProcessCategoryListByIds(String[] processCategoryIds);
}

9
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java

@ -51,6 +51,15 @@ public class SysProcessCategoryServiceImpl implements ISysProcessCategoryService
return sysProcessCategoryMapper.selectSysProcessCategoryList(sysProcessCategory);
}
/**
* 根据制程类别明细ID集合查询制程类别明细
* */
@Override
public List<SysProcessCategory> selectSysProcessCategoryListByIds(String[] processCategoryIds) {
return sysProcessCategoryMapper.selectSysProcessCategoryListByIds(processCategoryIds);
}
/**
* 新增制程类别明细
*

11
ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml

@ -37,7 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSysProcessCategoryVo"/>
where id = #{id}
</select>
<select id="selectSysProcessCategoryListByIds" parameterType="String" resultMap="SysProcessCategoryResult">
<include refid="selectSysProcessCategoryVo"/>
where process_category_id in
<foreach item="processCategoryId" collection="array" open="(" separator="," close=")">
#{processCategoryId}
</foreach>
</select>
<insert id="insertSysProcessCategory" parameterType="SysProcessCategory" useGeneratedKeys="true" keyProperty="processCategoryId">
insert into sys_process_category
<trim prefix="(" suffix=")" suffixOverrides=",">

61
ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html

@ -31,9 +31,9 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:processCategory:add">
<i class="fa fa-plus"></i> 添加
</a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:processCategory:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:processCategory:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@ -83,6 +83,61 @@
};
$.table.init(options);
});
// 导出
function exportExcel(formId) {
// $.table.set();
var processCategoryIdData = [];
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<selections.length;i++){
processCategoryIdData.push(selections[i].processCategoryId);
}
var processCategoryIds = JSON.stringify(processCategoryIdData);
// console.log(bomNos);
$.modal.loading("正在导出数据,请稍后...");
var config = {
url: prefix + '/export',
type: "post",
dataType: "json",
contentType: "application/json;charset=utf-8",
data: processCategoryIds,
success: function(result) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
$.modal.alertSuccess("导出成功!")
$.modal.closeLoading();
},
error: function (result){
$.modal.alertError(result.msg);
}
};
$.ajax(config)
});
}
};
</script>
</body>
</html>
Loading…
Cancel
Save