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

更新胶料编码为胶料别名，调整相关字段和描述，新增数据库字段以支持胶料信息补全

Browse Source
This commit is contained in:
geht
2026-05-20 16:12:38 +08:00
parent 1a4027086c
commit 9f37292eea
5 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslOpenMillParamController.java
View File

@@ -138,7 +138,7 @@ public class MesXslOpenMillParamController extends JeecgController<MesXslOpenMil
return "所选胶料不存在，请重新选择";
}
model.setMaterialName(material.getMaterialName());
model.setMaterialCode(material.getMaterialCode());
model.setMaterialCode(oConvertUtils.isEmpty(material.getAliasName()) ? "" : material.getAliasName());
String timeErr = validateTimeFields(model);
if (timeErr != null) {
return timeErr;

4
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslOpenMillParam.java
View File

@@ -39,8 +39,8 @@ public class MesXslOpenMillParam implements Serializable {
@Schema(description = "胶料名称冗余")
private String materialName;
@Excel(name = "胶料编码", width = 15)
@Schema(description = "胶料编码冗余")
@Excel(name = "胶料别名", width = 15)
@Schema(description = "胶料别名冗余（取自 mes_material.alias_name）")
private String materialCode;
@Excel(name = "R0进胶时间(秒)", width = 14)