我的产品库相关提示优化调整

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

@@ -150,6 +150,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
     public ModelMap releaseByWorkbook(Workbook workbook) {
         ModelMap modelMap = new ModelMap();
         List<ProductUsers> productUsers = new ArrayList<ProductUsers>();
+        List<String> alters = new ArrayList<String>();
         Long enuu = SystemSession.getUser().getEnterprise().getUu();
         Long useruu = SystemSession.getUser().getUserUU();
         Sheet sheet = workbook.getSheetAt(0);
@@ -281,6 +282,8 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                             prod.setUseruu(useruu);
                         }
                         productUsers.add(prod);
+                    } else {
+	                    alters.add(existProds.get(0).getProduct().getTitle());
                     }
                 }
             }
@@ -289,11 +292,15 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                 try {
                     productUsers = productUsersDao.save(productUsers);
                     modelMap.put("success", productUsers.size());
+                    if(alters.size() > 0)
+                    	modelMap.put("alters", alters);
                 } catch (Exception e) {
                     modelMap.put("error", "物料添加失败");
                 }
             } else {
                 modelMap.put("success", 0);
+	            if(alters.size() > 0)
+		            modelMap.put("alters", alters);
             }
         }
         return modelMap;

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

@@ -20872,12 +20872,15 @@
         // 批量转入我的产品库
         $scope.addtoUserByCheck = function() {
             var ids = angular.toJson($rootScope.ids);
-            if(ids.length <= 2) {
-                toaster.pop('error', '提示', '请先选择物料');
+            if($rootScope.ids.length == 0) {
+                toaster.pop('error', '提示', '请先选择产品');
             } else {
                 ids = ids.replace(/\[|]/g,'');
                 prodUser.coverToUserByIds({ids: ids}, {}, function(data) {
-                    toaster.pop('success', '提示', '成功转入' + data.count + '个物料');
+                    toaster.pop('success', '提示', '选择' + $rootScope.ids.length + '个产品，成功转入' + data.count + '个产品');
+                    $rootScope.ids = [];
+                    $scope.tableParams.page(1);
+                    $scope.tableParams.reload();
                 }, function(res) {
                     toaster.pop('error', '提示', '转入失败');
                 });
@@ -22490,13 +22493,18 @@
         // 批量删除
         $scope.deleteByBatch = function() {
             var ids = angular.toJson($rootScope.ids);
-            prodUser.deleteByBatch({ids: ids}, {}, function(data) {
-                toaster.pop('success', '提示', '成功删除' + $rootScope.ids.length + '个物料');
-                $scope.tableParams.page(1);
-                $scope.tableParams.reload();
-            }, function(res) {
-                toaster.pop('error', '提示', '删除失败');
-            });
+            if($rootScope.ids.length > 0) {
+                prodUser.deleteByBatch({ids: ids}, {}, function(data) {
+                    toaster.pop('success', '提示', '成功移除' + $rootScope.ids.length + '个产品');
+                    $rootScope.ids = [];
+                    $scope.tableParams.page(1);
+                    $scope.tableParams.reload();
+                }, function(res) {
+                    toaster.pop('error', '提示', '移除失败');
+                });
+            } else {
+                toaster.pop('error', '提示', '请先选择产品');
+            }
         }
     }]);
 

src/main/webapp/resources/tpl/index/approvalFlow/modal/uplodaByBatch.html

@@ -58,6 +58,9 @@
 		<p ng-if="result.total">
 			<span>总共上传{{result.total}}个，成功{{result.success}}个</span>
 		</p>
+        <p ng-if="result.alters.length > 0">
+            产品<span class="text-inverse" ng-repeat="alert in result.alters">"{{alert}}", </span>已存在，上传失败
+        </p>
 	</div>
 </div>
 <div class="modal-footer Deputy">