Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改机台Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-09-03 17:39:53 +08:00
parent 8192b19402
commit 3e82acd235
6 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machine/MachineMapper.java
+3 -1
View File
@@ -6,6 +6,7 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.module.system.controller.admin.machine.vo.MachinePageReqVO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;
import java.util.List;
@@ -51,7 +52,7 @@ public interface MachineMapper extends BaseMapperX<MachineDO> {
default MachineDO selectMachine(String name,Integer machineType,Long organId) {
default MachineDO selectMachineName(String name,Integer machineType,Long organId) {
return selectOne(new LambdaQueryWrapperX<MachineDO>()
.eq(MachineDO::getOrganId,organId)
.eq(MachineDO::getDeleted,false)
@@ -60,6 +61,7 @@ public interface MachineMapper extends BaseMapperX<MachineDO> {
}
MachineDO selectMachine(@Param("name") String name, @Param("machineType") Integer machineType, @Param("machineId") Long machineId, @Param("organId") Long organId);
default List<MachineDO> selectMachineList(Integer machineType,Long organId) {
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
+3 -1
View File
@@ -64,11 +64,13 @@ public interface MachineTemplateMapper extends BaseMapperX<MachineTemplateDO> {
default MachineTemplateDO selectMachineTemplate(String name,Integer machineType) {
default MachineTemplateDO selectMachineTemplateName(String name,Integer machineType) {
return selectOne(new LambdaQueryWrapperX<MachineTemplateDO>()
.eq(MachineTemplateDO::getDeleted,false)
.eq(MachineTemplateDO::getMachineType,machineType)
.eq(MachineTemplateDO::getName,name));
}
MachineTemplateDO selectMachineTemplate(@Param("name") String name,@Param("machineType") Integer machineType,@Param("id") Long id);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+4 -4
View File
@@ -97,7 +97,7 @@ public class MachineServiceImpl implements MachineService {
assert loginUser != null;
// 校验机台名称是否重复
MachineDO machine = machineMapper.selectMachine(createReqVO.getName(),createReqVO.getMachineType(), getUserOrganId());
MachineDO machine = machineMapper.selectMachineName(createReqVO.getName(),createReqVO.getMachineType(), getUserOrganId());
if(machine != null){
throw exception(MACHINE_NAME_ERROR);
}
@@ -215,7 +215,7 @@ public class MachineServiceImpl implements MachineService {
@Transactional(rollbackFor = Exception.class)
public void updateCutting(CuttingSaveReqVO updateReqVO) {
// 校验存在和判断机台名称是否重复
validateExists(updateReqVO.getId(),updateReqVO.getName(),updateReqVO.getMachineType());
validateExists(updateReqVO.getId(),updateReqVO.getName(),updateReqVO.getMachineType(),updateReqVO.getId());
// 更新
MachineDO updateObj = MachineConvert.convert(updateReqVO);
//MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
@@ -441,12 +441,12 @@ public class MachineServiceImpl implements MachineService {
// 校验机台是否存在和机台名称是否重复
private void validateExists(Long id,String name,Integer machineType) {
private void validateExists(Long id,String name,Integer machineType,Long machineId) {
MachineDO machineDO = machineMapper.selectById(id);
if (machineDO == null) {
throw exception(MACHINE_NOT_EXISTS);
}
MachineDO machine = machineMapper.selectMachine(name, machineType, getUserOrganId());
MachineDO machine = machineMapper.selectMachine(name, machineType,machineId, getUserOrganId());
if(machine != null){
throw exception(MACHINE_NAME_ERROR);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+43 -21
View File
@@ -122,13 +122,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
throw exception(THE_CURRENT_BRAND);
}
MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectById(reqVO.getId());
// 校验机台模板是否存在和名称是否重复
validateMachineTemplateExists(reqVO.getName(),reqVO.getMachineType(),reqVO.getId());
if(machineTemplateDO == null){
throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
}
validateMachineTemplate(reqVO.getName(),reqVO.getMachineType());
MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
@@ -506,14 +502,19 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
Integer autoLabelModel = advancedConfigsRef.get("autoLabelModel").asInt();
MachineTemplateDO labelingMachineTemplateDO = machineTemplateMapper.selectById(autoLabelModel);
MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder()
.machineType(labelingMachineTemplateDO.getMachineType())
.brandId(labelingMachineTemplateDO.getBrandId())
.setting(labelingMachineTemplateDO.getSetting())
.name("开料" + templateDO.getName() + "-贴标机")
.build();
if(labelingMachineTemplateDO != null) {
MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder()
.machineType(labelingMachineTemplateDO.getMachineType())
.brandId(labelingMachineTemplateDO.getBrandId())
.setting(labelingMachineTemplateDO.getSetting())
.name("开料" + templateDO.getName() + "-贴标机")
.build();
machineTemplateMapper.insert(labelingMachineDO);
}
machineTemplateMapper.insert(labelingMachineDO);
}
}
@@ -529,22 +530,43 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
Integer drillModel = cuttingModuleRef.get("drillModel").asInt();
MachineTemplateDO drillMachineTemplateDO = machineTemplateMapper.selectById(drillModel);
MachineTemplateDO drillMachineDO = MachineTemplateDO.builder()
.machineType(drillMachineTemplateDO.getMachineType())
.brandId(drillMachineTemplateDO.getBrandId())
.setting(drillMachineTemplateDO.getSetting())
.name("开料" + templateDO.getName() + "钻孔机")
.build();
if(drillMachineTemplateDO != null) {
machineTemplateMapper.insert(drillMachineDO);
MachineTemplateDO drillMachineDO = MachineTemplateDO.builder()
.machineType(drillMachineTemplateDO.getMachineType())
.brandId(drillMachineTemplateDO.getBrandId())
.setting(drillMachineTemplateDO.getSetting())
.name("开料" + templateDO.getName() + "钻孔机")
.build();
machineTemplateMapper.insert(drillMachineDO);
}
}
}
private void validateMachineTemplateExists(String name,Integer machineType,Long machineId) {
MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectById(machineId);
if(machineTemplateDO == null){
throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
}
MachineTemplateDO machineTemplate = machineTemplateMapper.selectMachineTemplate(name, machineType,machineId);
if(machineTemplate != null){
throw exception(MACHINETEMPLATE_NAME_ERROR);
}
}
private void validateMachineTemplate(String name,Integer machineType) {
MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachineTemplate(name, machineType);
MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachineTemplateName(name, machineType);
if(machineTemplateDO != null){
cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml
+12
View File
@@ -3,5 +3,17 @@
<mapper namespace="com.cf.imes.module.system.dal.mysql.machine.MachineMapper">
<select id="selectMachine" resultType="com.cf.imes.module.system.dal.dataobject.machine.MachineDO">
select *
from system_machine
where organ_id = #{organId}
and deleted = false
and machine_type = #{machineType}
and name = #{name}
and id != #{machineId};
</select>
</mapper>
cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
+17
View File
@@ -132,5 +132,22 @@
</where>
GROUP BY organId
</select>
<select id="selectMachineTemplate"
resultType="com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO">
select *
from system_machine_template
where deleted = false
and machine_type = #{machineType}
and name = #{name}
and id != #{id}
</select>
</mapper>