物料产品详情隐藏型号

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9806 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -350,30 +350,60 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				prodInfo.setAttach(attach);
 			}
 		}
-		// 根据填写的标准器件库的信息进行关联判断
-		if (prodInfo.getPcmpcode() != null && prodInfo.getPbranden() != null && prodInfo.getKind() != null) {
-			List<Component> cmps = componentDao.findByCode(prodInfo.getPcmpcode());
-			if (!CollectionUtils.isEmpty(cmps)) {
-				for (Component cmp : cmps) {
-					if (cmp.getBrand().getNameEn().equals(prodInfo.getPbranden())
-							&& cmp.getKind().getNameCn().equals(prodInfo.getKind())) {// 匹配标准
-						prodInfo.setPbrand(cmp.getBrand().getNameCn());
-						prodInfo.setKinden(cmp.getKind().getNameEn());
-						prodInfo.setCmpUuId(cmp.getUuid());
-						prodInfo.setStandard(Constant.YES);
-						break;
-					} else {
-						prodInfo.setCmpUuId(null);
-						prodInfo.setStandard(Constant.NO);
+		if (prodInfo.getCmpCode() != null) {
+			prodInfo.setPcmpcode(prodInfo.getCmpCode());
+		}
+		if (prodInfo.getIsbusiness().equals(Constant.YES)) {// 如果有业务关系，导入的信息不能更改，采用下面的数据操作
+			// 根据填写的标准器件库的信息进行关联判断
+			if (prodInfo.getPcmpcode() != null && prodInfo.getPbranden() != null && prodInfo.getKind() != null) {
+				List<Component> cmps = componentDao.findByCode(prodInfo.getPcmpcode());
+				if (!CollectionUtils.isEmpty(cmps)) {
+					for (Component cmp : cmps) {
+						if (cmp.getBrand().getNameEn().equals(prodInfo.getPbranden())
+								&& cmp.getKind().getNameCn().equals(prodInfo.getKind())) {// 匹配标准
+							prodInfo.setPbrand(cmp.getBrand().getNameCn());
+							prodInfo.setKinden(cmp.getKind().getNameEn());
+							prodInfo.setCmpUuId(cmp.getUuid());
+							prodInfo.setStandard(Constant.YES);
+							break;
+						} else {
+							prodInfo.setCmpUuId(null);
+							prodInfo.setStandard(Constant.NO);
+						}
 					}
+				} else {
+					prodInfo.setCmpUuId(null);
+					prodInfo.setStandard(Constant.NO);
+				}
+			} else {
+				prodInfo.setCmpUuId(null);
+				prodInfo.setStandard(Constant.NO);
+			}
+		} else {// 没有业务关系，可以修改导入的产品的信息，标准的数据不进行操作
+			if (prodInfo.getCmpCode() != null && prodInfo.getBrand() != null && prodInfo.getTitle() != null) {
+				List<Component> cmps = componentDao.findByCode(prodInfo.getCmpCode());
+				if (!CollectionUtils.isEmpty(cmps)) {
+					for (Component cmp : cmps) {
+						if (cmp.getBrand().getNameEn().equals(prodInfo.getBrand())
+								&& cmp.getKind().getNameCn().equals(prodInfo.getTitle())) {// 匹配标准
+							prodInfo.setPbrand(cmp.getBrand().getNameCn());
+							prodInfo.setKinden(cmp.getKind().getNameEn());
+							prodInfo.setCmpUuId(cmp.getUuid());
+							prodInfo.setStandard(Constant.YES);
+							break;
+						} else {
+							prodInfo.setCmpUuId(null);
+							prodInfo.setStandard(Constant.NO);
+						}
+					}
+				} else {
+					prodInfo.setCmpUuId(null);
+					prodInfo.setStandard(Constant.NO);
 				}
 			} else {
 				prodInfo.setCmpUuId(null);
 				prodInfo.setStandard(Constant.NO);
 			}
-		} else {
-			prodInfo.setCmpUuId(null);
-			prodInfo.setStandard(Constant.NO);
 		}
 		productDao.save(prodInfo);
 		map.put("success", "更新成功");

src/main/webapp/resources/tpl/index/baseInfo/productDetail.html

@@ -185,8 +185,8 @@
                 <div class="col-md-2">状态：</div>
                 <div class="col-md-4">有效</div>
             </div>
-            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>标准信息</span></div>
-            <div class="pro-list-tab row">
+            <div class="com_title01 sty01" style="margin-bottom: 15px;" ng-if="prodInfo.isbusiness == 1"><span>标准信息</span></div>
+            <div class="pro-list-tab row" ng-if="prodInfo.isbusiness == 1">
                 <div class="col-md-2" style="padding-right: 0;">标准产品名称（类目）:</div>
                 <div class="col-md-4"> 
                 	<input type="text"  ng-model="prodInfo.kind" style="cursor: pointer;" required="true"
@@ -263,8 +263,8 @@
                     </div>
                 </dd> -->
             </dl>
-             <div class="com_title01" ng-if="matchresults.length > 0"><span>匹配结果</span></div>
-            <div id="order-detail-list">
+            <div class="com_title01" ng-if="matchresults.length > 0 && prodInfo.isbusiness == 1"><span>匹配结果</span></div>
+            <div id="order-detail-list" ng-if="matchresults.length > 0 && prodInfo.isbusiness == 1">
                 <table class="block table table-default table-striped table-hover" ng-if="matchresults.length > 0">
                        <thead>
                             <tr class="header">

src/main/webapp/resources/tpl/index/purc/productDetail.html

@@ -185,7 +185,7 @@
                 <div class="col-md-2">状态：</div>
                 <div class="col-md-4">有效</div>
             </div>
-            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>标准信息</span></div>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;" ng-if="prodInfo.isbusiness == 1"><span>标准信息</span></div>
             <div class="pro-list-tab row">
                 <div class="col-md-2" style="padding-right: 0;">标准产品名称（类目）:</div>
                 <div class="col-md-4"> 
@@ -263,8 +263,8 @@
                     </div>
                 </dd> -->
             </dl>
-             <div class="com_title01" ng-if="matchresults.length > 0"><span>匹配结果</span></div>
-            <div id="order-detail-list">
+             <div class="com_title01" ng-if="matchresults.length > 0 && prodInfo.isbusiness == 1"><span>匹配结果</span></div>
+            <div id="order-detail-list" ng-if="matchresults.length > 0 && prodInfo.isbusiness == 1">
                 <table class="block table table-default table-striped table-hover" ng-if="matchresults.length > 0">
                        <thead>
                             <tr class="header">