chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

胶料维护规则

Browse Source
This commit is contained in:
chenx
2026-06-02 16:32:10 +08:00
parent 3586f86ea6
commit 29efd6694f
10 changed files with 242 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesMaterialController.java
View File

@@ -33,8 +33,12 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
MesMaterial model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "onlySales", required = false) Integer onlySales,
HttpServletRequest req) {
QueryWrapper<MesMaterial> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
if (onlySales != null && onlySales == 1) {
queryWrapper.and(w -> w.isNull("material_phase").or().eq("material_phase", ""));
}
IPage<MesMaterial> pageList = mesMaterialService.page(new Page<>(pageNo, pageSize), queryWrapper);
return Result.OK(pageList);
}

2
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesMaterial.java
View File

@@ -74,6 +74,8 @@ public class MesMaterial implements Serializable {
@Excel(name = "胶料客户", width = 15, dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
@Dict(dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
private String customerId;
@Excel(name = "物料阶段", width = 12)
private String materialPhase;
@Excel(name = "使用状态", width = 10, replace = {"使用中_1", "停用_0"})
private Integer enableFlag;
@Excel(name = "是否为特种胶", width = 12, replace = {"是_1", "否_0"})