性质转变单

src/main/resources/static/app/act/util/propertyTS-audit.html

@@ -0,0 +1,81 @@
+<!-- MAIN CONTENT -->
+<div style="position:relative; padding: 0 14px;">
+    <!-- widget grid -->
+    <section id="widget-grid" widget-grid>
+        <!-- START ROW -->
+        <div class="row" style="margin: 0;">
+            <!-- NEW COL START -->
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <!-- Widget ID (each widget will need unique ID)-->
+                <div jarvis-widget id="form-grid-widget"
+                    data-widget-colorbutton="false" data-widget-editbutton="false"
+                    data-widget-custombutton="false">
+                    <!-- widget div-->
+                    <div style="border-top-width:1px; border-width:1px;position:relative;padding: 0; box-sizing: border-box;">
+                        <!-- widget content -->
+                        <div class="widget-body no-padding" style="margin: 0;">
+                            <form id="auditAdivce-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate" >
+                                <header ng-show="isNotEdit"><h3><strong>审批信息</strong></h3></header>
+                                <fieldset ng-show="isNotEdit">
+                                    <div ng-show="isNotEdit" class="form-group has-feedback"  >
+		                                <table class="table table-striped table-bordered table-hover" ng-repeat="audit in auditList" >
+		                                	<tr>
+		                                		<td  rowspan="3" width='10%'  >
+		                                			<label class="label"  style="margin-top: 45%;text-align: center;">{{audit.taskName}}</label>
+		                                		</td>
+		                                		<td>
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">处理人</label>
+		                                		</td>
+		                                		<td width='30%'>
+						                            <section>
+			                                            <label class="input"> 
+			                                                <input class="form-control" type="text" ng-readonly="true"  
+			                                                placeholder="{{userInfoAllData[audit.operator] }}"
+			                                                required>
+			                                            </label>
+			                                        </section>
+		                                		</td>
+		                                		<td >
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">提交部门</label>
+		                                		</td>
+		                                		<td colspan="2" width='30%' style="margin-top: 9px;text-align: center;">
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.fromDepartment}}</label>
+		                                		</td>
+		                                	</tr>
+		                                	<tr>
+		                                		<td rowspan="2">
+		                                			<label class="label" style="margin-top: 20px;text-align: center;">审批意见</label>
+		                                		</td>
+		                                		<td colspan="4" style="margin-top: 9px;text-align: center;">
+		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.content}}</label>
+		                                		</td>
+		                                	</tr>
+		                                	<tr>
+		                                		<td colspan="3" style="border-top: 0px;border-right: 0px;">
+		                                			<!-- 签字前面 -->
+		                                		</td>
+		                                		<td width='30%' style="border-top: 0px;border-left: 0px;">
+		                                		电子签名
+		                                		</td>
+		                                	</tr>
+		                                </table>
+                                    </div>
+                                 
+                                </fieldset>
+	                                <div  ng-show="propertyTSAudit" style=" border-width:1px; position:relative; padding: 12px 14px 12px 12px;">
+	                                    <label class="control-label pull-left" style="font-size:150%">审批意见</label>
+	                                    <textarea  class="form-control"  ng-model="audit.content"  rows="2" data-bv-field="review"></textarea>
+	                                </div>
+	                                <footer class="text-align-center" >
+	                                    <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+	                                    <button type="button" class="btn btn-primary" ng-show="propertyTSAudit" ng-click="submit(audit.content)">通过</button>
+	                                </footer>
+                                
+                            </form>
+                        </div>
+                    </div>
+            </article>
+        </div>
+    </section>
+</div>
+

src/main/resources/static/app/business/contract/controller/grainReservescontractSaveCtrl.js

@@ -340,6 +340,8 @@ angular.module('app.business').controller("grainReservescontractSaveCtrl",
         	}
             $scope.pageInfo = {pageNum : 1, pageSize : 10};
             $scope.searchCondition.ywtype = 3;//合同只接收业务类型是轮换的通知单
+            $scope.searchCondition.auditState = 5;//选择性质转变单审批通过的
+            $scope.searchCondition.isNotice = 0;//选择可以引用的通知单
             if($scope.contract.contractType == 3148){//粮食
             	$scope.lyflag = 1 ; //用于区分粮食和油类的标志 粮食的话取仓房和货位都不为空的 油料取货位为空的
             }else if($scope.contract.contractType == 7131){

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

@@ -104,6 +104,8 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
         		$scope.modelItem.lyflag = 0;
         	}
         	
+        	$scope.modelItem.auditState = 5;//选择审批通过的
+        	$scope.modelItem.isNotice = 0;//选择可以引用的通知单
             var modalInstance = $uibModal.open({
                 size: 'lg',
                 templateUrl: 'app/business/util/views/grainReceiveNotice-list.html',

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

@@ -0,0 +1,88 @@
+angular.module('app.business').controller("propertyTransitionSheetAuditCtrl", function($scope, $http, $state, $uibModal,$stateParams,
+		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
+	
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	$scope.searchCondition = {auditState : 5};
+     // 获取列表数据
+     $scope.loadData = function() {
+    	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
+             $scope.pageInfo = data;
+         },function(data){
+             console.log(data);
+         });
+     }
+     
+     $scope.loadData();
+     
+     // 货位列表
+     $scope.loadWare = function() {
+         warehouseService.getStorehouse($rootScope.depotId, $scope.searchCondition.houseId).then(function(data){
+             $scope.warelist = data.wareList;
+         },function(data){
+             console.log(data);
+         });
+     }
+     
+     // 翻页
+ 	$scope.goPage = function(pageNum) {
+ 		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+      		$scope.pageInfo.pageNum = pageNum;
+      		$scope.loadData();
+      	}
+ 	}
+ 	
+ 	
+    // 查看页面
+ 	$scope.auditView = function(id) {
+        $state.go("app.business.propertyTransitionSheet-audit-pass-view", {id : id});
+    }
+     
+});
+
+angular.module('app.business').controller("propertyTransitionSheetAuditSaveCtrl", function($scope, $http, $state, $uibModal,$stateParams,
+		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
+	
+	/*$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	$scope.searchCondition = {auditState : 5};
+     // 获取列表数据
+     $scope.loadData = function() {
+    	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
+             $scope.pageInfo = data;
+         },function(data){
+             console.log(data);
+         });
+     }*/
+     
+     //$scope.loadData();
+     
+    
+	//根据id加载数据
+	 $scope.loadDataById = function(id) {
+		 receiveNoticeService.getAuditById(id).then(function(data){
+			 $scope.receiveNotice = data.businessNoticeReceive;
+			 $scope.auditList = data.auditList;
+			 $scope.isNotEdit = true;
+			 
+	     },function(data){
+	    	 console.log(data);
+	     });
+       
+	 }
+	 
+	 if($stateParams.id != 0){
+		 $scope.loadDataById($stateParams.id);
+	   	  $scope.propertyTSAudit = false;
+	   	 
+     }
+ 	
+    // 查看页面
+ 	$scope.auditView = function(id) {
+        $state.go("app.business.propertyTransitionSheet-audit-pass-view", {id : id});
+    }
+ 	
+ 	//返回
+	 $scope.retList = function () {
+      $state.go("app.business.propertyTransitionSheet-audit-pass");
+    }
+     
+});

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

@@ -0,0 +1,46 @@
+angular.module('app.business').controller("propertyTransitionSheetCtrl", function($scope, $http, $state, $uibModal,
+		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
+	
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	$scope.searchCondition = {userId : $rootScope.userInfo.userId};
+	
+     // 获取列表数据
+     $scope.loadData = function() {
+    	 receiveNoticeService.getAuditList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
+             $scope.pageInfo = data;
+         },function(data){
+             console.log(data);
+         });
+     }
+     
+     $scope.loadData();
+     
+     // 货位列表
+     $scope.loadWare = function() {
+         warehouseService.getStorehouse($rootScope.depotId, $scope.searchCondition.houseId).then(function(data){
+             $scope.warelist = data.wareList;
+         },function(data){
+             console.log(data);
+         });
+     }
+     
+     // 翻页
+ 	$scope.goPage = function(pageNum) {
+ 		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+      		$scope.pageInfo.pageNum = pageNum;
+      		$scope.loadData();
+      	}
+ 	}
+ 	
+ 	
+    // 查看页面
+    $scope.auditView = function(id) {
+        $state.go("app.business.propertyTransitionSheet-audit-view", {id : id});
+    }
+    
+    //返回
+	 $scope.retList = function () {
+       $state.go("app.business.propertyTransitionSheet-audit");
+     }
+     
+});

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

@@ -0,0 +1,61 @@
+angular.module('app.business').controller("propertyTransitionSheetSaveCtrl", function($scope, $http, $state, $uibModal,
+		receiveNoticeService,$stateParams,warehouseService,$rootScope,APP_CONFIG) {
+	
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	$scope.searchCondition = {userId : $rootScope.userInfo.userId};
+     // 获取列表数据
+     $scope.loadData = function() {
+    	 receiveNoticeService.getAuditList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
+             $scope.pageInfo = data;
+         },function(data){
+             console.log(data);
+         });
+     }
+     
+	//根据id加载数据
+	 $scope.loadDataById = function(id) {
+		 receiveNoticeService.getAuditById(id).then(function(data){
+			 $scope.receiveNotice = data.businessNoticeReceive;
+			 $scope.auditList = data.auditList;
+			 if($scope.receiveNotice.auditState >0 ){
+				 $scope.isNotEdit = true;
+			 }else{
+				 $scope.isNotEdit = false;
+			 }
+	         
+	     },function(data){
+	    	 console.log(data);
+	     });
+        
+	 }
+
+	 if($stateParams.id != 0){
+	   	  $scope.loadDataById($stateParams.id);
+	   	  $scope.propertyTSAudit = true;
+     }
+
+    //返回
+	 $scope.retList = function () {
+       $state.go("app.business.propertyTransitionSheet-audit");
+     }
+	 
+		
+	//审批
+	 $scope.submit = function(content) {
+		 if(content ==null){
+			 content = "同意";
+		 }
+		 receiveNoticeService.audit($scope.receiveNotice,content).then(function(data){
+			 
+             alert("审批通过！");
+             $scope.retList();
+             $scope.loadData();
+	         
+	     },function(data){
+	    	 console.log(data);
+	     });
+        
+	 }
+	 
+     
+});

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

@@ -2,6 +2,8 @@ angular.module('app.business').controller("receiveNoticeCtrl", function($scope,
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
 	
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+
+	$scope.searchCondition = {isNotice : 0};
      // 获取列表数据
      $scope.loadData = function() {
     	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){

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

@@ -18,6 +18,9 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
                 grainKind : searchCondition == undefined ? "" : searchCondition.grainKind,
                 grainGrade : searchCondition == undefined ? "" : searchCondition.grainGrade,
                 grainAttribute : searchCondition == undefined ? "" : searchCondition.grainAttribute,
+                userId : searchCondition == undefined ? "" : searchCondition.userId,
+                auditState : searchCondition == undefined ? "" : searchCondition.auditState,
+                isNotice : searchCondition == undefined ? "" : searchCondition.isNotice,
                 orgId : $rootScope.userInfo.orgId,
                 lyflag : lyflag
             }
@@ -48,6 +51,76 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
         });
         return d.promise;
     }
+    
+    this.getAuditList = function(pageNum, pageSize, searchCondition) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.businessUrl + '/depot/business/propSheet/audit/getList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                ywtype : searchCondition == undefined ? "" : searchCondition.ywtype,
+                cktzd : searchCondition == undefined ? "" : searchCondition.cktzd,
+                crktype : searchCondition == undefined ? "" : searchCondition.crktype,
+                houseId : searchCondition == undefined ? "" : searchCondition.houseId,
+                wareHouseId : searchCondition == undefined ? "" : searchCondition.wareHouseId,
+                noticeNumber : searchCondition == undefined ? "" : searchCondition.noticeNumber,
+                grainKind : searchCondition == undefined ? "" : searchCondition.grainKind,
+                grainGrade : searchCondition == undefined ? "" : searchCondition.grainGrade,
+                grainAttribute : searchCondition == undefined ? "" : searchCondition.grainAttribute,
+                userId : searchCondition == undefined ? "" : searchCondition.userId,
+                orgId : $rootScope.userInfo.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+          
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }  
+    
+    
+    this.audit = function(receiveNotice,content) {
+        var d = $q.defer();
+        $http({
+            method : 'POST',
+            url : APP_CONFIG.businessUrl + '/depot/business/propSheet/audit/audit',
+            data: {
+            	receiveNoticeJson : angular.toJson(receiveNotice),
+                userId : $rootScope.userInfo.userId,
+                realName : $rootScope.userInfo.realName,
+                orgName : $rootScope.orgInfo.orgName,
+                content : content
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+          
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    } 
+    
 
+    this.getAuditById = function(id) {
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.businessUrl + '/depot/business/propSheet/audit/getAudit',
+            params: {
+                id : id
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+        });
+        return d.promise;
+    }
 
 })

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

@@ -0,0 +1,96 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>性质转变单已审批列表</h2>
+                    </header>
+                    <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-10">
+                                    <div class="form-group">
+                                       <label>仓房名称:&emsp;   
+											<select ng-model="searchCondition.houseId" class="form-control input-sm"
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-change="loadWare()">
+												<option value="">请选择</option>
+											</select>&emsp;
+                                       
+                                       </label>&emsp;
+                                       <label>
+                                       		货位名称:&emsp;
+											<select ng-model="searchCondition.wareHouseId" class="form-control input-sm"
+													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+												<option value="">请选择</option>
+											</select>&emsp;
+                                       </label>
+	                                       <label><a class="btn btn-default btn-sm" ng-click="loadData()">
+														<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+													</a>
+										   </label>
+										  
+                                    </div>
+                                </div>
+                                <div class="col-sm-2 col-xs-12 hidden-xs">
+                                    <div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+																ng-options="num as num for num in [1,10,25,50,100]"
+																class="form-control input-sm"></select> 条
+											</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>
+		                            <th> 划转数量(吨)</th>
+		                            <th> 划转时间</th>
+		                            <th> 操作</th>
+		                        </tr>
+	                        </thead>
+	                        
+	                        <tbody>
+	                            <tr ng-repeat="receiveNotice in pageInfo.list">
+	                                <td>{{$index+1}}</td>
+	                                <td>{{receiveNotice.lsxzzbdh}}</td>
+	                                <td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
+	                                <td>
+									    <span ng-if="receiveNotice.wareHouseId != null">{{wares[receiveNotice.wareHouseId].warehouseName}}</span>
+									    <span ng-if="receiveNotice.wareHouseId == null">---</span>
+									</td>
+	                                <td>{{dicData[receiveNotice.grainKind]}}</td>
+	                                <td>{{receiveNotice.lssl}}</td>
+	                                <td>{{dicData[receiveNotice.hzqlsxzdm]}}</td>
+	                                <td>{{dicData[receiveNotice.grainAttribute]}}</td>
+	                                <td>{{receiveNotice.count}}</td>
+	                                <td>{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                                <td>
+	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>查看</a>
+	                                </td>
+	                            </tr>
+	                        </tbody>
+                        </table>
+                        <div smart-include="app/layout/partials/page.tpl.html"></div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

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

@@ -0,0 +1,68 @@
+<!-- MAIN CONTENT -->
+<div id="content" style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
+    <!-- widget grid -->
+    <section id="widget-grid" widget-grid>
+        <!-- START ROW -->
+        <div class="row">
+            <!-- NEW COL START -->
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <!-- Widget ID (each widget will need unique ID)-->
+                <div jarvis-widget id="form-grid-widget"
+                    data-widget-colorbutton="false" data-widget-editbutton="false"
+                    data-widget-custombutton="false">
+                    <!-- widget div-->
+                   <!--  <div> -->
+                        <!-- widget content -->
+                        <div class="widget-body no-padding">
+                            <form id="propertyTSheet-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate" style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
+                                <header>
+									<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>
+								</header>
+                                <fieldset>
+                              
+                              	<div class="col-xs-15 col-sm-15">
+									<table class="table table-striped  table-bordered table-hover" bordercolor="#999999"
+										style="border-style:solid;border-collapse:collapse;" border="1" width="100%">
+	                              		<tr colspan="8">
+	                              			<td>出库通知单计划号</td>
+	                              			<td colspan="5">{{receiveNotice.lsxzzbdh}}</td>
+	                              		</tr>
+	                              		<tr>
+	                              			<td>仓房名称</td>
+	                              			<td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
+	                              			<td>货位名称</td>
+	                              			<td>{{wares[receiveNotice.wareHouseId].warehouseName}}</td>
+	                              			<td>品种</td>
+	                              			<td>{{dicData[receiveNotice.grainKind]}}</td>
+	                              		</tr>
+	                              		<tr>
+	                              			<td>转前性质</td>
+	                              			<td>{{dicData[receiveNotice.grainAttribute]}}</td>
+	                              			<td>转后性质</td>
+	                              			<td>{{dicData[receiveNotice.hzqlsxzdm]}}</td>
+	                              			<td>划转数量(吨)</td>
+	                              			<td>{{receiveNotice.count}}</td>
+	                              		</tr>
+	                              		<tr>
+	                              			<td>仓内粮食数量(吨)</td>
+	                              			<td>{{receiveNotice.lssl}}</td>
+	                              			<td>划转时间</td>
+	                              			<td>{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                              			<td colspan="2"></td>
+	                              		</tr>
+	                              	</table>
+                              	</div>
+                                </fieldset>
+							<!-- </form> -->
+							 <div ng-include="'app/act/util/propertyTS-audit.html'"></div>
+                        </div>
+                    </div>
+            </article>
+		</div>
+		
+	</section>
+	
+</div>

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

@@ -0,0 +1,106 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>性质转变单审批列表</h2>
+                    </header>
+                    <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-10">
+                                    <div class="form-group">
+                                       <label>仓房名称:&emsp;   
+											<select ng-model="searchCondition.houseId" class="form-control input-sm"
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-change="loadWare()">
+												<option value="">请选择</option>
+											</select>&emsp;
+                                       
+                                       </label>&emsp;
+                                       <label>
+                                       		货位名称:&emsp;
+											<select ng-model="searchCondition.wareHouseId" class="form-control input-sm"
+													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+												<option value="">请选择</option>
+											</select>&emsp;
+                                       </label>
+	                                       <label><a class="btn btn-default btn-sm" ng-click="loadData()">
+														<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+													</a>
+										   </label>
+										  
+                                    </div>
+                                </div>
+                                <div class="col-sm-2 col-xs-12 hidden-xs">
+                                    <div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+																ng-options="num as num for num in [1,10,25,50,100]"
+																class="form-control input-sm"></select> 条
+											</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>
+		                            <th> 划转数量(吨)</th>
+		                            <th> 划转时间</th>
+		                            <th> 当前审批节点</th>
+		                            <th> 操作</th>
+		                        </tr>
+	                        </thead>
+	                        
+	                        <tbody>
+	                            <tr ng-repeat="receiveNotice in pageInfo.list">
+	                                <td>{{$index+1}}</td>
+	                                <td>{{receiveNotice.lsxzzbdh}}</td>
+	                                <td>{{storehouseObj[receiveNotice.houseId].storehouseName}}</td>
+	                                <td>
+									    <span ng-if="receiveNotice.wareHouseId != null">{{wares[receiveNotice.wareHouseId].warehouseName}}</span>
+									    <span ng-if="receiveNotice.wareHouseId == null">---</span>
+									</td>
+	                                <td>{{dicData[receiveNotice.grainKind]}}</td>
+	                                <td>{{receiveNotice.lssl}}</td>
+	                                <td>{{dicData[receiveNotice.grainAttribute]}}</td>
+	                                <td>{{dicData[receiveNotice.hzqlsxzdm]}}</td>
+	                                <td>{{receiveNotice.count}}</td>
+	                                <td>{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                                <td>   
+		                                <div ng-switch="{{receiveNotice.auditState}}">
+		                                    <div ng-switch-when="0">仓储部经理审批</div>
+		                                    <div ng-switch-when="1">质检部经理审批</div>
+		                                    <div ng-switch-when="2">统计部经理审批</div>
+		                                    <div ng-switch-when="3">会计部经理审批</div>
+		                                    <div ng-switch-when="4">库领导审批</div>
+	                                    </div>
+	                                </td>
+	                                <td>
+	                                	<a href-void ng-click="auditView(receiveNotice.id)"><i class="fa fa-info-circle"></i>审批</a>
+	                                </td>
+	                            </tr>
+	                        </tbody>
+                        </table>
+						<div smart-include="app/layout/partials/page.tpl.html"></div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

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

@@ -3402,7 +3402,59 @@ angular.module('app.business')
             }
         })
         
+     //---------------------------------性质转变单审批--------------------------------
+        .state('app.business.propertyTransitionSheet-audit', {
+        	url: '/business/propertyTransitionSheet-audit',
+        	data: {
+        		title: '性质转变单审批列表'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'propertyTransitionSheetCtrl',
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-list.html'
+        		}
+        	}
+        })
+        
+         .state('app.business.propertyTransitionSheet-audit-view', {
+        	url: '/business/propertyTransitionSheet-audit-view/:id',
+        	data: {
+        		title: '性质转变单审批详情'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'propertyTransitionSheetSaveCtrl',
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-edit.html'
+        		}
+        	}
+        })
         
+        //已审批性质转变单
+        .state('app.business.propertyTransitionSheet-audit-pass', {
+        	url: '/business/propertyTransitionSheet-audit-pass',
+        	data: {
+        		title: '已审批性质转变单列表'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'propertyTransitionSheetAuditCtrl',
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-audit-list.html'
+        		}
+        	}
+        })
+        
+        .state('app.business.propertyTransitionSheet-audit-pass-view', {
+        	url: '/business/propertyTransitionSheet-audit-pass-view/:id',
+        	data: {
+        		title: '已审批性质转变单详情'
+        	},
+        	views: {
+        		"content@app": {
+        			controller: 'propertyTransitionSheetAuditSaveCtrl',
+        			templateUrl: 'app/business/deliveryStorageNotice/views/propertyTSheet-edit.html'
+        		}
+        	}
+        })
         
 //---------------------------------合同管理------------------------------------------
         .state('app.business.grainReservesContract', {

src/main/resources/static/app/business/util/controller/grainUtilReceiveNoticeCtrl .js

@@ -37,6 +37,13 @@ angular.module('app.business').controller("grainUtilReceiveNoticeCtrl",
         }else{
         	$scope.lyflag = null;
         }
+        if(items.auditState != undefined && items.auditState != null){
+        	$scope.searchCondition.auditState = items.auditState;
+        }
+        if(items.isNotice != undefined && items.isNotice != null){
+        	$scope.searchCondition.isNotice = items.isNotice;
+        }
+        
     }
     
     $scope.loadData(1,10,$scope.searchCondition);

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

@@ -143,6 +143,20 @@
                                 <a data-ui-sref="app.business.grainReservesManage-receiveNotice">接收通知单</a>
                             </li>
                             <li has-func="274" data-menu-collapse>
+                              <a href="#">
+                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>性质转变单管理
+                              </a>
+                              <ul>
+                                    <li has-func="279" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.propertyTransitionSheet-audit">性质转变单审批</a>
+                                    </li>
+                                    <li has-func="280" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.propertyTransitionSheet-audit-pass">已审批性质转变单</a>
+                                    </li>
+                                </ul>
+                            </li>
+                            
+                            <li has-func="274" data-menu-collapse>
                                 <a href="#">
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>合同管理
                                 </a>

src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js

@@ -1,5 +1,6 @@
 "use strict"; // 新增原粮 (补录)
-angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $state, $rootScope, $uibModal, $filter, $stateParams, warehouseService, grainCardService) {
+angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $state, $rootScope, $uibModal, $filter, $stateParams, warehouseService, 
+		grainCardService,receiveNoticeService) {
     // 初始保存对象
     $scope.grainCard = {};
 
@@ -95,16 +96,28 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
                 $scope.grainCard.grainVarietyName = '大豆'
             }*/
 
-            grainCardService.saveGrainOilCardData($scope.grainCard).then(function (data) {
-                if (data.retCode === '200' && data.message === 'success') {
-                    alert("保存成功");
-                    $scope.retList();
-                } else {
-                    alert("保存失败");
+            $scope.searchCondition = {houseId:$scope.grainCard.storehouseId ,wareHouseId:$scope.grainCard.warehouseId,isNotice:1};
+            //未进行审核完成的【性质转变单】，该仓再下一次申请入库验收的时候，会提示，需要将上一次的粮食性质转变单审核完成，才能进行提交。
+            receiveNoticeService.getPageInfo(1, 10,$scope.searchCondition).then(function(data){
+                if(data.list.length>0 && data.list[0].auditState != 5 ){
+                	alert("需要将上一次的粮食性质转变单审批完成，才能进行提交");
+                }else{
+                	grainCardService.saveGrainOilCardData($scope.grainCard).then(function (data) {
+                        if (data.retCode === '200' && data.message === 'success') {
+                            alert("保存成功");
+                            $scope.retList();
+                        } else {
+                            alert("保存失败");
+                        }
+                    }, function (data) {
+                        console.log(data);
+                    });
                 }
-            }, function (data) {
+            },function(data){
                 console.log(data);
             });
+            
+            
         }
     };
 

src/main/resources/static/app/storage/grainCard/controller/productGrainAddCtrl.js

@@ -1,6 +1,6 @@
 "use strict";
 angular.module('app.storage').controller("productGrainAddCtrl",
-    function ($scope, $state, $rootScope, $uibModal, $http, $filter, warehouseService, $stateParams, 
+    function ($scope, $state, $rootScope, $uibModal, $http, $filter, warehouseService, $stateParams,receiveNoticeService, 
     		cerealsCardService, StorehouseService, keeperService, enumService, TankService, productService) {
         // console.log('id: ' + $stateParams.id, $stateParams.spareOne, $stateParams.lypzName);
         // 初始保存对象
@@ -273,16 +273,29 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                 if (!mxpz) {
                     $scope.cerealsCard.spareThree = $scope.grainDetail[0].id;
                 }
-                cerealsCardService.saveData($scope.cerealsCard).then(function (data) {
-                    if (data.retCode === '200' && data.message === 'success') {
-                        alert("保存成功");
-                        $scope.retList();
-                    } else {
-                        alert("保存失败");
-                    }
-                }, function (data) {
+                
+                $scope.searchCondition = {houseId:$scope.cerealsCard.spareOne ,wareHouseId:$scope.cerealsCard.spareTwo,isNotice:1};
+                //未进行审核完成的【性质转变单】，该仓再下一次申请入库验收的时候，会提示，需要将上一次的粮食性质转变单审核完成，才能进行提交。
+                receiveNoticeService.getPageInfo(1, 10,$scope.searchCondition).then(function(data){
+                    if(data.list.length>0 && data.list[0].auditState != 5 ){
+                    	alert("需要将上一次的粮食性质转变单审批完成，才能进行提交");
+                    }else{
+	                    cerealsCardService.saveData($scope.cerealsCard).then(function (data) {
+	                        if (data.retCode === '200' && data.message === 'success') {
+	                            alert("保存成功");
+	                            $scope.retList();
+	                        } else {
+	                            alert("保存失败");
+	                        }
+	                    }, function (data) {
+	                        console.log(data);
+	                    });
+	                    }
+                },function(data){
                     console.log(data);
                 });
+                
+               
             }
         };