批量导入编号重复增加提示，一键更新增加更新数据提示

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

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

@@ -304,12 +304,16 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					}
 					productsInfo.add(product);
 					modelMap.put("total", total);
-					modelMap.put("success", total - alters.size());
 					modelMap.put("products", productsInfo);
 				}
 			}
 			if (!CollectionUtils.isEmpty(products)) {
-				productDao.save(products);
+				try {
+					products = productDao.save(products);
+					modelMap.put("success", products.size());
+				} catch (Exception e) {
+					modelMap.put("error", "存在编号相同的产品");
+				}
 			}
 		}
 		return modelMap;

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

@@ -328,18 +328,22 @@ public class ProductServiceImpl implements ProductService {
 		for (Long id : idStrings) {
 			refreshproduct(id);
 		}
+		int size1 = idStrings.size();
 		List<Product> products = productDao.findByEnUUAndMatchstatus(SystemSession.getUser().getEnterprise().getUu(),
 				Status.SUBMITTED.value());
+		int size2 = 1;
 		if (!CollectionUtils.isEmpty(products)) {
 			for (Product porduct : products) {
 				if (porduct.getMatchresults().size() == 1) {
 					for (ProductMatchResult result : porduct.getMatchresults()) {
 						refreshproduct(result.getId());
+						size2 = size2 + 1;
 					}
 				}
 			}
 		}
-		map.put("success", "更新成功");
+		int size = size1 + size2;
+		map.put("success", "更新成功" + size + "个");
 		return map;
 	}
 

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

@@ -241,12 +241,16 @@ public class PurcProductServiceImpl implements PurcProductService {
 					}
 					productsInfo.add(product);
 					modelMap.put("total", total);
-					modelMap.put("success", total - alters.size());
 					modelMap.put("products", productsInfo);
 				}
 			}
 			if (!CollectionUtils.isEmpty(products)) {
-				productDao.save(products);
+				try {
+					products = productDao.save(products);
+					modelMap.put("success", products.size());
+				} catch (Exception e) {
+					modelMap.put("error", "存在编号相同的物料");
+				}
 			}
 		}
 		return modelMap;

src/main/webapp/resources/js/index/app.js

@@ -10147,6 +10147,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						file: file,
 						method: 'POST'
 					}).success(function(data) {
+						if(data.error) {
+							toaster.pop('error', '提示', data.error);
+						}
 						$scope.result = data;
 						$scope.products = $scope.result.products;
 						$scope.success = $scope.result.success;
@@ -16418,6 +16421,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						file: file,
 						method: 'POST'
 					}).success(function(data) {
+						if(data.error) {
+							toaster.pop('error', '提示', data.error);
+						}
 						$scope.result = data;
 						$scope.products = $scope.result.products;
 						$scope.success = $scope.result.success;

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

@@ -314,10 +314,10 @@ table.table.table-striped  thead {
 	<div class="box-item" ng-hide="box3Closed">
 		<p ng-if="result">
 			<div ng-if="result">
-				总共上传物料<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success}}</span>个
+				总共上传产品<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success || 0}}</span>个
 			</div>
 			<div ng-repeat="alter in alters">
-				物料 <span class="text-inverse">{{alter}}</span> 已存在，上传失败
+				产品 <span class="text-inverse">{{alter}}</span> 已存在，上传失败
 			</div>
 			<div ng-repeat="info in infos">
 				<span class="text-inverse">{{info}}</span>

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

@@ -314,7 +314,7 @@ table.table.table-striped  thead {
 	<div class="box-item" ng-hide="box3Closed">
 		<p ng-if="result">
 			<div ng-if="result">
-				总共上传物料<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success}}</span>个
+				总共上传物料<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success || 0}}</span>个
 			</div>
 			<div ng-repeat="alter in alters">
 				物料 <span class="text-inverse">{{alter}}</span> 已存在，上传失败