diff --git a/ccl-plm-java.iml b/ccl-plm-java.iml deleted file mode 100644 index 3e869bbe..00000000 --- a/ccl-plm-java.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/spring/modules/part/vo/BomComponentVo.java b/src/main/java/com/spring/modules/part/vo/BomComponentVo.java index bdb01cc8..04e917c6 100644 --- a/src/main/java/com/spring/modules/part/vo/BomComponentVo.java +++ b/src/main/java/com/spring/modules/part/vo/BomComponentVo.java @@ -40,4 +40,6 @@ public class BomComponentVo extends BomComponentEntity { * */ private String partStatusDesc; + + private String ifHasPeifang; } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index d2da9475..cad39ee6 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -354,10 +354,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification HashMap map = new HashMap<>(); List bomDetailEntity=technicalSpecificationMapper.getBMBomDetail(inData); if(bomDetailEntity.size()>1){ - throw new RuntimeException("物料编码在物料视图view_Project_Part中有重复！请联系管理员"); + throw new RuntimeException("物料编码在物料视图view_Project_final_Part中有重复！请联系管理员"); } if(bomDetailEntity.size()==0){ - throw new RuntimeException("物料编码在物料视图view_Project_Part中查询不到！请联系管理员"); + throw new RuntimeException("物料BOM状态不为Buildable！请联系管理员"); } List list= bomManagementMapper.queryBomComponent(bomDetailEntity.get(0)); map.put("rows",list); @@ -497,7 +497,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification HashMap map = new HashMap<>(); List RoutingDetailEntity=technicalSpecificationMapper.getBMRouteDetail(data); if(RoutingDetailEntity.size()>1){ - throw new RuntimeException("物料编码在物料视图view_Project_Part中有重复！请联系管理员"); + throw new RuntimeException("物料Route状态不为Buildable！请联系管理员员"); } if(RoutingDetailEntity.size()==0){ throw new RuntimeException("未找到该物料编码的工艺路线或工艺路线不是Build状态！"); diff --git a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java index 2a76c67c..8be86dd9 100644 --- a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java @@ -87,13 +87,15 @@ public class SysLoginController extends AbstractController { user = sysUserService.queryByDomainControlAccount(form.getUsername()); //判断账号是否存在 if(null == user){ - return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207)); + // return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207)); + return R.error("账号不存在"); } //启用域控校验账号和密码 customerLdapUtils.CheckLdapAccountAndPassword(form.getUsername(), form.getPassword()); //账号锁定 if(user.getStatus() == 0){ - return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208)); + // return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208)); + return R.error("账号被锁定不允许登录"); } if(StringUtils.isEmpty(form.getType())) { List accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), user.getUsername()); @@ -105,11 +107,13 @@ public class SysLoginController extends AbstractController { user = sysUserService.queryByUserName(form.getUsername()); //账号不存在、密码错误 if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) { - return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207)); + // return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207)); + return R.error("账号不存在或者密码错误"); } //账号锁定 if(user.getStatus() == 0){ - return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208)); + // return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208)); + return R.error("账号被锁定不允许登录"); } if(StringUtils.isEmpty(form.getType())) { List accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), form.getUsername()); diff --git a/src/main/java/com/spring/modules/sys/service/impl/SysMsgServiceImpl.java b/src/main/java/com/spring/modules/sys/service/impl/SysMsgServiceImpl.java index 019def31..2386cb9c 100644 --- a/src/main/java/com/spring/modules/sys/service/impl/SysMsgServiceImpl.java +++ b/src/main/java/com/spring/modules/sys/service/impl/SysMsgServiceImpl.java @@ -25,6 +25,7 @@ public class SysMsgServiceImpl implements SysMsgService { private SysMsgDao sysMsgDao; @Override public String getLanguageMsg( String objectId) { + System.out.println(StringUtils.isEmpty(getUser().getLanguageDefault())?"cn":getUser().getLanguageDefault()); return sysMsgDao.getLanguageMsg(StringUtils.isEmpty(getUser().getLanguageDefault())?"cn":getUser().getLanguageDefault(), SysMsgConstant.OBJECT_TYPE, objectId); } } diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml index fb129b9a..abd38e38 100644 --- a/src/main/resources/mapper/part/BomManagementMapper.xml +++ b/src/main/resources/mapper/part/BomManagementMapper.xml @@ -220,7 +220,8 @@ a.line_sequence, a.consumption_item, b.part_status, - dbo.get_part_status_name(a.site, b.part_status) as partStatusDesc + dbo.get_part_status_name(a.site, b.part_status) as partStatusDesc, + dbo.get_ifHas_peifang( a.site,a.component_part) as ifHasPeifang FROM plm_bom_component as a left join part as b on a.site = b.site and a.component_part = b.part_no where a.site = #{site} and a.part_no = #{partNo} and a.bom_type = #{bomType} and a.eng_chg_level = #{engChgLevel} and a.alternative_no = #{alternativeNo} and a.qty_per_assembly = ]]> 0