...

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

@@ -1,7 +1,8 @@
 angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     function($scope, $http, $filter, $stateParams, $state, $uibModal, $rootScope,agentDepotService,
              deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService, 
-             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, qualitycheckService, warehouseService, $location, APP_CONFIG) {
+             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, 
+             userRoleService, qualitycheckService, warehouseService, mergeNoticeService, $location, APP_CONFIG) {
 
         $scope.deliveryStorageNotice = {};
         $scope.billNumber = {};
@@ -1338,4 +1339,36 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 
                 }
             }
+
+        //合并记录查询
+        $scope.mergeRecord = function(id) {
+        	$scope.modelItem = {};
+        	$scope.modelItem.tzdid = id;//选择可以引用的通知单
+            var modalInstance = $uibModal.open({
+                size: 'lg',
+                templateUrl: 'app/business/deliveryStorageNotice/views/mergeNoticeRecord-modal.html',
+                controller: 'mergeNoticeRecordModalCtrl',
+                resolve: {
+                    // items是一个回调函数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return $scope.modelItem;
+                    }
+                }
+            });
+        }
+    })
+    //合并记录查询
+    .controller("mergeNoticeRecordModalCtrl", function($scope, items, $uibModalInstance, mergeNoticeService) {
+    	mergeNoticeService.findByTzdidQueryList(items.tzdid).then(function(data){
+            $scope.list = data;
+        },function(data){
+            console.log(data);
+        });
+    	
+    	// 关闭模态窗口
+        $scope.cancel = function() {
+            $uibModalInstance.close();
+        }
     });
+//    }

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

@@ -199,6 +199,13 @@
 										<fieldset>
 											<table>
 												<tbody>
+													<tr ng-show="deliveryStorageNotice.isMerge=='0'">
+													    <th>
+															<label label class="label" style="margin-top: 9px;text-align: center;">
+															    <span style="color: #53d9f5;cursor: pointer;font-size: 20px;" ng-click="mergeRecord(deliveryStorageNotice.id)">合并记录</span>
+															</label>
+														</th>
+													</tr>
 													<tr>
 														<th>
 															<label label class="label"

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

@@ -205,6 +205,13 @@
 										<fieldset>
 											<table>
 												<tbody>
+													<tr ng-show="deliveryStorageNotice.isMerge=='0'">
+													    <th>
+															<label label class="label" style="margin-top: 9px;text-align: center;">
+															    <span style="color: #53d9f5;cursor: pointer;font-size: 20px;" ng-click="mergeRecord(deliveryStorageNotice.id)">合并记录</span>
+															</label>
+														</th>
+													</tr>
 													<tr>
 														<th>
 															<label label class="label"

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

@@ -0,0 +1,36 @@
+<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">
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+                            <tr>
+								<th>序号</th>
+								<th>原计划数量(吨)</th>
+								<th>合并后计划数量(吨)</th>
+								<th>合并人</th>
+								<th>合并时间</th>
+							</tr>
+                        </thead>
+                        <tbody>
+                            <tr ng-repeat="item in list">
+                                <td>{{ $index+1 }}</td>
+                                <td>{{ item.jhsl }}</td>
+								<td>{{ item.hbhsl }}</td>
+								<td>{{ item.cjr }}</td>
+								<td>{{ item.cjsj }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/business/mergeNotice/controller/mergeNoticeCtrl.js

@@ -0,0 +1,145 @@
+//合并通知单
+angular.module('app.business').controller("mergeNoticeCtrl", function($scope, $rootScope, $state, $uibModal, mergeNoticeService) {
+	
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+	$scope.search = {orgId : $rootScope.orgInfo.orgId, htbh: null, khmc: null, ch: null};
+     // 获取列表数据
+     $scope.loadData = function() {
+    	 mergeNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).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.add = function() {
+    	$scope.modelItem = {};
+    	var modalInstance = $uibModal.open({
+            size : 'md',
+            templateUrl: 'app/business/mergeNotice/views/mergeNotice-add-modal.html',
+            controller: 'mergeNoticeModalCtrl',
+            resolve: {
+                // items是一个回调函数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return $scope.modelItem;
+                }
+            }
+        });
+
+        // 回调函数.
+        modalInstance.result.then(function (result) {
+            if (result != "undefined" && result != null) {
+            	$state.go("app.business.grainReservesManage.mergeNoticeEdit", {id : 0, htbh : result, btnType: 'add'});
+            }
+        }, function (reason) {
+            console.log(reason);
+        });
+    }
+
+    //查看
+    $scope.showView = function(id) {
+        $state.go("app.business.grainReservesManage.mergeNoticeEdit", {id : id, btnType: 'view'});
+    }
+})
+.controller("mergeNoticeEditCtrl", function($scope, $rootScope, $state, $filter, $stateParams, mergeNoticeService) {
+
+	$scope.btnType = $stateParams.btnType;
+
+	if ($scope.btnType == "add") {//新增
+		$scope.dataStatus = true;
+		//用合同号查询它下面的通知单
+		$scope.searchCondition = {htbh: $stateParams.htbh, orgId: $rootScope.orgInfo.orgId};
+		mergeNoticeService.findByHtbhCondition($scope.searchCondition).then(function(data){
+            $scope.y_list = data;
+            $scope.x_list = data;
+            $scope.x_checked = 0;
+        },function(data){
+            console.log(data);
+        });
+	} else {//查看
+		$scope.dataStatus = false;
+		mergeNoticeService.findByIdList($stateParams.id).then(function(data){
+            $scope.y_list = data.y_list;
+            $scope.x_list = data.x_list;
+            $scope.obj = data.obj;
+        },function(data){
+            console.log(data);
+        });
+	}
+
+    //目标通知单勾选或取消勾选一条数据
+    $scope.selectRadio = function(index) {
+    	$scope.x_checked = index;
+    }
+
+	//合并
+    $scope.save = function() {
+    	//检索被选中的数据
+    	var x_arr = $scope.x_list[$scope.x_checked];
+    	var y_arr = $scope.y_list.filter(item => item.y_checked).filter(item => item.tzdid!=x_arr.tzdid);
+    	if (y_arr.length > 0) {
+            for (var i = 0; i < y_arr.length; i++) {
+            	delete y_arr[i].y_checked;
+            }
+            x_arr.cjr = $rootScope.userInfo.realName;
+            x_arr.cjsj = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
+            delete x_arr.datatype;
+            delete x_arr.y_checked;
+            delete x_arr.zid;
+            $state.go('app.business.grainReservesManage.mergeNoticeSubmit', {x_arr:angular.toJson(x_arr), y_arr:angular.toJson(y_arr)});
+    		
+    	} else {
+    		alert("请最少选择一条原通知单数据,并且不能和目标通知单是同一条！");
+    	}
+    }
+    //取消
+    $scope.retList = function() {
+    	$state.go('app.business.grainReservesManage.mergeNoticeList');
+    }
+})
+.controller("mergeNoticeSubmitCtrl", function($scope, $rootScope, $state, $stateParams, mergeNoticeService, commonUtilService) {
+
+	$scope.x_arr = angular.fromJson($stateParams.x_arr);
+	$scope.y_arr = angular.fromJson($stateParams.y_arr);
+
+	var hbhsl = $scope.x_arr.jhsl;
+	for (var i = 0; i < $scope.y_arr.length; i++) {
+		hbhsl = hbhsl + $scope.y_arr[i].sysl;
+	}
+	$scope.x_arr.hbhsl = hbhsl;
+
+	//提交
+	var validator = $("#mergeNotice-submit-form").validate();
+    $scope.save = function() {
+    	if (validator.form()) {
+    		var flag = confirm("确定要提交吗,合并后不可修改？");
+    		if (!flag) {
+    			return;
+    		}
+    		mergeNoticeService.save($scope.x_arr, $scope.y_arr).then(function(data){
+    			alert(data.msg);
+    			if (data.status == "200") {
+    				$state.go('app.business.grainReservesManage.mergeNoticeList');
+    			}
+    		},function(data){
+    			console.log(data);
+    		});
+    	}
+    }
+    //返回
+    $scope.retList = function() {
+    	$state.go("app.business.grainReservesManage.mergeNoticeEdit", {id : 0, htbh : $scope.x_arr.htbh, btnType: 'add'});
+    }
+});

src/main/resources/static/app/business/mergeNotice/controller/mergeNoticeModalCtrl.js

@@ -0,0 +1,17 @@
+//合并通知单
+angular.module('app.business').controller("mergeNoticeModalCtrl", function($scope, $rootScope, $state, $uibModalInstance, items, mergeNoticeService) {
+
+     // 关闭模态窗口
+     $scope.cancel = function() {
+         $uibModalInstance.close();
+     }
+
+     //查询.
+     $scope.query = function() {
+    	 var validator = $("#mergeNotice-add-form").validate();
+    	 if (validator.form()) {
+    		 $uibModalInstance.close($scope.htbh);
+    	 }
+     }
+
+});

src/main/resources/static/app/business/mergeNotice/service/mergeNoticeService.js

@@ -0,0 +1,103 @@
+"use strict";
+
+angular.module('app.business').service("mergeNoticeService", function($http, $q, APP_CONFIG,$rootScope) {
+    //列表查询
+	this.getPageInfo = function(pageNum, pageSize, search){
+		var d = $q.defer();
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.businessUrl + '/depot/business/businessMergeNotice/findByPageList',
+			params : {
+				pageNum : pageNum,
+				pageSize : pageSize,
+				ch: search.ch,
+                htbh: search.htbh,
+                orgId: search.orgId,
+                khmc: search.khmc
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+
+    //保存
+    this.save = function(x_arr, y_arr){
+        var d = $q.defer();
+        $http({
+            method: 'POST',
+            url: APP_CONFIG.businessUrl + '/depot/business/businessMergeNotice/save',
+            data: {
+            	x_arr : angular.toJson(x_arr),
+            	y_arr : angular.toJson(y_arr)
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            //console.log(response);
+        });
+        return d.promise;
+    }
+    
+    //根据合同编号获取通知单数据列表
+    this.findByHtbhCondition = function(search){
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.businessUrl + '/depot/business/businessMergeNotice/findByHtbhCondition',
+            params: {
+            	orgId : search.orgId,
+            	htbh : search.htbh
+            }
+        }).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+        return d.promise;
+    }
+    
+    //查看
+    this.findByIdList = function(id){
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.businessUrl + '/depot/business/businessMergeNotice/findByIdList',
+            params: {
+            	id : id
+            }
+        }).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+        return d.promise;
+    }
+
+    //按照通知单ID查询通知单合并记录
+    this.findByTzdidQueryList = function(id){
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.businessUrl + '/depot/business/businessMergeNotice/findByTzdidQueryList',
+            params: {
+            	tzdid : id
+            }
+        }).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+        return d.promise;
+    }
+});

src/main/resources/static/app/business/mergeNotice/views/mergeNotice-Edit.html

@@ -0,0 +1,127 @@
+<!-- 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">
+                            <form id="mergeNotice-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%;">
+                                <fieldset>
+									<table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
+										<header>
+										    <h5>要合并的通知单</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
+											<thead>
+											<tr>
+												<th data-class="expand" style="text-align:center;" ng-show="dataStatus"></th>
+												<th data-class="expand" style="text-align:center;">序号</th>
+												<th data-class="expand" style="text-align:center;">通知单编号</th>
+												<th data-class="expand" style="text-align:center;">合同编号</th>
+												<th data-class="expand" style="text-align:center;">粮油品种</th>
+												<th data-class="expand" style="text-align:center;">客户名称</th>
+												<th data-class="expand" style="text-align:center;">仓房名称</th>
+												<th data-class="expand" style="text-align:center;">货位名称</th>
+												<th data-class="expand" style="text-align:center;">计划数量(吨)</th>
+												<th data-class="expand" style="text-align:center;">剩余数量(吨)</th>
+											</tr>
+											</thead>
+											<tbody>
+											<tr ng-repeat="record in y_list">
+												<td style="text-align: center;" ng-show="dataStatus"><input type="checkbox" ng-model="record.y_checked" name="y_checked" /></td>
+												<td style="text-align: center;">{{$index + 1}}</td>
+												<td style="text-align: center;">{{record.tzdbh}}</td>
+												<td style="text-align: center;">{{record.htbh}}</td>
+												<td style="text-align: center;">{{dicData[record.lspz]}}</td>
+												<td style="text-align: center;">{{record.khmc}}</td>
+												<td style="text-align: center;">{{storehouseObj[record.ch].storehouseName}}</td>
+												<td style="text-align: center;">{{wares[record.hwh].warehouseName}}</td>
+												<td style="text-align: center;">{{record.jhsl}}</td>
+												<td style="text-align: center;">{{record.sysl}}</td>
+											</tr>
+											</tbody>
+										</table>
+										<header>
+										    <h5>目标通知单</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover"  >
+											<thead>
+											<tr>
+												<th data-class="expand" style="text-align:center;" ng-show="dataStatus"></th>
+												<th data-class="expand" style="text-align:center;" ng-show="dataStatus">序号</th>
+												<th data-class="expand" style="text-align:center;">通知单编号</th>
+												<th data-class="expand" style="text-align:center;">合同编号</th>
+												<th data-class="expand" style="text-align:center;">粮油品种</th>
+												<th data-class="expand" style="text-align:center;">客户名称</th>
+												<th data-class="expand" style="text-align:center;">仓房名称</th>
+												<th data-class="expand" style="text-align:center;">货位名称</th>
+												<th data-class="expand" style="text-align:center;">计划数量(吨)</th>
+												<th data-class="expand" style="text-align:center;">剩余数量(吨)</th>
+											</tr>
+											</thead>
+											<tbody>
+											<tr ng-repeat="record in x_list">
+											    <td style="text-align: center;" ng-show="dataStatus"><input type="radio" ng-model="x_checked" name="x_checked" ng-value="{{$index}}" ng-click="selectRadio($index)" /></td>
+												<td style="text-align: center;" ng-show="dataStatus">{{$index + 1}}</td>
+												<td style="text-align: center;">{{record.tzdbh}}</td>
+												<td style="text-align: center;">{{record.htbh}}</td>
+												<td style="text-align: center;">{{dicData[record.lspz]}}</td>
+												<td style="text-align: center;">{{record.khmc}}</td>
+												<td style="text-align: center;">{{storehouseObj[record.ch].storehouseName}}</td>
+												<td style="text-align: center;">{{wares[record.hwh].warehouseName}}</td>
+												<td style="text-align: center;">{{record.jhsl}}</td>
+												<td style="text-align: center;">{{record.sysl}}</td>
+											</tr>
+											</tbody>
+										</table>
+										<header ng-hide="dataStatus">
+										    <h5>合并后通知单</h5>
+										</header>
+										<table class="table table-striped table-bordered table-hover" ng-hide="dataStatus">
+											<thead>
+											<tr>
+												<th data-class="expand" style="text-align:center;">通知单编号</th>
+												<th data-class="expand" style="text-align:center;">合同编号</th>
+												<th data-class="expand" style="text-align:center;">粮油品种</th>
+												<th data-class="expand" style="text-align:center;">客户名称</th>
+												<th data-class="expand" style="text-align:center;">仓房名称</th>
+												<th data-class="expand" style="text-align:center;">货位名称</th>
+												<th data-class="expand" style="text-align:center;">合并后计划数量(吨)</th>
+											</tr>
+											</thead>
+											<tbody>
+											<tr>
+												<td style="text-align: center;">{{obj.tzdbh}}</td>
+												<td style="text-align: center;">{{obj.htbh}}</td>
+												<td style="text-align: center;">{{dicData[obj.lspz]}}</td>
+												<td style="text-align: center;">{{obj.khmc}}</td>
+												<td style="text-align: center;">{{storehouseObj[obj.ch].storehouseName}}</td>
+												<td style="text-align: center;">{{wares[obj.hwh].warehouseName}}</td>
+												<td style="text-align: center;">{{obj.hbhsl}}</td>
+											</tr>
+											</tbody>
+										</table>
+									</table>
+								</fieldset>
+								<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="dataStatus" ng-click="save()">合并</button>
+								</footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+
+    </section>
+
+</div>

src/main/resources/static/app/business/mergeNotice/views/mergeNotice-add-modal.html

@@ -0,0 +1,18 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <h4 class="modal-title" id="myModalLabel"></h4>
+    </div>
+    <div class="modal-body">
+        <form id="mergeNotice-add-form" name='mergeNotice-add-form'
+			class="smart-form ng-pristine ng-valid"
+			data-validator-option="validateOptions" novalidate="novalidate">
+			
+  			合同编号：<input class="form-control" ng-model="htbh" name="htbh" required />
+		</form>
+
+    </div>
+    <div class="modal-footer">
+        <button ng-click="query()" type="button" class="btn btn-primary">查询</button>
+        <button ng-click="cancel()" type="button" class="btn btn-default">取消 </button>
+    </div>
+</div>

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

@@ -0,0 +1,94 @@
+<!-- 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>合同编号:
+											<input type="text" class="form-control" ng-model="search.htbh" />
+                                        </label>&emsp;
+                                    	<label>客户名称:
+                                    		<input type="text" class="form-control" ng-model="search.khmc" />
+										</label>&emsp;
+										<label>仓房:
+                                    		<select ng-model="search.ch" class="form-control input-sm"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list">
+                                                    <option value="">请选择</option>
+                                                </select>
+										</label>&emsp;
+                                        <label><a class="btn btn-default btn-sm" ng-click="loadData()">
+												   		<i class="fa fa-search"></i>&nbsp;查&nbsp;询
+												   </a>
+										</label><br>
+                                    	<label>
+                                            <a href-void class="btn btn-primary btn-sm" ng-click="add()"><i class="fa fa-plus"></i>合并通知单</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="obj in pageInfo.list">
+	                                <td>{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</td>
+	                                <td>{{ obj.tzdbh }}</td>
+	                                <td>{{ obj.htbh }}</td>
+	                                <td>{{ dicData[obj.lspz] }}</td>
+	                                <td>{{ obj.khmc }}</td>
+	                                <td>{{ storehouseObj[obj.ch].storehouseName }}</td>
+	                                <td>{{ wares[obj.hwh].warehouseName }}</td>
+	                                <td>{{ obj.jhsl }}</td>
+	                                <td>{{ obj.hbhsl }}</td>
+	                                <td>{{ obj.cjr }}</td>
+	                                <td>{{ obj.cjsj }}</td>
+	                                <td>
+	                                    <a href-void ng-click="showView(obj.id)"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+	                                </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/mergeNotice/views/mergeNotice-submit.html

@@ -0,0 +1,77 @@
+<!-- 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">
+                            <form id="mergeNotice-submit-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%;">
+                                <fieldset>
+									<header>
+									    <h5>合并后的目标通知单</h5>
+									</header>
+									<table class="table table-striped table-bordered table-hover"  >
+										<thead>
+										<tr>
+											<th data-class="expand" style="text-align:center;">目标通知单编号</th>
+											<th data-class="expand" style="text-align:center;">合同编号</th>
+											<th data-class="expand" style="text-align:center;">粮油品种</th>
+											<th data-class="expand" style="text-align:center;">客户名称</th>
+											<th data-class="expand" style="text-align:center;">仓房名称</th>
+											<th data-class="expand" style="text-align:center;">货位名称</th>
+											<th data-class="expand" style="text-align:center;">原计划数量(吨)</th>
+											<th data-class="expand" style="text-align:center;">合并后计划数量(吨)</th>
+										</tr>
+										</thead>
+										<tbody>
+										<tr>
+											<td style="text-align: center;">{{x_arr.tzdbh}}</td>
+											<td style="text-align: center;">{{x_arr.htbh}}</td>
+											<td style="text-align: center;">{{dicData[x_arr.lspz]}}</td>
+											<td style="text-align: center;">{{x_arr.khmc}}</td>
+											<td style="text-align: center;">{{storehouseObj[x_arr.ch].storehouseName}}</td>
+											<td style="text-align: center;">{{wares[x_arr.hwh].warehouseName}}</td>
+											<td style="text-align: center;">{{x_arr.jhsl}}</td>
+											<td style="text-align: center;">{{x_arr.hbhsl}}</td>
+										</tr>
+										</tbody>
+									</table>
+								</fieldset>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+                                            <label class="label">提交人</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="x_arr.cjr" name="cjr" required ng-readonly="true" />
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">提交时间</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="x_arr.cjsj" name="cjsj" required ng-readonly="true" />
+                                            </label>
+                                        </section>
+                                    </div>
+								</fieldset>
+								<footer class="text-align-center" >
+									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+									<button type="button" class="btn btn-primary" ng-click="save()">提交</button>
+								</footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+
+    </section>
+
+</div>

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

@@ -4289,20 +4289,6 @@ angular.module('app.business')
         }
     })
 
-
-    // .state('app.business.grainReservesManage.grainDeliveryStorageNotice-audit-pass', {
-    //     url: '/business/grainDeliveryStorageNotice-audit-pass',
-    //     data: {
-    //         title: '已审批通知单'
-    //     },
-    //     views: {
-    //         "content@app": {
-    //             controller: 'grainDeliveryStorageNoticeAuditPassCtrl',
-    //             templateUrl: 'app/business/deliveryStorageNotice/views/grainDeliveryStorageNotice-audit-pass-list.html'
-    //         }
-    //     }
-    // })
-
     .state('app.business.grainReservesManage.grainStorageNotice-audit-pass-view', {
             url: '/business/grainReservesManage/grainStorageNotice-audit-pass-views/:id/:processInstanceId/:check',
             params: {
@@ -4342,37 +4328,44 @@ angular.module('app.business')
         	}
         })
 
-         /*.state('app.business.grainReservesManage.grainReservesNotice-pass', {
-             url: '/business/grainReservesNotice-pass',
-             params: {
-                 "attributeType" : "3"
-             },
-             data: {
-                 title: '已审批通知单'
-             },
-             views: {
-                 "content@app": {
-                     controller: 'planAuditPassCtrl as datatables',
-                     templateUrl: 'app/business/plan/views/plan-audit-acquisition-pass-list.html'
-                 }
-             }
-         })*/
-
-        /* .state('app.business.grainReservesManage.grainReservesNotice-pass-views', {
-             url: '/business/grainReservesNotice-pass-views/:id/:processInstanceId',
-             data: {
-                 title: '已审批通知单查看'
-             },
-             params:{
-                 isNotEdit : true
-             },
-             views: {
-                 "content@app": {
-                     controller: 'planAuditPassSaveCtrl as datatables',
-                     templateUrl: 'app/business/plan/views/plan-edit.html'
-                 }
-             }
-         })*/
+        /*********合并通知单 start*********/
+        .state('app.business.grainReservesManage.mergeNoticeList', {
+	        url: '/business/grainReservesManage/mergeNoticeList',
+	        data: {
+	            title: '合并通知单'
+	        },
+	        views: {
+	            "content@app": {
+	                controller: 'mergeNoticeCtrl',
+	                templateUrl: 'app/business/mergeNotice/views/mergeNotice-list.html'
+	            }
+	        }
+	    })
+	    .state('app.business.grainReservesManage.mergeNoticeEdit', {
+	        url: '/business/grainReservesManage/mergeNoticeEdit/:id/:htbh/:btnType',
+	        data: {
+	            title: '合并通知单详情'
+	        },
+	        views: {
+	            "content@app": {
+	                controller: 'mergeNoticeEditCtrl',
+	                templateUrl: 'app/business/mergeNotice/views/mergeNotice-Edit.html'
+	            }
+	        }
+	    })
+	    .state('app.business.grainReservesManage.mergeNoticeSubmit', {
+	        url: '/business/grainReservesManage/mergeNoticeSubmit/:x_arr/:y_arr',
+	        data: {
+	            title: '合并通知单提交'
+	        },
+	        views: {
+	            "content@app": {
+	                controller: 'mergeNoticeSubmitCtrl',
+	                templateUrl: 'app/business/mergeNotice/views/mergeNotice-submit.html'
+	            }
+	        }
+	    })
+        /*********合并通知单 end*********/
         //---------------------------------封仓确认单管理 start--------------------------------------
         .state('app.business.grainReservesManage.storageSealedConfirmation', {
             url: '/business/grainReservesManage/storageSealedConfirmation',

src/main/resources/static/app/business/schedule/service/deliveryStorageNoticeScheduleService.js

@@ -11,7 +11,8 @@ angular.module('app.business').service("deliveryStorageNoticeScheduleService", f
                 billType : searchCondition == undefined ? "" : searchCondition.billType, 
                 billNumber : searchCondition == undefined ? "" : searchCondition.billNumber,
         		planBid : searchCondition == undefined ? "" : searchCondition.planBid,
-				rootContractBid : searchCondition == undefined ? "" : searchCondition.rootContractBid
+				rootContractBid : searchCondition == undefined ? "" : searchCondition.rootContractBid,
+				contract : searchCondition == undefined ? "" : searchCondition.contract
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

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

@@ -201,6 +201,9 @@
                                     <li has-func="284" data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.grainReservesManage.grainReservesNotice-pass">已审批通知单</a>
                                     </li>
+                                    <li has-func="549" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.grainReservesManage.mergeNoticeList">合并通知单</a>
+                                    </li>
                                 </ul>
                             </li>
                             <li has-func="511" data-menu-collapse>
@@ -1226,7 +1229,7 @@
                             <!--                                 </ul> -->
                             <!--                             </li> -->
                             <li data-ui-sref-active="active">
-                                <a has-func="148" data-ui-sref="app.storage.qualitycheck.sprlist({type:2})">强检</a>
+                                <a has-func="148" data-ui-sref="app.storage.qualitycheck.sprlist">强检</a>
                             </li>
                             <li data-ui-sref-active="active">
                                 <a has-func="150" data-ui-sref="app.storage.qualitycheck.acklist({type:1})">第三方检验</a>

src/main/resources/static/app/storage/grainAnalysis/controller/selectWeekAnalysisModalCtrl.js

@@ -31,7 +31,7 @@ angular.module('app.storage').controller("selectWeekAnalysisModalCtrl",
     	}
     }
     
-    //构选或取消勾选一条数据
+    //勾选或取消勾选一条数据
     $scope.selectData = function(index, obj) {
     	$scope.list[index].checked = obj.checked;
     	if (!obj.checked) {

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

@@ -93,7 +93,7 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
                 $scope.oilCard.checkTypeName = '移库';
                 $scope.oilCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             }
-            $scope.search = {auditState: 3, houseId: $scope.grainCard.storehouseId, warehouseId: null, applyTime: $scope.rksj};
+            $scope.search = {auditState: 3, houseId: $scope.oilCard.storehouseId, warehouseId: null, applyTime: $scope.rksj};
             pageListService.getPageList(1, 1, $scope.search).then(function (datas) {
             	$scope.pageInfo = datas.data;
                 if ($scope.pageInfo.list.length > 0) {

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

@@ -220,7 +220,7 @@
                                             	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[GrainCardByIdObj.storehouseId].wall]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].useDate.toString().substring(0,4)}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].usedate.toString().substring(0,4)}}</td>
                                                 <td rowspan="6" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
                                                     <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
                                                         <img style="width:180px;height:240px;" src="{{bgyurl}}">

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

@@ -92,7 +92,7 @@
 											<td class="text-center">
 												<!--保存:1,提交:2, 借用通过编号 区分手动补录,和推送数据-->
 												<a href-void ng-click="foodSituation(gainCard.id,gainCard.storehouseNum,gainCard.warehouseNum,gainCard.storehouseId,gainCard.warehouseId,gainCard.grainRemark,gainCard.flagType,gainCard.grainVarietyNum,gainCard.qualitycheckId)"><i class="fa fa-info-circle"></i>粮情卡</a>
-												<a ng-hide="isArchive || gainCard.flagType=='2'" href-void ng-click="gainCardUpdate(gainCard.id, gainCard.storehouseNum, gainCard.storehouseId)">修改</a>
+<!-- 												<a ng-hide="isArchive || gainCard.flagType=='2'" href-void ng-click="gainCardUpdate(gainCard.id, gainCard.storehouseNum, gainCard.storehouseId)">修改</a> -->
 											</td>
 										</tr>
 									</tbody>

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

@@ -267,7 +267,7 @@
                                     <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-click="save(1)">保存</button>
+<!--                                             <button type="button" class="btn btn-primary" ng-click="save(1)">保存</button> -->
                                             <button type="button" class="btn btn-primary" ng-click="save(2)">提交</button>
                                         </footer>
                                     </div>

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

@@ -210,7 +210,7 @@
                                     <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-click="save(1)">保存</button>
+<!--                                             <button type="button" class="btn btn-primary" ng-click="save(1)">保存</button> -->
                                             <button type="button" class="btn btn-primary" ng-click="save(2)">提交</button>
                                         </footer>
                                     </div>

src/main/resources/static/app/storage/grainCard/views/productGrain-add.html

@@ -30,7 +30,7 @@
                                     <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-click="save(0)">保存</button>
+<!--                                             <button type="button" class="btn btn-primary" ng-click="save(0)">保存</button> -->
                                             <button type="button" class="btn btn-primary" ng-click="save(1)">提交</button>
                                         </footer>
                                     </div>

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

@@ -77,7 +77,7 @@
                                         <td class="text-center">{{cereals.jkrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                         <td class="text-center">
                                             <a href-void ng-click="checkProductGrainList(cereals.id,cereals.spareFour)">粮情卡</a>
-                                            <a ng-hide="isArchive || cereals.dataStatus == '1'" href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
+<!--                                             <a ng-hide="isArchive || cereals.dataStatus == '1'" href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a> -->
                                         </td>
                                     </tr>
                                     </tbody>

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

@@ -1443,8 +1443,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 },
                 views: {
                     "content@app": {
-                        controller: 'sptDsfzjCtrl',
-                        templateUrl: 'app/storage/views/qualitycheck/qualitycheck-acceptcheck-list.html'
+                        controller: 'sptQjCtrl',
+                        templateUrl: 'app/storage/views/qualitycheck/qualitycheck-qj-list.html'
                     }
                 }
             })

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-acceptcheck-list.html

@@ -8,8 +8,7 @@
                 <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>&nbsp;</span>
-						<span ng-if="type=='2'"><h2>&nbsp;&nbsp;强检信息列表 </h2></span>
-						<span ng-if="type=='1'"><h2>&nbsp;&nbsp;第三方检验信息列表 </h2></span>
+						<span><h2>&nbsp;&nbsp;第三方检验信息列表 </h2></span>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -18,15 +17,11 @@
 								<div class="col-xs-12 col-sm-9">
 									<div class="form-group">
 										<label> 仓房/油罐名称:&emsp;
-											<input ng-model="search.cfmc" class="form-control input-sm"/>
-											&emsp;
-										</label>
-										<label> 委托品种:&emsp;
-											<input ng-model="search.pzmc" class="form-control input-sm"/>
+											<input ng-model="search.cfmc" class="form-control" style="width: 93px;" />
 											&emsp;
 										</label>
 										<label> 委托书编号:&emsp;
-											<input ng-model="search.wtsbh" class="form-control input-sm"/>
+											<input ng-model="search.wtsbh" class="form-control"/>
 											&emsp;
 										</label>
 										<label>
@@ -74,7 +69,7 @@
 								<td>{{qualitycheck.entrustDate}}</td>
 								<td>{{qualitycheck.finishDate}}</td>
                         		<td>
-									 <a  href-void ng-click="showViewAck(qualitycheck.fid,type)"><i class="fa fa-info-circle"></i>查看</a>
+									 <a  href-void ng-click="showViewAck(qualitycheck.inspectAttachment)"><i class="fa fa-info-circle"></i>查看</a>
                         		</td>
                         	</tr>
                         </tbody>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-qj-list.html

@@ -0,0 +1,86 @@
+<!-- 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>&nbsp;</span>
+						<span ng-if="type=='2'"><h2>&nbsp;&nbsp;强检信息列表 </h2></span>
+						<span ng-if="type=='1'"><h2>&nbsp;&nbsp;第三方检验信息列表 </h2></span>
+                    </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-9">
+									<div class="form-group">
+										<label> 委托书编号:&emsp;
+											<input ng-model="search.wtbh" class="form-control input-sm"/>
+											&emsp;
+										</label>
+										<label> 委托年度:&emsp;
+											<input ng-model="search.wtnd" id="wtnd" class="form-control Wdate" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy'})" />
+											&emsp;
+										</label>
+										<label> 委托部门:&emsp;
+											<input ng-model="search.wtbm" class="form-control input-sm"/>
+											&emsp;
+										</label>
+										<a class="btn btn-default btn-sm" ng-click="loadData()">
+											<i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+									</div>
+								</div>
+
+								<div class="col-sm-3 col-xs-6 hidden-xs">
+									<div class="dataTables_length">
+										<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+															ng-options="num as num for num in [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 data-hide="phone">序号</th>
+							<th data-class="expand">委托书编号</th>
+							<th data-class="expand">委托年度</th>
+							<th data-class="expand">委托日期</th>
+							<th data-class="expand">委托部门</th>
+							<th data-hide="phone,tablet"> 操作</th>
+						</tr>
+						</thead>
+
+							<tbody>
+							<tr ng-repeat="qualitycheck in pageInfo.list">
+								<th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th> 
+								<td>{{qualitycheck.entrustNum}}</td>
+								<td>{{qualitycheck.annual}}</td>
+								<td>{{qualitycheck.entrustDate.substring(0,10)}}</td>
+								<td>{{qualitycheck.deptName}}</td>
+                        		<td>
+									 <a href-void ng-click="showfile(qualitycheck.reportAttachment)"><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>
+    <form id="qj-download-form" method="post" target="_blank">
+		<input type="hidden" name="fileName" id="fileName">
+		<input type="hidden" name="filePaths" id="filePaths">
+	</form>
+</div>

src/main/resources/static/app/supervise/controller/sptCtrl.js

@@ -251,10 +251,43 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function ($scope, $r
 
     })
 
+    //强检
+    .controller("sptQjCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
+
+        // 获取列表数据
+        $scope.search = {kqdm: $rootScope.orgInfo.kqbm, wtbh: null, wtnd: null, wtbm: null};
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.loadData = function () {
+            $scope.search.wtnd = $("#wtnd").val();
+            sptService.getQjListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+                if (data.code == 200) {
+                    $scope.pageInfo = data.data;
+                }
+            }, function (data) {
+                console.log(data);
+            });
+        };
+
+        $scope.loadData();
+
+        // 翻页
+        $scope.goPage = function (pageNum) {
+            $scope.pageInfo.pageNum = pageNum;
+            $scope.loadData();
+        };
+
+        // 查看页面
+        $scope.showfile = function (id) {
+        	var url =  APP_CONFIG.depotStorageUrl + '/lawRegulationInfo/download?fileId=' + id
+    		//window.open(url);
+        	window.location.href = url;
+        }
+    })
+    //第三方质检
     .controller("sptDsfzjCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
 
         // 获取列表数据
-        $scope.search = {pageType: 1, cfmc: null, pzmc: null, wtsbh: null};
+        $scope.search = {pageType: 2, cfmc: null, pzmc: null, wtsbh: null};
         $scope.pageInfo = {pageNum: 1, pageSize: 10};
         $scope.type = $stateParams.type;
         $scope.loadData = function () {
@@ -284,14 +317,13 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function ($scope, $r
 
         // 查看页面
         $scope.showViewAck = function (id, type) {
-            if (type == 1) {//第三方
-                $state.go('app.storage.qualitycheck.acksptedit', {id: id, isNotEdit: true});
-            } else if (type == 2) {//强检
-                $state.go('app.storage.qualitycheck.sprsptedit', {id: id, isNotEdit: true});
-            }
+        	//$state.go('app.storage.qualitycheck.acksptedit', {id: id, isNotEdit: true});
+        	var url =  APP_CONFIG.depotStorageUrl + '/lawRegulationInfo/download?fileId=' + id
+    		//window.open(url);
+        	window.location.href = url;
         }
     })
-
+    //第三方质检详情
     .controller("sptDsfzjViewCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
 
         $scope.loadDataById = function (id) {

src/main/resources/static/app/supervise/service/sptService.js

@@ -278,15 +278,35 @@ angular.module('app.supervise').service("sptService", function($http, $q, APP_CO
         });
         return d.promise;
     }
-    
-    
+
+    /**
+     * 获取市平台强检数据
+     */
+    this.getQjListPageInfo = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getQjList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqdm : search.kqdm,
+                wtbh : search.wtbh,
+                wtnd : search.wtnd,
+                wtbm : search.wtbm
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
     /**
      * 获取第三方质检数据
-     * $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.kdmc, $scope.search.pageType, 
-				$scope.search.cfmc, $scope.search.pzmc,$scope.search.startTime, $scope.search.endTime
-				
-				Integer pageNum, Integer pageSize, Integer pageType, String kqmc, 
-			String cfmc, String pzmc, String wtsbh, String wtkssj, String wtjssj
      */
     this.getDsfzjListPageInfo = function(pageNum, pageSize, kqmc, pageType, cfmc,pzmc, startTime, endTime,wtsbh) {
         var d = $q.defer();
@@ -390,4 +410,20 @@ angular.module('app.supervise').service("sptService", function($http, $q, APP_CO
         });
         return d.promise;
     }
+
+    //获取市平台文件全路径
+    this.getSptFilePath = function(id) {
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.depotStorageUrl + '/spt/getSptFilePath',
+            params: {
+            	id : id
+            }
+        }).then(function successCallback(response) {
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+        });
+        return d.promise;
+    }
 });

src/main/resources/static/app/warnAndAlarm/emptyInOrSpace/controller/emptyInOrSpaceListCtrl.js

@@ -1,129 +1,20 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('emptyInOrSpaceListCtrl', function ($scope, $rootScope) {
+//空进空出预警
+angular.module('app.warnAndAlarm').controller('emptyInOrSpaceListCtrl', function ($scope, $rootScope, emptyInOrSpaceService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {rkcl: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "lastPage": 1,
-            "navigatepageNums": [
-                1
-            ],
-            "startRow": 1,
-            "hasNextPage": false,
-            "prePage": 0,
-            "nextPage": 0,
-            "endRow": 4,
-            "pageSize": 10,
-            "list": [
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-28",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 3,
-                    "clrmc": "自动",
-                    "id": "b3106a875b7e4d3281fdfb846ddb2f72"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-28",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-27",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "test",
-                    "cfmc": "107号仓",
-                    "clfs": 0,
-                    "bjlx": 3,
-                    "clrmc": "储备粮11",
-                    "id": "4e2697d5d0784da3872e6e681882aa45"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-05",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 1,
-                    "clrmc": "自动",
-                    "id": "8ae33c4f545347ea8f2762cf9deadd97"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-13",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 2,
-                    "clrmc": "自动",
-                    "id": "ebf92d2fa5b24ca29d192352f74d9153"
-                }
-            ],
-            "pageNum": 1,
-            "navigatePages": 8,
-            "navigateFirstPage": 1,
-            "total": 4,
-            "pages": 1,
-            "firstPage": 1,
-            "size": 4,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "navigateLastPage": 1,
-            "isFirstPage": true
-        };
+    	emptyInOrSpaceService.getKjkcyjPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
-    // 处理记录
-    $scope.showProcessDetectionList = function (id) {
-        console.log(id);
-    };
-
     // 翻页
     $scope.goPage = function (pageNum) {
         $scope.pageInfo.pageNum = pageNum;
@@ -132,7 +23,7 @@ angular.module('app.warnAndAlarm').controller('emptyInOrSpaceListCtrl', function
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.rkcl = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/emptyInOrSpace/service/emptyInOrSpaceService.js

@@ -1,4 +1,25 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("emptyInOrSpaceService", function ($http, $q, APP_CONFIG, $rootScope) {
 
+	//空进空出预警列表
+    this.getKjkcyjPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getKjkcyjPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : search.orgId,
+                rkcl : search.rkcl
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 });

src/main/resources/static/app/warnAndAlarm/emptyInOrSpace/views/emptyInOrSpace-list.html

@@ -17,7 +17,7 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <label>车辆信息:
-                                            <input class="form-control" type="text" ng-model="cfmc" name="cfmc" />
+                                            <input class="form-control" type="text" ng-model="search.rkcl" />
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -45,20 +45,16 @@
                                             <th data-class="expand" style="text-align:center;">第一次称重重量(kg)</th>
                                             <th data-class="expand" style="text-align:center;">第二次称重重量(kg)</th>
                                             <th data-class="expand" style="text-align:center;">预警时间</th>
-                                            <th data-class="expand" style="text-align:center;">操作</th>
                                         </tr>
                                         </thead>
 
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
-                                            <td style="text-align:center;">{{ warning.pzmc }}</td>
-                                            <td style="text-align:center;">{{ warning.jhsl }}</td>
-                                            <td style="text-align:center;">{{ warning.kssj }}—{{ warning.jssj }}</td>
-                                            <td style="text-align:center;">
-                                                <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>处理记录</a>
-                                            </td>
+                                            <td style="text-align:center;">{{ warning.rkcl }}</td>
+                                            <td style="text-align:center;">{{ warning.firstCzzl }}</td>
+                                            <td style="text-align:center;">{{ warning.secondCzzl }}</td>
+                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/warnAndAlarm/issueAnIOU/controller/issueAnIOUListCtrl.js

@@ -1,127 +1,36 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('issueAnIOUListCtrl', function ($scope, $rootScope) {
+angular.module('app.warnAndAlarm').controller('issueAnIOUListCtrl', function ($scope, $rootScope, $uibModal, issueAnIOUService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "lastPage": 1,
-            "navigatepageNums": [
-                1
-            ],
-            "startRow": 1,
-            "hasNextPage": false,
-            "prePage": 0,
-            "nextPage": 0,
-            "endRow": 4,
-            "pageSize": 10,
-            "list": [
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-28",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 3,
-                    "clrmc": "自动",
-                    "id": "b3106a875b7e4d3281fdfb846ddb2f72"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-28",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-27",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "test",
-                    "cfmc": "107号仓",
-                    "clfs": 0,
-                    "bjlx": 3,
-                    "clrmc": "储备粮11",
-                    "id": "4e2697d5d0784da3872e6e681882aa45"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-05",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 1,
-                    "clrmc": "自动",
-                    "id": "8ae33c4f545347ea8f2762cf9deadd97"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-13",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 2,
-                    "clrmc": "自动",
-                    "id": "ebf92d2fa5b24ca29d192352f74d9153"
-                }
-            ],
-            "pageNum": 1,
-            "navigatePages": 8,
-            "navigateFirstPage": 1,
-            "total": 4,
-            "pages": 1,
-            "firstPage": 1,
-            "size": 4,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "navigateLastPage": 1,
-            "isFirstPage": true
-        };
+    	issueAnIOUService.getDbtyjPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
     // 处理记录
     $scope.showProcessDetectionList = function (id) {
-        console.log(id);
+        // 初始参数
+        var params = [];
+        params.id = id;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/inspectionReport/views/storageAlarmRecord-modal.html',
+            controller: 'storageAlarmRecordModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
     };
 
     // 翻页
@@ -132,7 +41,7 @@ angular.module('app.warnAndAlarm').controller('issueAnIOUListCtrl', function ($s
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.cfmc = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/issueAnIOU/service/issueAnIOUService.js

@@ -1,4 +1,25 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("issueAnIOUService", function ($http, $q, APP_CONFIG, $rootScope) {
 
+	//打白条预警列表
+    this.getDbtyjPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getDbtyjPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : search.orgId,
+                cfmc : search.cfmc
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 });

src/main/resources/static/app/warnAndAlarm/issueAnIOU/views/issueAnIOU-list.html

@@ -17,10 +17,7 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <label>仓房名称:
-                                            <select ng-model="search.cfbm" class="form-control input-sm"
-                                                    ng-options="store.cfbm as store.storehouseName for store in storelist">
-                                                <option value="">请选择</option>
-                                            </select>&emsp;
+                                            <input type="text" ng-model="search.cfmc" class="form-control" />&emsp;
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -53,6 +50,7 @@
                                             <th data-class="expand" style="text-align:center;">通知单完成时间</th>
                                             <th data-class="expand" style="text-align:center;">数量(吨)</th>
                                             <th data-class="expand" style="text-align:center;">已结算数量(吨)</th>
+                                            <th data-class="expand" style="text-align:center;">未结算数量(吨)</th>
                                             <th data-class="expand" style="text-align:center;">预警时间</th>
                                             <th data-class="expand" style="text-align:center;">状态</th>
                                             <th data-class="expand" style="text-align:center;">操作</th>
@@ -62,15 +60,16 @@
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
+                                            <td style="text-align:center;">{{ warning.tzdh }}</td>
                                             <td style="text-align:center;">{{ warning.cfmc }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
+                                            <td style="text-align:center;">{{ warning.hwmc }}</td>
                                             <td style="text-align:center;">{{ warning.pzmc }}</td>
-                                            <td style="text-align:center;">{{ warning.jssj }}</td>
-                                            <td style="text-align:center;">{{ warning.jhsl }}</td>
-                                            <td style="text-align:center;">{{ warning.jhsl }}</td>
-                                            <td style="text-align:center;">{{ warning.kssj }}</td>
-                                            <td style="text-align:center;">{{ warning.clfs }}</td>
+                                            <td style="text-align:center;">{{ warning.tzdwcsj }}</td>
+                                            <td style="text-align:center;">{{ warning.sl }}</td>
+                                            <td style="text-align:center;">{{ warning.yjssl }}</td>
+                                            <td style="text-align:center;">{{ warning.wjssl }}</td>
+                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.approvalStatusName }}</td>
                                             <td style="text-align:center;">
                                                 <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>处理记录</a>
                                             </td>

src/main/resources/static/app/warnAndAlarm/lossWarning/controller/lossWarningListCtrl.js

@@ -1,129 +1,21 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('lossWarningListCtrl', function ($scope, $rootScope) {
+//亏库预警
+angular.module('app.warnAndAlarm').controller('lossWarningListCtrl', function ($scope, $rootScope, lossWarningService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {bjsj: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "lastPage": 1,
-            "navigatepageNums": [
-                1
-            ],
-            "startRow": 1,
-            "hasNextPage": false,
-            "prePage": 0,
-            "nextPage": 0,
-            "endRow": 4,
-            "pageSize": 10,
-            "list": [
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-28",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 3,
-                    "clrmc": "自动",
-                    "id": "b3106a875b7e4d3281fdfb846ddb2f72"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-28",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-27",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "test",
-                    "cfmc": "107号仓",
-                    "clfs": 0,
-                    "bjlx": 3,
-                    "clrmc": "储备粮11",
-                    "id": "4e2697d5d0784da3872e6e681882aa45"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-05",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 1,
-                    "clrmc": "自动",
-                    "id": "8ae33c4f545347ea8f2762cf9deadd97"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-13",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 2,
-                    "clrmc": "自动",
-                    "id": "ebf92d2fa5b24ca29d192352f74d9153"
-                }
-            ],
-            "pageNum": 1,
-            "navigatePages": 8,
-            "navigateFirstPage": 1,
-            "total": 4,
-            "pages": 1,
-            "firstPage": 1,
-            "size": 4,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "navigateLastPage": 1,
-            "isFirstPage": true
-        };
+    	$scope.search.bjsj = $("#bjsj").val();
+    	lossWarningService.getKkyjPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
-    // 处理记录
-    $scope.showProcessDetectionList = function (id) {
-        console.log(id);
-    };
-
     // 翻页
     $scope.goPage = function (pageNum) {
         $scope.pageInfo.pageNum = pageNum;
@@ -132,7 +24,7 @@ angular.module('app.warnAndAlarm').controller('lossWarningListCtrl', function ($
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.bjsj = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/lossWarning/service/lossWarningService.js

@@ -1,4 +1,27 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("lossWarningService", function ($http, $q, APP_CONFIG, $rootScope) {
 
+	/**
+     * 获取亏库预警列表
+     */
+    this.getKkyjPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getKkyjPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                bjsj : search.bjsj,
+                orgId : search.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

src/main/resources/static/app/warnAndAlarm/lossWarning/views/lossWarning-list.html

@@ -16,11 +16,8 @@
                             <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">
-                                        <label>承储企业:
-                                            <input class="form-control" type="text" ng-model="cfmc" name="cfmc" />&emsp;
-                                        </label>
                                         <label>报警日期:
-                                            <input style="width: 100px;" class="form-control" type="text" ng-model="search.searchStartDate" name="searchStartDate" data-smart-datepicker>
+                                            <input type="text" ng-model="search.bjsj" id="bjsj" class="form-control Wdate" onClick="WdatePicker({lang:'zh-cn'})" />
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -44,22 +41,26 @@
                                         <thead>
                                         <tr>
                                             <th data-class="expand" style="text-align:center;">序号</th>
-                                            <th data-class="expand" style="text-align:center;">承储单位</th>
-                                            <th data-class="expand" style="text-align:center;">仓号</th>
-                                            <th data-class="expand" style="text-align:center;">预警信息</th>
+                                            <th data-class="expand" style="text-align:center;">协议编号</th>
+                                            <th data-class="expand" style="text-align:center;">轮换年度</th>
+                                            <th data-class="expand" style="text-align:center;">品种</th>
+                                            <th data-class="expand" style="text-align:center;">架空期</th>
+                                            <th data-class="expand" style="text-align:center;">截止日期应轮入数量(吨)</th>
+                                            <th data-class="expand" style="text-align:center;">剩余应轮入数量(吨)</th>
                                             <th data-class="expand" style="text-align:center;">预警时间</th>
-                                            <th data-class="expand" style="text-align:center;">操作人</th>
                                         </tr>
                                         </thead>
 
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
-                                            <td style="text-align:center;">{{ warning.cfmc }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
-                                            <td style="text-align:center;">{{ warning.jhsl }}</td>
-                                            <td style="text-align:center;">{{ warning.clfs }}</td>
+                                            <td style="text-align:center;">{{ warning.xybh }}</td>
+                                            <td style="text-align:center;">{{ warning.lhnd }}</td>
+                                            <td style="text-align:center;">{{ warning.lspzmc }}</td>
+                                            <td style="text-align:center;">{{ warning.jkq }}</td>
+                                            <td style="text-align:center;">{{ warning.ylrsl }}</td>
+                                            <td style="text-align:center;">{{ warning.sysl }}</td>
+                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/warnAndAlarm/storageOverLimit/controller/storeProcessListCtrl.js

@@ -1,62 +1,36 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function ($scope, $rootScope) {
+angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function ($scope, $rootScope, $uibModal, storageOverLimitService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "pageNum": 1,
-            "pageSize": 10,
-            "size": 2,
-            "startRow": 1,
-            "endRow": 2,
-            "total": 2,
-            "pages": 1,
-            "list": [
-                {
-                    "id": "cafad3641c6e4c238f7afe5bb577eb5e",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680135",
-                    "ch": "309号仓",
-                    "gzcwdsl": 756,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-29 23:09:01"
-                },
-                {
-                    "id": "66d83e5bc77c42d3ac7b1785efc10d81",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680010",
-                    "ch": "10号仓",
-                    "gzcwdsl": 720,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-30 00:00:36"
-                }
-            ],
-            "prePage": 0,
-            "nextPage": 0,
-            "isFirstPage": true,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "hasNextPage": false,
-            "navigatePages": 8,
-            "navigatepageNums": [
-                1
-            ],
-            "navigateFirstPage": 1,
-            "navigateLastPage": 1,
-            "firstPage": 1,
-            "lastPage": 1
-        };
+    	storageOverLimitService.getCcgcPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
-    $scope.showStoreProcessView = function() {
-
+    // 处理记录
+    $scope.showProcessDetectionList = function (id) {
+        // 初始参数
+        var params = [];
+        params.id = id;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/inspectionReport/views/storageAlarmRecord-modal.html',
+            controller: 'storageAlarmRecordModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
     };
 
     // 翻页
@@ -67,7 +41,7 @@ angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function (
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.cfmc = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/storageOverLimit/controller/storeTaskProcessListCtrl.js

@@ -1,57 +1,16 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', function ($scope, $rootScope) {
+angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', function ($scope, $rootScope, storageOverLimitService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {rkcl: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "pageNum": 1,
-            "pageSize": 10,
-            "size": 2,
-            "startRow": 1,
-            "endRow": 2,
-            "total": 2,
-            "pages": 1,
-            "list": [
-                {
-                    "id": "cafad3641c6e4c238f7afe5bb577eb5e",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680135",
-                    "ch": "309号仓",
-                    "gzcwdsl": 756,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-29 23:09:01"
-                },
-                {
-                    "id": "66d83e5bc77c42d3ac7b1785efc10d81",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680010",
-                    "ch": "10号仓",
-                    "gzcwdsl": 720,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-30 00:00:36"
-                }
-            ],
-            "prePage": 0,
-            "nextPage": 0,
-            "isFirstPage": true,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "hasNextPage": false,
-            "navigatePages": 8,
-            "navigatepageNums": [
-                1
-            ],
-            "navigateFirstPage": 1,
-            "navigateLastPage": 1,
-            "firstPage": 1,
-            "lastPage": 1
-        };
+    	storageOverLimitService.getRkzygcPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
@@ -63,7 +22,7 @@ angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', functi
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.rkcl = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/storageOverLimit/service/storageOverLimitService.js

@@ -1,4 +1,51 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("storageOverLimitService", function ($http, $q, APP_CONFIG, $rootScope) {
 
+	/**
+     * 获取入库作业过程列表
+     */
+    this.getRkzygcPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getRkzygcPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                rkcl : search.rkcl,
+                orgId : search.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
+    /**
+     * 获取存储过程列表
+     */
+    this.getCcgcPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getCcgcPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                cfmc : search.cfmc,
+                orgId : search.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

src/main/resources/static/app/warnAndAlarm/storageOverLimit/views/storeProcess-list.html

@@ -18,8 +18,8 @@
                                 <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">
-                                            <label>车辆信息:
-                                                <input class="form-control" type="text" ng-model="cfmc" name="cfmc" />
+                                            <label>仓房名称:
+                                                <input class="form-control" type="text" ng-model="search.cfmc" />
                                             </label>
                                             <a class="btn btn-default btn-sm" ng-click="loadData()">
                                                 <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -60,12 +60,12 @@
                                                 <td style="text-align:center;">{{ warning.lyxz }}</td>
                                                 <td style="text-align:center;">{{ warning.pzmx }}</td>
                                                 <td style="text-align:center;">{{ warning.scnf }}</td>
-                                                <td style="text-align:center;">{{ warning.hdcr | number : 3 }}</td>
-                                                <td style="text-align:center;">{{ warning.kcsl  | number : 3 }}</td>
-                                                <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                                <td style="text-align:center;">{{ warning.hdcr }}</td>
+                                                <td style="text-align:center;">{{ warning.kcsl }}</td>
                                                 <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                                <td style="text-align:center;">{{ warning.shzt }}</td>
                                                 <td style="text-align:center;">
-                                                    <a href-void ng-click="showStoreProcessView(warning.id)"><i class=""></i>查看记录</a>
+                                                    <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>查看记录</a>
                                                 </td>
                                             </tr>
                                             </tbody>

src/main/resources/static/app/warnAndAlarm/storageOverLimit/views/storeTaskProcess-list.html

@@ -15,7 +15,7 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <label>车辆信息:
-                                            <input class="form-control" type="text" ng-model="cfmc" name="cfmc" />
+                                            <input class="form-control" type="text" ng-model="search.rkcl" />
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -50,14 +50,14 @@
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.cfmc }}</td>
+                                            <td style="text-align:center;">{{ warning.rkcl }}</td>
                                             <td style="text-align:center;">{{ warning.cfmc }}</td>
                                             <td style="text-align:center;">{{ warning.lyxz }}</td>
-                                            <td style="text-align:center;">{{ warning.pzmx }}</td>
+                                            <td style="text-align:center;">{{ warning.pzmc }}</td>
                                             <td style="text-align:center;">{{ warning.scnf }}</td>
-                                            <td style="text-align:center;">{{ warning.hdcr | number : 3 }}</td>
-                                            <td style="text-align:center;">{{ warning.kcsl  | number : 3 }}</td>
-                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.hdcr }}</td>
+                                            <td style="text-align:center;">{{ warning.kcsl }}</td>
+                                            <td style="text-align:center;">{{ warning.bjnr }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>
                                         </tbody>

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/controller/unauthorizedOperationListCtrl.js

@@ -1,4 +1,5 @@
 "use strict";
+//擅自动用或置换预警
 angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', function ($scope, $rootScope, unauthorizedOperationService) {
 
     // 获取列表数据

src/main/resources/static/app/warnAndAlarm/zqlWarning/controller/zqlWarningListCtrl.js

@@ -3,15 +3,11 @@ angular.module('app.warnAndAlarm').controller('zqlWarningListCtrl', function ($s
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
-    $scope.search = {cphm: null, mxpz: null, startTime: null, endTime: null};
+    $scope.search = {bjrq: null, orgId: $rootScope.orgInfo.orgId};
     $scope.loadData = function () {
-        $scope.kdmc = $rootScope.orgInfo.orgName;
-        var kqbm = $rootScope.orgInfo.kqbm;
-        $scope.search.startTime = $("#startTime").val();
-        $scope.search.endTime = $("#endTime").val();
-        zqlWarningService.getZqlyjxxListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, kqbm, $scope.search.cphm,
-            $scope.search.mxpz, $scope.search.startTime, $scope.search.endTime).then(function (data) {
-            if (data.code == 200) {
+        $scope.search.bjrq = $("#bjrq").val();
+        zqlWarningService.getZqlyjxxListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            if (data.retCode == 200) {
                 $scope.pageInfo = data.data;
             }
         }, function (data) {

src/main/resources/static/app/warnAndAlarm/zqlWarning/service/zqlWarningService.js

@@ -3,19 +3,16 @@ angular.module('app.warnAndAlarm').service("zqlWarningService", function ($http,
     /**
      * 获取平台转圈粮预警列表
      */
-    this.getZqlyjxxListPageInfo = function(pageNum, pageSize, kqbm, cphm, mxpz, startTime, endTime) {
+    this.getZqlyjxxListPageInfo = function(pageNum, pageSize, search) {
         var d = $q.defer();
         $http({
             method : 'GET',
-            url : APP_CONFIG.depotStorageUrl + '/spt/getZqlyjxxList',
+            url : APP_CONFIG.depotStorageUrl + '/yjbj/getZqlyjPageList',
             params : {
                 pageNum : pageNum,
                 pageSize : pageSize,
-                kqbm : kqbm,
-                cphm : cphm,
-                mxpz : mxpz,
-                startTime : startTime,
-                endTime : endTime
+                bjrq : search.bjrq,
+                orgId : search.orgId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/zqlWarning/views/zqlyj-list.html

@@ -16,14 +16,9 @@
                             <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">
-                                        <label>车牌号:
-                                            <input class="form-control" type="text" ng-model="search.cphm" name="cphm" />
-                                        </label>
-                                        <label> 日期:
-                                            <input type="text" ng-model="search.startTime" id="startTime" class="form-control Wdate"
-                                                   onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endTime\')}'})" > ~
-                                            <input type="text" ng-disabled="isArchive" ng-model="search.endTime" id="endTime" class="form-control Wdate"
-                                                   onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startTime\')}'})" >
+                                        <label>报警日期:
+                                            <input type="text" ng-model="search.bjrq" id="bjrq" class="form-control Wdate"
+                                                   onClick="WdatePicker({lang:'zh-cn'})" />
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -46,26 +41,26 @@
                                         <thead>
                                         <tr>
                                             <th data-class="expand" style="text-align:center;">序号</th>
-                                            <th data-class="expand" style="text-align:center;">车牌号</th>
-                                            <th data-class="expand" style="text-align:center;">仓房名称</th>
-                                            <th data-class="expand" style="text-align:center;">出入库时间</th>
-                                            <th data-class="expand" style="text-align:center;">明细品种</th>
-                                            <th data-class="expand" style="text-align:center;">等级</th>
-                                            <th data-class="expand" style="text-align:center;">净重(吨)</th>
-                                            <th data-class="expand" style="text-align:center;">出入库类型</th>
+                                            <th data-class="expand" style="text-align:center;">入库车辆</th>
+                                            <th data-class="expand" style="text-align:center;">品种</th>
+                                            <th data-class="expand" style="text-align:center;">预警信息</th>
+                                            <th data-class="expand" style="text-align:center;">是否入门登记</th>
+                                            <th data-class="expand" style="text-align:center;">登记人</th>
+                                            <th data-class="expand" style="text-align:center;">入门时间</th>
+                                            <th data-class="expand" style="text-align:center;">预警时间</th>
                                         </tr>
                                         </thead>
 
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.cch }}</td>
-                                            <td style="text-align:center;">{{ warning.cfmc }}</td>
-                                            <td style="text-align:center;">{{ warning.crksj }}</td>
-                                            <td style="text-align:center;">{{ warning.lspzmc }}</td>
-                                            <td style="text-align:center;">{{ warning.lydjmc }}</td>
-                                            <td style="text-align:center;">{{ warning.jz }}</td>
-                                            <td style="text-align:center;">{{ warning.crklx }}</td>
+                                            <td style="text-align:center;">{{ warning.rkcl }}</td>
+                                            <td style="text-align:center;">{{ warning.pzmc }}</td>
+                                            <td style="text-align:center;">{{ warning.bjxx }}</td>
+                                            <td style="text-align:center;">{{ warning.sfrmdj == 1 ? '是' : '否' }}</td>
+                                            <td style="text-align:center;">{{ warning.djr }}</td>
+                                            <td style="text-align:center;">{{ warning.rmsj }}</td>
+                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>
                                         </tbody>
                                     </table>