Merge branch 'dev6.10.2' into test6.10.2

@@ -70,7 +70,7 @@ public class SizePoolService implements ISizePoolService{
 			return 0;
 		}
 		
-		checkIsExistBrand(bo);
+		checkIsExistBrand(bo, null);
 		List<SizePoolImage> imageList = JSONArray.parseArray(bo.getImageInfoList(), SizePoolImage.class);
 		
 		SizePool sizePool = new SizePool();
@@ -115,7 +115,7 @@ public class SizePoolService implements ISizePoolService{
 			return 0;
 		}
 		
-		checkIsExistBrand(bo);
+		checkIsExistBrand(bo, bo.getId());
 		
 		List<SizePoolImage> imageList = JSONArray.parseArray(bo.getImageInfoList(), SizePoolImage.class);
 		
@@ -131,7 +131,9 @@ public class SizePoolService implements ISizePoolService{
 		if(result == 0) {
 			return result;
 		}
-		
+
+        saveSizePoolImage(imageList, sizePool.getId());
+
 		//删除已存在的
 		batchDeleteSizePoolDetailByPoolId(bo.getId());
 		
@@ -327,13 +329,18 @@ public class SizePoolService implements ISizePoolService{
 		return sizePoolDetailMapper.deleteBySizePoolId(sizePoolId);
 	}
 	
-	private void checkIsExistBrand(SizePoolRequest bo) throws PlatformException {
+	private void checkIsExistBrand(SizePoolRequest bo, Integer sizePoolId) throws PlatformException {
 		if(!bo.getRangeType().equals(RANGE_TYPE_BRAND)) {
 			return;
 		}
 		
 		List<SizePoolDetail> list = sizePoolDetailMapper.queryByBrandId(bo.getIncludeBrandId());
 		if(CollectionUtils.isNotEmpty(list)) {
+
+            if (null != sizePoolId && list.size() == 1 && sizePoolId.equals(list.get(0).getSizePoolId())) {  // 如果是修改场景，则如果是当前的修改的记录；则需要过滤掉
+                return;
+            }
+
 			Brand brand = brandMapper.selectOneById(list.get(0).getItemId());
 			throw new PlatformException(brand.getBrandName() + "品牌已维护尺码表，请勿重复维护", 400);
     	}

@@ -279,7 +279,8 @@
     function productPoolDetails(poolId) {
         //window.self.paramObject.poolId = poolId;
         //console.log(window.self.paramObject.poolId);
-        this.location.href = contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolDetail.html?poolId=" + poolId + '&time_version=' + new Date().getTime();
+        window.open(contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolDetail.html?poolId=" + poolId + '&time_version=' + new Date().getTime());
+        //this.location.href = contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolDetail.html?poolId=" + poolId + '&time_version=' + new Date().getTime();
     }
 
 

@@ -237,7 +237,7 @@
                 $('#bidUid').textbox('clear');
                 $('#storageId').textbox('clear');
                 $('#sizeId').combobox('clear');
-                var param = {};
+                var param = {'id': productId};
                 $("#skupTable").myDatagrid("load", param);
             }
         });

@@ -281,7 +281,7 @@
                 $('#storageId').textbox('clear');
                 $('#sizeId').combobox('clear');
                 $('#region').textbox('clear');
-                var param = {};
+                var param = {'id': productId};
                 $("#skupTable").myDatagrid("load", param);
             }
         });

@@ -316,7 +316,8 @@
           var str = '';
 
           if (typeof(rowData.bidStorePrice) != 'undefined' && typeof(rowData.bidStorePrice.bidTotal) != 'undefined' && rowData.bidStorePrice.bidTotal > 0) {
-              str += "<a  role='cancel' href=" + contextPath + "/html/goods/storage/bidDetail.html?productId=" + rowData.id + "&midSortId=" + rowData.midSortId + "&time_version=" + new Date().getTime() + ">求购详情</a>";
+              //str += "<a  role='cancel' href=" + contextPath + "/html/goods/storage/bidDetail.html?productId=" + rowData.id + "&midSortId=" + rowData.midSortId + "&time_version=" + new Date().getTime() + ">求购详情</a>";
+              str += "<a role='cancel' dataId='" + rowData.id + "' sortId = '" + rowData.midSortId + "'>求购详情</a>";
           }
             str += "<a role='edit' dataId='" + rowData.id + "' sortId = '" + rowData.midSortId + "'>库存详情</a>";
           return str;
@@ -343,7 +344,7 @@
           onClick: function () {
             var id = $(this).attr("dataId");
             var midSortId = $(this).attr("sortId");
-            detailStorage(id, midSortId);
+              detailBidStorage(id, midSortId);
           }
         });
       }
@@ -522,9 +523,15 @@
 
 
     function detailStorage(id, midSortId) {
-      this.location.href = contextPath + "/html/goods/storage/storageDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime();
+      //this.location.href = contextPath + "/html/goods/storage/storageDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime();
+               window.open(contextPath + "/html/goods/storage/storageDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime());
     }
 
+      function detailBidStorage(id, midSortId) {
+          //this.location.href = contextPath + "/html/goods/storage/storageDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime();
+          window.open(contextPath + "/html/goods/storage/bidDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime());
+      }
+
 
     // 上传EXCEL
     function uploadExcel() {

@@ -331,11 +331,13 @@
 
         // 跳转编辑页
         function detailStorage(id, midSortId) {
-            this.location.href = contextPath
+            var hrefArr = contextPath
                 + "/html/goods/storageLineShops/storageLineShopsDetail.html?productId=" + id
                 + "&midSortId=" + midSortId
                 + "&time_version=" + new Date().getTime()
                 + "&sellerUid=" + paramSellerUid;
+
+            window.open(hrefArr);
         }
     }())
 

@@ -101,7 +101,8 @@
                     onClick: function () {
                         var id = $(this).attr("dataId");
                         var userName=$(this).attr("dataName");
-                        window.location.href = contextPath + "/html/merchantManage/margin/marginDetailList.html?" + id+"&"+userName+"&" + new Date().getTime();
+                        window.open(contextPath + "/html/merchantManage/margin/marginDetailList.html?" + id+"&"+userName+"&" + new Date().getTime());
+                        //window.location.href = contextPath + "/html/merchantManage/margin/marginDetailList.html?" + id+"&"+userName+"&" + new Date().getTime();
                     }
                 });
             }

@@ -1009,6 +1009,7 @@
 
 					if (showChannel.length <= 0) {
 						$.messager.alert('操作提示', '请选择展示平台！');
+                        that.submitFlag = false;
 						return false;
 					}