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-07-29 10:23:32 +08:00
parent 442a4c8ae2
commit 2310f79f43
10 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
View File

@@ -1248,7 +1248,7 @@ jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwi
jeecgboot-vue3/src/views/xslmes/mesXslDryingProcessSwitch/MesXslDryingProcessSwitch.api.ts
-- author:jiangxh---date:20260708--for: 【MES】烘胶流程开启（总开关+二次确认，不校验烘胶房日期） ---
-- author:xsl---date:20260720--for: <20><>APPԭ<50><D4AD><EFBFBD><EFBFBD><EFBFBD>ͼ졿<CDBC>ֳֶ˰<D6B6><CBB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ/<2F>ͼ<EFBFBD>/¼<><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD> ---
-- author:xsl---date:20260720--for: <20><>APPԭ<50><D4AD><EFBFBD><EFBFBD><EFBFBD>ͼ졿<CDBC>ֳֶ˰<D6B6><CBB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ/<2F>ͼ<EFBFBD>/¼<><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD><D3BF><EFBFBD>ҳ<EFBFBD><D2B3> ---
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslRawMaterialInspectAppScanVo.java
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRawMaterialInspectAppController.java
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslRawMaterialInspectRecordService.java
@@ -1257,3 +1257,10 @@ JeecgUniapp-master/src/service/xslmes/rawMaterialInspect.ts
JeecgUniapp-master/src/pages/rawMaterialInspect/rawMaterialInspect.vue
JeecgUniapp-master/src/pages/rawMaterialInspect/inspectResult.vue
JeecgUniapp-master/src/common/work.ts
-- author:jiangxh---date:20260728--for: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD>Ϊͬһ<CDAC>豸<EFBFBD><E8B1B8>Ψһ ---
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerConditionService.java
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerConditionServiceImpl.java
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerConditionController.java
jeecgboot-vue3/src/views/xslmes/mesXslMixerCondition/MesXslMixerCondition.api.ts
jeecgboot-vue3/src/views/xslmes/mesXslMixerCondition/MesXslMixerCondition.data.ts

36
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerConditionController.java
View File

@@ -110,31 +110,43 @@ public class MesXslMixerConditionController
return Result.OK(entity);
}
@Operation(summary = "校验条件名称是否重复")
@Operation(summary = "校验条件名称是否重复（同一设备下）")
@GetMapping("/checkConditionName")
public Result<String> checkConditionName(
@RequestParam(name = "conditionName", required = true) String conditionName,
@RequestParam(name = "equipmentId", required = false) String equipmentId,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(conditionName) || conditionName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
if (mesXslMixerConditionService.isConditionNameDuplicated(conditionName, dataId)) {
return Result.error("条件名称不能重复");
//update-begin---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称按设备唯一-----------
if (oConvertUtils.isEmpty(equipmentId) || equipmentId.trim().isEmpty()) {
return Result.OK("该值可用！");
}
if (mesXslMixerConditionService.isConditionNameDuplicated(conditionName, equipmentId, dataId)) {
return Result.error("同一设备下条件名称不能重复");
}
//update-end---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称按设备唯一-----------
return Result.OK("该值可用！");
}
@Operation(summary = "校验条件代码是否重复")
@Operation(summary = "校验条件代码是否重复（同一设备下）")
@GetMapping("/checkConditionCode")
public Result<String> checkConditionCode(
@RequestParam(name = "conditionCode", required = true) String conditionCode,
@RequestParam(name = "equipmentId", required = false) String equipmentId,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(conditionCode) || conditionCode.trim().isEmpty()) {
return Result.OK("该值可用！");
}
if (mesXslMixerConditionService.isConditionCodeDuplicated(conditionCode, dataId)) {
return Result.error("条件代码不能重复");
//update-begin---author:jiangxh ---date:20260728 for：【密炼机条件】条件代码按设备唯一-----------
if (oConvertUtils.isEmpty(equipmentId) || equipmentId.trim().isEmpty()) {
return Result.OK("该值可用！");
}
if (mesXslMixerConditionService.isConditionCodeDuplicated(conditionCode, equipmentId, dataId)) {
return Result.error("同一设备下条件代码不能重复");
}
//update-end---author:jiangxh ---date:20260728 for：【密炼机条件】条件代码按设备唯一-----------
return Result.OK("该值可用！");
}
@@ -153,16 +165,20 @@ public class MesXslMixerConditionController
return "条件名称不能为空";
}
model.setConditionName(model.getConditionName().trim());
if (mesXslMixerConditionService.isConditionNameDuplicated(model.getConditionName(), excludeId)) {
return "条件名称不能重复";
//update-begin---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
if (mesXslMixerConditionService.isConditionNameDuplicated(
model.getConditionName(), model.getEquipmentId(), excludeId)) {
return "同一设备下条件名称不能重复";
}
if (oConvertUtils.isEmpty(model.getConditionCode()) || StringUtils.isBlank(model.getConditionCode())) {
return "条件代码不能为空";
}
model.setConditionCode(model.getConditionCode().trim());
if (mesXslMixerConditionService.isConditionCodeDuplicated(model.getConditionCode(), excludeId)) {
return "条件代码不能重复";
if (mesXslMixerConditionService.isConditionCodeDuplicated(
model.getConditionCode(), model.getEquipmentId(), excludeId)) {
return "同一设备下条件代码不能重复";
}
//update-end---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
return null;
}
}

6
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerConditionService.java
View File

@@ -7,7 +7,9 @@ public interface IMesXslMixerConditionService extends IService<MesXslMixerCondit
void fillEquipmentName(MesXslMixerCondition model);
boolean isConditionNameDuplicated(String conditionName, String excludeId);
//update-begin---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
boolean isConditionNameDuplicated(String conditionName, String equipmentId, String excludeId);
boolean isConditionCodeDuplicated(String conditionCode, String excludeId);
boolean isConditionCodeDuplicated(String conditionCode, String equipmentId, String excludeId);
//update-end---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
}

18
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerConditionServiceImpl.java
View File

@@ -18,13 +18,16 @@ public class MesXslMixerConditionServiceImpl
@Autowired private MesXslEquipmentLedgerMapper equipmentLedgerMapper;
//update-begin---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
@Override
public boolean isConditionNameDuplicated(String conditionName, String excludeId) {
if (StringUtils.isBlank(conditionName)) {
public boolean isConditionNameDuplicated(String conditionName, String equipmentId, String excludeId) {
if (StringUtils.isBlank(conditionName) || StringUtils.isBlank(equipmentId)) {
return false;
}
LambdaQueryWrapper<MesXslMixerCondition> wrapper =
new LambdaQueryWrapper<MesXslMixerCondition>().eq(MesXslMixerCondition::getConditionName, conditionName.trim());
new LambdaQueryWrapper<MesXslMixerCondition>()
.eq(MesXslMixerCondition::getEquipmentId, equipmentId.trim())
.eq(MesXslMixerCondition::getConditionName, conditionName.trim());
if (StringUtils.isNotBlank(excludeId)) {
wrapper.ne(MesXslMixerCondition::getId, excludeId.trim());
}
@@ -32,17 +35,20 @@ public class MesXslMixerConditionServiceImpl
}
@Override
public boolean isConditionCodeDuplicated(String conditionCode, String excludeId) {
if (StringUtils.isBlank(conditionCode)) {
public boolean isConditionCodeDuplicated(String conditionCode, String equipmentId, String excludeId) {
if (StringUtils.isBlank(conditionCode) || StringUtils.isBlank(equipmentId)) {
return false;
}
LambdaQueryWrapper<MesXslMixerCondition> wrapper =
new LambdaQueryWrapper<MesXslMixerCondition>().eq(MesXslMixerCondition::getConditionCode, conditionCode.trim());
new LambdaQueryWrapper<MesXslMixerCondition>()
.eq(MesXslMixerCondition::getEquipmentId, equipmentId.trim())
.eq(MesXslMixerCondition::getConditionCode, conditionCode.trim());
if (StringUtils.isNotBlank(excludeId)) {
wrapper.ne(MesXslMixerCondition::getId, excludeId.trim());
}
return this.count(wrapper) > 0;
}
//update-end---author:jiangxh ---date:20260728 for：【密炼机条件】条件名称/代码按设备唯一-----------
@Override
public void fillEquipmentName(MesXslMixerCondition model) {