Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.*;
@@ -522,6 +521,9 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			for (SaleSendItem sendItem : sendItems) {
 				PurchaseNotice notice = purchaseNoticeDao.findOne(sendItem.getNoticeId());
 				double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + sendItem.getQty();
+				if (endQty > notice.getQty()) {
+					throw new IllegalOperatorException("累计发货数量将超出本次送货提醒的需求数！");
+				}
 				notice.setEndQty(endQty);
 				notice.setStatus(
 						(short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value()));

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

@@ -1704,6 +1704,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     app.controller('TruckModalCtrl', ['$scope', '$rootScope', '$modalInstance', 'SaleTruck', 'PurcNotice', 'toaster', '$state', '$filter', '$timeout', 'token', function ($scope, $rootScope, $modalInstance, SaleTruck, PurcNotice, toaster, $state, $filter, $timeout, token) {
+        $scope.loading = false;
         $scope.saleSend = {sendItems: []};
         SaleTruck.detail({}, function (data) {
             // 按物料编号排序
@@ -1749,8 +1750,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
         getToken();
         $scope.send = function () {// 发货
+            $scope.loading = true;
             if (!$scope.saleSend.code || $scope.saleSend.code == '') {//送货单号为空
                 toaster.pop('error', '错误', '请输入送货单号');
+                $scope.loading = false;
                 return;
             }
             var currency = $scope.notices[0].orderItem.order.currency,
@@ -1778,10 +1781,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 });
                 if($scope.token != null) {
                 	PurcNotice.sendByBatch({token: $scope.token}, send, function (data) {
+                        $scope.loading = false;
                 		toaster.pop('success', '提示', '发货成功，跳转至发货单：' + send.code);
                 		$modalInstance.close(true);
                 		$state.go('sale.send_detail', {id: data.id});
                 	}, function (response) {
+                        $scope.loading = false;
                 		toaster.pop('error', '错误', response.data);
                 	});
                 }

src/main/webapp/resources/tpl/index/sale/track.html

@@ -1,4 +1,7 @@
 <div class="modal-body">
+	<div class="loading" ng-class="{'in': loading}">
+		<i></i>
+	</div>
 	<div class="headerline">
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>填写送货信息</span>
 	</div>