Merge branch 'yohobuy_portak_dev_v4.8_20160620'

@@ -35,6 +35,9 @@ module.exports=function(app) {
 	/*添加数据接口*/
 	app.post("/base/goods/ajax/add","basegoods_addBaseProduct");
 
+	/*检查下SKU是否存在*/
+	app.post("/product/checkSkuBarCodeExist","basegoods_checkSkuBarCodeExist");
+
 	/*修改页面*/
 	app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){
 		this.$extend={

@@ -457,9 +457,15 @@ e.on("validate",function(){
 		map3=map3.filter(function(item){
 			return $.trim(item.factoryCode)?true:false;
 		});
+		var __m={};
+		map3.forEach(function(item){
+			if(!__m.hasOwnProperty(item.factoryCode)){
+				__m[item.factoryCode]=true;
+			}
+		});
 
 		 var ispass=true;
-		 if(len==map3.length){
+		 if(len==map3.length&&len==Object.keys(__m).length){
 		 	common.util.__ajax2({
 				url:'/product/checkSkuBarCodeExist',
 				async:false,
@@ -470,7 +476,7 @@ e.on("validate",function(){
 				}
 			},true);
 		 }else{
-		 	ispass="商品条码不可为空";
+		 	ispass="商品条码不可为空或者条码重复";
 		 }
 		 
 		 return ispass;

@@ -35,6 +35,9 @@ module.exports=function(app) {
 	/*添加数据接口*/
 	app.post("/base/goods/ajax/add","basegoods_addBaseProduct");
 
+	/*检查下SKU是否存在*/
+	app.post("/product/checkSkuBarCodeExist","basegoods_checkSkuBarCodeExist");
+
 	/*修改页面*/
 	app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){
 		this.$extend={