1

src/main/resources/static/app/business/contractReceive/service/contractReceiveService.js

@@ -2,7 +2,7 @@
 
 angular.module('app.business').service("contractReceiveService", function($http, $q, APP_CONFIG,$rootScope) {
     //盘点列表
-	this.getPageInfo = function(pageNum, pageSize, htbh, houseId, warehouseId){
+	this.getPageInfo = function(pageNum, pageSize, htbh, houseId, warehouseId, htlx){
 		var d = $q.defer();
 		$http({
 			method : 'GET',
@@ -13,6 +13,7 @@ angular.module('app.business').service("contractReceiveService", function($http,
 				htbh: htbh,
                 houseId: houseId,
                 warehouseId: warehouseId,
+                htlx: htlx,
                 orgId: $rootScope.userInfo.orgId
 			}
 		}).then(function successCallback(response) {

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

@@ -0,0 +1,40 @@
+angular.module('app.business').controller("receiveContractListModalCtrl", 
+    function($scope, $uibModalInstance, $filter, $http, $uibModal,$rootScope, contractReceiveService, APP_CONFIG, items) {
+
+	$scope.pageInfo = {pageNum: 1, pageSize: 10};
+    $scope.search = {htbh: "", houseId: "", warehouseId: ""};
+
+    $scope.loadData = function () {
+    	contractReceiveService.getPageInfo($scope.pageInfo.pageNum, 
+    			$scope.pageInfo.pageSize, 
+    			null,
+    			items.houseId,
+    			items.warehouseId,
+    			items.htlx).then(function (data) {
+            $scope.pageInfo = data;
+        }, function (data) {
+            console.log(data);
+        });
+    }
+
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+             $scope.pageInfo.pageNum = pageNum;
+             $scope.loadData();
+         }
+    }
+    
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    }
+    
+    // 选择.
+    $scope.selectContractReceive = function(contractReceive) {
+        $uibModalInstance.close(contractReceive);
+    }
+
+});

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

@@ -37,9 +37,9 @@ angular.module('app.business').controller("receiveNoticeCtrl", function($scope,
  	}
  	
  	
-    // 查看页面
-    $scope.showView = function(id) {
-        $state.go("app.business.grainReservesManage-receiveNotice-view", {id : id});
+    // 编辑页面
+    $scope.edit = function(id, btnType) {
+        $state.go("app.business.grainReservesManage-receiveNotice-view", {id : id, btnType: btnType});
     }
     
     

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

@@ -13,35 +13,89 @@ angular.module('app.business').controller("receiveNoticeSaveCtrl",
 	        	 $scope.businessNoticeReceive.crktype = "出库";
 	         }
 	         
-	         if($scope.businessNoticeReceive.ywtype == 1){//<!-- 1竞买2 销售 3轮换 --> 
-	        	 $scope.businessNoticeReceive.ywtype = "竞买";
-	         }else if($scope.businessNoticeReceive.ywtype == 2){//<!-- 1竞买2 销售 3轮换 --> 
-	        	 $scope.businessNoticeReceive.ywtype = "销售";
-	         }else if($scope.businessNoticeReceive.ywtype == 3){//<!-- 1竞买2 销售 3轮换 --> 
-	        	 $scope.businessNoticeReceive.ywtype = "轮换";
+	         $scope.ywlx = "";
+	         if ($scope.businessNoticeReceive.ywtype == 1 || $scope.businessNoticeReceive.ywtype == 2) {//<!-- 1竞买=竞价,2 销售=竞价 3轮换=包干 --> 
+	        	 $scope.ywlx = "竞价";
+	         } else if ($scope.businessNoticeReceive.ywtype == 3){
+	        	 $scope.ywlx = "包干";
 	         }
-	         
-	         //单位转化
-	         //$scope.businessNoticeReceive.count = commonUtilService.accDiv($scope.businessNoticeReceive.count,1000);
 	     },function(data){
 	    	 console.log(data);
 	     });
          
 	 }
+	 
+	 // 选择市平台下发的合同
+	 $scope.getReceiveContract = function(businessNoticeReceive) {
+         var params = [];
+         params.houseId = businessNoticeReceive.houseId;
+ 		 params.warehouseId = businessNoticeReceive.wareHouseId;
+ 		 if (businessNoticeReceive.crktype == "出库") {//销售
+ 			 params.htlx = "1";
+ 		 } else if (businessNoticeReceive.crktype == "入库") {//采购
+ 			 params.htlx = "0";
+ 		 }
+         var uibModalInstance = $uibModal.open({
+             size:'lg',
+             templateUrl: 'app/business/deliveryStorageNotice/views/receiveContract-list-modal.html',
+             controller: 'receiveContractListModalCtrl',
+             resolve: {
+                 // items是一个回调函数
+                 items: function () {
+                     // 这个值会被模态框的控制器获取到
+                     return params;
+                 }
+             }
+         });
+         uibModalInstance.result.then(function (result) {
+             if (result != null) {
+                 // 获取明细信息.
+            	 $scope.businessNoticeReceive.htbh = result.htbh;
+             }
+         }, function (reason) {
+             console.log(reason);
+         });
+     }
+
+	 $scope.removeHtbh = function() {
+		 if (true) {
+			 $scope.businessNoticeReceive.htbh = null;
+		 }
+     }
 
 	 
 	 //返回
 	 $scope.retList = function () {
-       $state.go("app.business.grainReservesManage-receiveNotice");
-    }
-    
-	 
-	 if($stateParams.id != 0){
-	   	  $scope.loadDataById($stateParams.id);
-	   	  $scope.isNotEdit = true ;
+         $state.go("app.business.grainReservesManage-receiveNotice");
+     }
+
+	 if ($stateParams.id != 0){
+	   	 $scope.loadDataById($stateParams.id);
+	   	 $scope.isNotEdit = true ;
+	   	 $scope.htbhNotEdit = true;
+	   	 if ($stateParams.btnType == 'glht') {
+	   		 $scope.htbhNotEdit = false;
+	   	 }
      }
 
-       
+	 var validator = $("#deliveryStorageNotice-form").validate();
 
-       
+	 $scope.save = function() {
+		 if (validator.form()) {
+			 $scope.noticeReceive = {};
+			 $scope.noticeReceive.htbh = $scope.businessNoticeReceive.htbh;
+			 $scope.noticeReceive.id = $scope.businessNoticeReceive.id;
+			 $scope.noticeReceive.orgId = $scope.businessNoticeReceive.orgId;
+			 receiveNoticeService.updateHtbh($scope.noticeReceive).then(function(data){
+				 if (data.status == "200") {
+					 alert("操作成功");
+					 $scope.retList();
+				 } else {
+					 alert("操作失败");
+				 }
+		     },function(data){
+		    	 console.log(data);
+		     });
+		 }
+	 }
 });

src/main/resources/static/app/business/deliveryStorageNotice/service/receiveNoticeService.js

@@ -34,7 +34,7 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
             d.reject("error");
         });
         return d.promise;
-    }  
+    }
 
 
     //根据id加载数据
@@ -83,9 +83,8 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
             d.reject("error");
         });
         return d.promise;
-    }  
-    
-    
+    }
+
     this.audit = function(receiveNotice,content) {
         var d = $q.defer();
         $http({
@@ -107,8 +106,7 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
             d.reject("error");
         });
         return d.promise;
-    } 
-    
+    }
 
     this.getAuditById = function(id) {
         var d = $q.defer();
@@ -125,4 +123,22 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
         return d.promise;
     }
 
+    this.updateHtbh = function(receiveNotice) {
+        var d = $q.defer();
+        $http({
+            method : 'POST',
+            url : APP_CONFIG.businessUrl + '/depot/business/receiveNotice/updateHtbh',
+            data: {
+            	notice : angular.toJson(receiveNotice)
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+          
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 })

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveContract-list-modal.html

@@ -0,0 +1,58 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">接收合同列表</h4>
+    </div>
+    <div class="modal-body">
+        <div>
+            <div class="widget-body no-padding">
+                <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                    <div class="dt-toolbar">
+                        <div class="col-xs-12 col-sm-6">
+                            <div class="dataTables_filter">
+                                <label>
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+    
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+                            <tr>
+                                <th>合同编号</th>
+                                <th>合同类型</th>
+                                <th>仓房名称</th>
+                                <th>货位名称</th>
+                                <th>合同数量(吨)</th>
+                                <th>明细品种</th>
+                                <th>客户名称</th>
+                                <th>操作</th>
+                            </tr>
+                        </thead>
+                        
+                        <tbody>
+                            <tr ng-repeat="contractReceive in pageInfo.list">
+                                <td>{{ contractReceive.htbh }}</td>
+                                <td>{{ contractReceive.htlx==0?"采购":"销售" }}</td>
+                                <td>{{ storehouseObj[contractReceive.houseId].storehouseName }}</td>
+                                <td>{{ wares[contractReceive.warehouseId].warehouseName }}</td>
+                                <td>{{ contractReceive.htzsl }}</td>
+                                <td>{{ dicData[contractReceive.mxpz] }}</td>
+                                <td>{{ contractReceive.khmc }}</td>
+                                <td>
+                                    <a href-void ng-click="selectContractReceive(contractReceive)"><i class="fa fa-edit"></i>选择</a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div smart-include="app/layout/partials/page.tpl.html"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-default" ng-click="cancel()"> 取消 </button>
+    </div>
+</div>

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveNotice-edit.html

@@ -37,7 +37,10 @@
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">协议编号/合同编号：</label>
+											<label class="label">
+											    <span ng-if="businessNoticeReceive.ywtype=='3'">协议编号</span>
+											    <span ng-if="businessNoticeReceive.ywtype!='3'">合同编号</span>
+											</label>
 											<label class="input">
 												<input type="text" ng-model="businessNoticeReceive.contractNumber" name="contractNumber" ng-disabled="isNotEdit">
 											</label>
@@ -47,7 +50,7 @@
                               		<section class="col col-3">
 											<label class="label">业务类型：</label>
 											<label class="input">
-												<input type="text" ng-model="businessNoticeReceive.ywtype" name="ywtype" ng-disabled="isNotEdit">
+												<input type="text" ng-model="ywlx" name="ywlx" ng-disabled="isNotEdit">
 											</label>
 										</section>
 										<section class="col col-3">
@@ -95,51 +98,48 @@
 										<section class="col col-3">
 											<label class="label">计划数量(吨)：</label>
 											<label class="input">
-												<input type="text" ng-model="businessNoticeReceive.count" name="count" ng-disabled="isNotEdit"
-													   >
+												<input type="text" ng-model="businessNoticeReceive.count" name="count" ng-disabled="isNotEdit" />
 											</label>
 										</section>
                               	</div>
                               	<div>
                               		<section class="col col-3">
-											<label class="label">出库期限：</label>
+										<label class="label">出库期限：</label>
+										<label class="input">
+											<input type="text" ng-model="businessNoticeReceive.outgoingPeriod" name="outgoingPeriod" ng-readonly="isNotEdit" />
+												   
+										</label>
+									</section>
+									<span ng-if="businessNoticeReceive.forwardingUnit != null">
+										 <section class="col col-3">
+											<label class="label">发/收货单位：</label>
+											<label class="input">
+												<input type="text" ng-model="businessNoticeReceive.forwardingUnit" name="forwardingUnit" ng-readonly="isNotEdit" />
+											</label>
+									     </section> 					
+									</span>
+									<span ng-if="businessNoticeReceive.receiveUnit != null">
+										<section class="col col-3">
+											<label class="label">发/收货单位：</label>
 											<label class="input">
-												<input type="text" ng-model="businessNoticeReceive.outgoingPeriod" name="outgoingPeriod" ng-disabled="isNotEdit">
-													   
+												<input type="text" ng-model="businessNoticeReceive.receiveUnit" name="receiveUnit" ng-readonly="isNotEdit" />
 											</label>
 										</section>
-										<span ng-if="businessNoticeReceive.forwardingUnit != null">
-											 <section class="col col-3">
-												<label class="label">发/收货单位：</label>
-												<label class="input">
-													<input type="text" ng-model="businessNoticeReceive.forwardingUnit" name="forwardingUnit" ng-disabled="isNotEdit" >
-												</label>
-										     </section> 					
-										</span>
-										<span ng-if="businessNoticeReceive.receiveUnit != null">
-											<section class="col col-3">
-												<label class="label">发/收货单位：</label>
-												<label class="input">
-													<input type="text" ng-model="businessNoticeReceive.receiveUnit" name="receiveUnit" ng-disabled="isNotEdit" >
-												</label>
-											</section>
-										</span>
+									</span>
                               	</div>
-								<span ng-if="businessNoticeReceive.inApplication=='4' || businessNoticeReceive.inApplication=='3'" >
-									<table width="100%">
-										<tr>
-											<th>
-												<label class="label" style="font-size:18px;margin-top:15px"><strong>暂停或终止原因：</strong></label>
-												<label class="input">
-													<input type="text" ng-model="businessNoticeReceive.resion" name="resion" ng-readonly="isNotEdit">
-												</label>
-											</th>
-										</tr>
-									</table>
-								</span>
+								<div ng-show="businessNoticeReceive.ywtype=='3'">
+								    <section class="col col-3">
+										<label class="label">合同编号：<span style="color: red;">*</span></label>
+										<label class="input">
+                                            <input class="form-control" type="text" ng-model="businessNoticeReceive.htbh" ng-disabled="htbhNotEdit" 
+                                            name='htbh' ng-click="getReceiveContract(businessNoticeReceive)" placeholder="请选择接收合同" />
+										</label>
+									</section>
+								</div>
                                 </fieldset>
                                 <div><!--class="form-actions"-->
                                     <footer class="text-align-center">
+                                        <button type="button" class="btn btn btn-primary" ng-hide="htbhNotEdit" ng-click="save()">保存</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">返回</button>
                                     </footer>
                                 </div>

src/main/resources/static/app/business/deliveryStorageNotice/views/receiveNotice-list.html

@@ -70,8 +70,8 @@
 		                            <th> 粮油品种</th>
 		                            <th> 等级</th>
 		                            <th> 计划数量(吨)</th>
-		                            <!-- <th> 状态</th> -->
 		                            <th> 接收日期</th>
+		                            <th> 合同编号</th>
 		                            <th> 操作</th>
 		                        </tr>
 	                        </thead>
@@ -90,9 +90,9 @@
 	                                
 	                                <td>
 	                                	<div ng-switch="{{receiveNotice.ywtype}}"><!-- 1竞买2 销售 3轮换 -->
-		                                    <div ng-switch-when="1">竞买</div>
-		                                    <div ng-switch-when="2">销售</div>
-		                                    <div ng-switch-when="3">轮换</div>
+		                                    <div ng-switch-when="1">竞价</div>
+		                                    <div ng-switch-when="2">竞价</div>
+		                                    <div ng-switch-when="3">包干</div>
 	                                    </div>
 	                                </td>
 	                                <td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
@@ -103,29 +103,11 @@
 	                                <td>{{dicData[receiveNotice.grainKind]}}</td>
 	                                <td>{{dicData[receiveNotice.grainGrade]}}</td>
 	                                <td>{{receiveNotice.count}}</td>
-	                                <!-- <td>
-	                                	<div ng-switch="{{receiveNotice.inApplication}}">
-		                                    <div ng-switch-when="1">启用</div>
-		                                    <div ng-switch-when="2"><span style='color:#EE9A49;'>暂停</span></div>
-		                                    <div ng-switch-when="3"><span style='color:red;'>终止</span></div>
-	                                    </div>
-	                                </td> -->
 	                                <td>{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-	                                <!-- <td>
-	                                	<div ng-switch="{{receiveNotice.inApplication}}">
-	                                		<a href-void ng-click="showView(receiveNotice.id)"><i class="fa fa-info-circle"></i>查看</a>
-		                                     <div ng-switch-when="1">1:启用 2暂停 3终止
-		                                    	<a has-permission="" href-void ng-click="discontinue(receiveNotice.id)"><i class="fa fa-pause"></i>暂停</a>&emsp;
-		                                    	<a has-permission="" href-void ng-click="finish(receiveNotice.id)"><i class="fa fa-times"></i>终止</a>
-		                                    </div>
-		                                    <div ng-switch-when="2">
-		                                    	<a has-permission="" href-void ng-click="application(receiveNotice.id)"><i class="fa fa-play"></i>启用</a>&emsp;
-		                                    	<a has-permission="" href-void ng-click="finish(receiveNotice.id)"><i class="fa fa-times"></i>终止</a>
-		                                    </div> 
-	                                    </div>
-	                                </td> -->
+	                                <td>{{receiveNotice.htbh}}</td>
 	                                <td>
-	                                	<a href-void ng-click="showView(receiveNotice.id)"><i class="fa fa-info-circle"></i>查看</a>
+	                                	<a href-void ng-click="edit(receiveNotice.id, 'show')"><i class="fa fa-info-circle"></i>查看</a>
+	                                	<a ng-show="receiveNotice.ywtype==3" href-void ng-click="edit(receiveNotice.id, 'glht')"><i class="fa fa-info-circle"></i>关联合同</a>
 	                                </td>
 	                            </tr>
 	                        </tbody>

src/main/resources/static/app/business/module.js

@@ -3447,9 +3447,9 @@ angular.module('app.business')
         })
         
         .state('app.business.grainReservesManage-receiveNotice-view', {
-            url: '/business/grainReservesManage-receiveNotice-view/:id',
+            url: '/business/grainReservesManage-receiveNotice-view/:id/:btnType',
             data: {
-                title: '接收通知单查看'
+                title: '接收通知单详情'
             },
             params:{
                     isNotEdit : true

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -139,7 +139,7 @@
                             <i class="fa fa-fw fa-folder-open"></i>储备粮管理
                         </a>
                         <ul>
-                            <li has-func="272" data-ui-sref-active="active">
+                            <li has-func="478" data-ui-sref-active="active">
                                 <a data-ui-sref="app.business.grainReservesManage-contractReceiveList">接收合同</a>
                             </li>
                             <li has-func="273" data-ui-sref-active="active">

src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -19,7 +19,7 @@
                                     <a href-void class="btn btn-default btn-xs" ng-click="retList()">
                                         <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
                                     </a>
-                                    &nbsp;<strong>原粮粮粮情卡编辑</strong>
+                                    &nbsp;<strong>原粮粮情卡编辑</strong>
                                     <span class="pull-right font-xs" style="color: red;">注意：建卡前请先做自检业务！</span>
                                 </header>
                                 <fieldset>