.

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js

@@ -1,7 +1,7 @@
 angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     function($scope, $http, $filter, $stateParams, $state, $uibModal, $rootScope,agentDepotService,
              deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService,
-             storeWareDetailService, enumService, codeRuleService,planService, customerService, $location, APP_CONFIG) {
+             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, $location, APP_CONFIG) {
 
         $scope.deliveryStorageNotice = {};
         $scope.billNumber = {};
@@ -145,16 +145,46 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                 		$('#xzht').css('display','none');
                 	}
                     
-                  //给协议号赋值
+                    //给协议号赋值
                     for (var i=0; i< result.length; i++) {
-                    	$scope.addedDetail[i].agreementNumber = result[i].contractNumber;
+                    	if ($stateParams.noticeType == "delivery") {//出库
+                    		if (result[i].ywtype == "2") {//销售=竞价
+                				$scope.addedDetail[i].htbh = result[i].contractNumber;//通知单本身的协议号就是合同号
+                				$scope.addedDetail[i].agreementNumber = null;
+                    		}else if (result[i].ywtype == "3") {//包干，通知单的合同号是从接收合同引的，本身的协议号/合同号的值就只是协议号
+                    			$scope.addedDetail[i].htbh = result[i].htbh;
+                    			$scope.addedDetail[i].agreementNumber = result[i].contractNumber;
+                    		}
+                    	}
+                    }
+                    //根据合同号获取接收合同信息中的客户ID
+                    if ($scope.addedDetail[0].htbh != null) {
+                    	contractReceiveService.getPageInfo(null, 
+                    			null, 
+                    			$scope.addedDetail[0].htbh,
+                    			null,
+                    			null,
+                    			null).then(function (data) {
+                    				$scope.pageInfo = data;
+                    				if (data.list != null && data.list.length > 0) {
+                    					var khid = data.list[0].khid;
+                    					$scope.addedDetail[0].outCount = data.list[0].htzsl;
+                    					$scope.addedDetail[0].outPrice = data.list[0].htdj;
+                    					$scope.addedDetail[0].outDetailTotalPrice = data.list[0].htzj;
+                    					$scope.deliveryStorageNotice.shipingCount = $scope.addedDetail[0].outCount;
+                    					$scope.deliveryStorageNotice.moneyQuantity = $scope.addedDetail[0].outDetailTotalPrice;
+                    					//带出客户
+                    					$scope.getCustomer(khid);
+                    				}
+                    			}, function (data) {
+                    				console.log(data);
+                    			});
                     }
                     // 计算总数量.
                     $scope.countSumAmount();
                     //计算总金额
                     $scope.countMoneyQuantity();
                     
-                    
                 }
 
             }, function (reason) {
@@ -525,44 +555,6 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                     
                     //带出客户
                     $scope.getCustomer(result.khid);
-                    
-//                    storeWareDetailService.getByZidAndType(result.id, "cblContract").then(function(data) {
-//                    	
-//                        // 循环删除计划明细中的id，有这个id会导致删除的时候误认为是删除已有明细.
-//                        for (var i=0; i< data.list.length; i++) {
-//                            $scope.idList.push(data.list[i].id);
-//                            data.list[i].id = "";
-//                            var sl_index;
-//                            if(result.contractType == 3147 || result.contractType == 7130){
-//                                if(data.list[i].remainingNumber!="" && data.list[i].remainingNumber!=null){
-//                                	sl_index = data.list[i].remainingNumber.toString().indexOf("超出");
-//                                	if (sl_index != -1) {
-//                                		data.list[i].inCount = 0;
-//                                	}
-//                                    data.list[i].inDetailTotalPrice = commonUtilService.accMul(data.list[i].inCount,data.list[i].inPrice) ;
-//                                    continue;
-//                                }
-//                            }else if(result.contractType == 3148 || result.contractType == 7131){
-//                                if(data.list[i].outRemainingNumber!="" && data.list[i].outRemainingNumber!=null){
-//                                	sl_index = data.list[i].outRemainingNumber.toString().indexOf("超出");
-//                                	if (sl_index != -1) {
-//                                		data.list[i].outCount = 0;
-//                                	}
-//                                    data.list[i].outDetailTotalPrice = commonUtilService.accMul(data.list[i].outCount,data.list[i].outPrice) ;
-//                                    continue;
-//                                }
-//                            }
-//                        }
-//                        $scope.addedDetail = data.list;
-//                        if(val=="2" && $scope.addedDetail.length>0){
-//                    		$('#xztzdbh').css('display','none');
-//                    	}
-//
-//                        // 计算合同数量.
-//                        $scope.countSumAmount();
-//                        $scope.countMoneyQuantity();
-//                    });
-
 
                     // 合同编号.
 //                    $scope.deliveryStorageNotice.contract = result.contractNumber;