优化发货管理

src/main/webapp/resources/js/common/query/order.js

@@ -243,6 +243,11 @@ define([ 'ngResource' ], function() {
                 url : 'trade/order/personal/counts',
                 method : 'GET'
             },
+           // 获取当个发货单的信息
+            getSendOrderInfo: {
+                url: '/trade/order/invoiceid',
+              method : 'GET'
+            },
             /**
              * 删除订单
              * @see com.uas.platform.b2c.trade.controller.OrderController.deleteOrder(String)

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -9,7 +9,29 @@ define(['app/app'], function(app) {
 		$scope.acceptGoods = false // 是否是 收货入库进来
 		$scope.CheckId = 'autoMonth0' // 当前发货点选择按钮
     $scope.ChooseItem = '' // 当前选择发货单
+		$scope.orderStatus = true
 
+    // 获取当前收货单所对应的物品信息
+    function getReceiveInfo() {
+      Order.getSendOrderInfo(
+          {id: $scope.order.id, invoiceid: $scope.ChooseItem}, {},
+          function (data) {
+          	if (data.data.status === 404) {
+              $scope.orderStatus = true
+	          } else {
+              $scope.orderStatus = false
+	          }
+            var _data = data.data.invoiceFPurchaseDetails
+            var _details = $scope.order.orderDetails
+            for (var j = 0; j < _data.length; j++) {
+              for (var k = 0; k < _details.length; k++) {
+                if (_data[j].ordetailid === _details[k].id) {
+                  _details[k].receiveCount = _data[j].number
+                }
+              }
+            }
+          })
+    }
     // 记录状态激活信息
 		$scope.steps = {
 			step1 : false,
@@ -186,6 +208,7 @@ define(['app/app'], function(app) {
 			$scope.error('订单编号ID不能为空');
 		} else {
 
+
 			/**
 			 * 根据订单编号ID获取订单信息
 			 */
@@ -196,9 +219,13 @@ define(['app/app'], function(app) {
 				}
 				$scope.order = data;
         $scope.sendGoodsList = $scope.order.inIds.split(',')
+        $scope.acceptGoods = $scope.order.signReceive
         $scope.ChooseItem = $scope.sendGoodsList.length > 0 ? $scope.sendGoodsList[0] : ''
+				if ($scope.acceptGoods) {
+          getReceiveInfo()
+        }
 				// todo 这里需要根据 是否存在已收货数据
-        $scope.acceptGoods = ($scope.sendGoodsList.length > 0 && ) ? true : false
+
 				$scope.order.orderHistory = angular.fromJson($scope.order.statushistory);
 				if ($scope.order.orderRemark){
 					$scope.remarkList = angular.fromJson($scope.order.orderRemark);
@@ -253,6 +280,7 @@ define(['app/app'], function(app) {
 		$scope.ChooseSendGoodsItem = function(item, ind) {
       $scope.CheckId = `autoMonth${ind}`
 			$scope.ChooseItem = item
+      getReceiveInfo()
 		}
 
     // 确认收货

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -1019,12 +1019,12 @@
                                       <em ng-bind="order.lastNotiDelivery | hoursToDay : notifySellerShip"></em>
                                   </div>
                               </a>
-                                <div ng-if="order.status == 404">
+                                <div ng-if="order.status == 404 || order.signReceive">
 																	<!--ng-click="ensureAccept(order)"-->
                                     <a href="user#/order/detail/{{order.orderid | EncryptionFilter}}?fromPage=true" class="operate-height"  style="display: block;">
                                         <em class="order-operation">收货入库</em>
                                     </a>
-                                    <div class="clock-mind">
+                                    <div class="clock-mind" ng-if="order.status == 404">
                                         <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="order.shipOutTime | hoursToDay : 360"></em><!--15天之后自动收货，换算成小时 15*24=360-->
                                     </div>
                                 </div>

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -572,7 +572,7 @@
 								<!--</div>-->
 								<!-- 已收货 -->
 								<div class="text-area">
-                  <i >{{detail.shipQty || '-'}}</i>
+                  <i >{{detail.signReceiveQty || '-'}}</i>
                 </div>
 							</span>
 							<span class="wd01" style="line-height: 18px;">
@@ -582,7 +582,7 @@
 								<!--</div>-->
 								<!-- 本次收货 -->
 								<div class="text-area">
-                  <i>{{detail.shipQty || '-'}}</i>
+                  <i>{{detail.receiveCount || '-'}}</i>
                 </div>
 							</span>
 						</dd>
@@ -649,7 +649,7 @@
 					</dd>
 				</dl>
 			</div>
-			<div class="order_btn" ng-if="acceptGoods">
+			<div class="order_btn" ng-if="acceptGoods && orderStatus">
 				<div ng-click="goBack()" style="background:#aaaaaa">取消</div>
 				<div ng-click="ensureAccept()" style="background:#5078cb">确认收货</div>
 			</div>