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

设备部位新增

Browse Source
This commit is contained in:
jiangxh
2026-05-15 14:22:51 +08:00
parent e7654ef0f6
commit 504dced34b
7 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java
View File

@@ -195,8 +195,8 @@ public class MesXslEquipmentPartController extends JeecgController<MesXslEquipme
return Result.error("文件导入失败：第 " + rowNo + " 条部位代码【" + pc + "】不能重复（同租户未删除数据中已存在）");
}
if (row.getDeptName() != null) {
row.setDeptName(row.getDeptName().trim());
if (row.getPartName() != null) {
row.setPartName(row.getPartName().trim());
}
if (row.getPartDescription() != null) {
row.setPartDescription(row.getPartDescription().trim());
@@ -257,10 +257,10 @@ public class MesXslEquipmentPartController extends JeecgController<MesXslEquipme
return "部位代码不能重复";
}
if (oConvertUtils.isEmpty(model.getDeptName()) || model.getDeptName().trim().isEmpty()) {
return "部门名称不能为空";
if (oConvertUtils.isEmpty(model.getPartName()) || model.getPartName().trim().isEmpty()) {
return "部位名称不能为空";
}
model.setDeptName(model.getDeptName().trim());
model.setPartName(model.getPartName().trim());
String en = model.getEnableStatus();
if (en != null) {

6
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentPart.java
View File

@@ -37,9 +37,9 @@ public class MesXslEquipmentPart implements Serializable {
@Schema(description = "设备类别名称冗余展示")
private String equipmentCategoryName;
@Excel(name = "部门名称", width = 20)
@Schema(description = "部门名称")
private String deptName;
@Excel(name = "部位名称", width = 20)
@Schema(description = "部位名称")
private String partName;
@Excel(name = "部位代码", width = 16)
@Schema(description = "部位代码（同租户未删除数据中唯一）")