批量发货翻页记录以前的选择不清除

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -873,13 +874,14 @@ public class SaleNoticeController {
 	}
 
     /**
-     * 通过前端传输的id数组增加
+     * 通过前端传输的id数组寻找发货单信息
      * @param ids
      * @return
      */
 	@RequestMapping(value = "/findByIds", method = RequestMethod.GET)
     @ResponseBody
-    public List<PurchaseNotice> findByIds(@RequestBody List<Long> ids) {
-        return null;
+    public List<PurchaseNotice> findByIds(String ids) {
+        List<Long> idList = JSONObject.parseArray(ids, Long.class);
+        return purchaseNoticeService.findByIds(idList);
     }
 }

src/main/java/com/uas/platform/b2b/service/PurchaseNoticeService.java

@@ -314,4 +314,12 @@ public interface PurchaseNoticeService {
     List<Object[]> getNoticeCount(String category);
 
 	SPage<PurchaseNotice> findDoneNoticesByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
+
+    /**
+     * 通过ids查询发货信息
+     *
+     * @param ids
+     * @return
+     */
+    List<PurchaseNotice> findByIds(List<Long> ids);
 }

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

@@ -233,7 +233,12 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 		return noticeSpage;
 	}
 
-	@Override
+    @Override
+    public List<PurchaseNotice> findByIds(List<Long> ids) {
+        return purchaseNoticeDao.findAll(ids);
+    }
+
+    @Override
 	public Page<PurchaseNotice> findDoneByPageInfo(final PageInfo pageInfo, final String keyword, final Long fromDate,
 			final Long endDate) {
 		return purchaseNoticeDao.findAll(new Specification<PurchaseNotice>() {

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

@@ -6882,8 +6882,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
     }]);
 
-    app.controller('SaleNoticeSendByBatchCtrl', ['$scope', '$modalInstance', 'Symbol', 'selectedNotices', 'PurcNotice', 'toaster', '$state', '$timeout', 'token', 'ids', function ($scope, $modalInstance, Symbol, selectedNotices, PurcNotice, toaster, $state, $timeout, token, ids) {
-        $scope.notices = angular.copy(selectedNotices);
+    app.controller('SaleNoticeSendByBatchCtrl', ['$scope', '$modalInstance', 'Symbol', 'selectedNotices', 'PurcNotice', 'toaster', '$state', '$timeout', 'token', 'ids', '$rootScope', function ($scope, $modalInstance, Symbol, selectedNotices, PurcNotice, toaster, $state, $timeout, token, ids, $rootScope) {
+        // $scope.notices = angular.copy(selectedNotices);
+        PurcNotice.findByIds({ids : angular.toJson(ids)},  function(data) {
+            $scope.notices = angular.copy(data);
+        }, function(res) {
+            toaster.pop('error', '提示', '发货提醒查询失败');
+        });
         $scope.currency = Symbol.currency;//将币别转化为对应的符号
         $scope.saleSend = {
             code: '',
@@ -6951,21 +6956,19 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             var num = 1;
             var valid = true;
             angular.forEach($scope.notices, function (item, key) {
-                if (item.$selected) {
-                    if (a == 0) {//第一次
-                        $scope.saleSend.currency = item.orderItem.order.currency;
-                        $scope.saleSend.custUU = item.enUU;
-                        $scope.saleSend.payments = item.orderItem.order.payments;
-                        a = 1;
-                    } else {//其他
-                        if ($scope.saleSend.currency != item.orderItem.order.currency) valid = false;
-                        if ($scope.saleSend.custUU != item.enUU) valid = false;
-                        if ($scope.saleSend.payments != item.orderItem.order.payments) valid = false;
-                    }
-                    $scope.saleSend.sendItems.push({
-                        noticeId: item.id, qty: item.thisSendQty, price: item.orderItem.price, number: num++
-                    });
-                }
+                if (a == 0) {//第一次
+                    $scope.saleSend.currency = item.orderItem.order.currency;
+                    $scope.saleSend.custUU = item.enUU;
+                    $scope.saleSend.payments = item.orderItem.order.payments;
+                    a = 1;
+                } else {//其他
+                    if ($scope.saleSend.currency != item.orderItem.order.currency) valid = false;
+                    if ($scope.saleSend.custUU != item.enUU) valid = false;
+                    if ($scope.saleSend.payments != item.orderItem.order.payments) valid = false;
+                }
+                $scope.saleSend.sendItems.push({
+                    noticeId: item.id, qty: item.thisSendQty, price: item.orderItem.price, number: num++
+                });
             });
             if (!valid) {
                 toaster.pop('error', '错误', '只有客户一致、币别一致、付款方式一致才能一起发货。');