更新批量更新物料信息方法

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

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

@@ -169,7 +169,7 @@ public class ProductServiceImpl implements ProductService {
 
 	@Override
 	public List<Product> getBrands() {
-		String sql = "select distinct p.pr_brand brand from products p where pr_enuu = "
+		String sql = "select distinct p.pr_brand brand from products p where p.pr_cmpuuid is null and p.pr_enuu = "
 				+ SystemSession.getUser().getEnterprise().getUu();
 		List<Product> products = commonDao.query(sql, Product.class);
 		return products;
@@ -177,7 +177,7 @@ public class ProductServiceImpl implements ProductService {
 
 	@Override
 	public List<Product> getTitles() {
-		String sql = "select distinct p.pr_title title from products p where pr_enuu = "
+		String sql = "select distinct p.pr_title title from products p where p.pr_cmpuuid is null and p.pr_enuu = "
 				+ SystemSession.getUser().getEnterprise().getUu();
 		List<Product> products = commonDao.query(sql, Product.class);
 		return products;

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -15,7 +15,7 @@ define(['ngResource'], function() {
 			},
 			getNonstandard: {
 				params: {
-					_state: 'nonestandard'
+					_state: 'nonstandard'
 				}
 			},
 			uploadByBatch : {

src/main/webapp/resources/js/index/services/Product.js

@@ -57,7 +57,7 @@ define([ 'ngResource'], function() {
 			},
 			getNonstandard: {
 				params: {
-					_state: 'nonestandard'
+					_state: 'nonstandard'
 				}
 			},
 		})

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

@@ -100,11 +100,11 @@
                 </dd>
                 <dd>
                     <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" readonly="readonly" ng-disabled="!prodInfo.$editing" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)"><span></span></div>
+                    <div class="fr"><input type="text" readonly="prodInfo.cmpUuId != null" ng-disabled="!prodInfo.$editing" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)"><span></span></div>
                 </dd>
                 <dd>
                     <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span></span></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" readonly="prodInfo.cmpUuId != null"><span></span></div>
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>

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

@@ -97,11 +97,11 @@
                 </dd>
                 <dd>
                     <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text"  readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)" ng-disabled="!prodInfo.$editing"><span></span></div>
+                    <div class="fr"><input type="text"  readonly="prodInfo.cmpUuId != null" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)" ng-disabled="!prodInfo.$editing"><span></span></div>
                 </dd>
                 <dd>
                     <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span></span></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" readonly="prodInfo.cmpUuId != null"><span></span></div>
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>