Merge remote-tracking branch 'origin/master'

ccl-plm-java.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-  </component>
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>

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;
 }

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -354,10 +354,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         HashMap<String, Object> map = new HashMap<>();
         List<BomDetailEntity> 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<BomComponentVo> list= bomManagementMapper.queryBomComponent(bomDetailEntity.get(0));
         map.put("rows",list);
@@ -497,7 +497,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         HashMap<String, Object> map = new HashMap<>();
         List<RoutingDetailEntity> 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状态！");

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<AccessSiteData> 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<AccessSiteData> accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), form.getUsername());

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);
     }
 }

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 <![CDATA[ >= ]]> 0