库存超限报警、库存空仓报警、存储超限报警

src/main/resources/static/app/storage/controller/numberManage/emptyPoliceCtrl.js

@@ -1,18 +1,18 @@
 "use strict";
 
 angular.module('app.business')
-    .controller("emptyPoliceCtrl", function($scope, $rootScope, $http, $state, $filter, StorehouseService, warehouseService) {
+    .controller("emptyPoliceCtrl", function($scope, $rootScope, $http, $state, $filter, sptService) {
         // 获取列表数据
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
-        $scope.ware = {storehouseId:null, warehouseId:null};
+        $scope.serach = {cfmc:null, cfzt:null};
         $scope.loadDataSelect = function() {
-            var orgId = $rootScope.userInfo.orgId;//当前登录者的库id
-            warehouseService.getPageInfoWareAndTank($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.ware).then(function(data){
-                $scope.pageInfo = data;
+        	var kqbm = $rootScope.orgInfo.kqbm;
+        	sptService.getkckcbjPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, kqbm, $scope.serach.cfmc, $scope.serach.cfzt).then(function(data){
+                $scope.pageInfo = data.data;
             },function(data){
                 console.log(data);
             });
-        };
+        }
 
         // 翻页
         $scope.goPage = function(pageNum) {
@@ -20,26 +20,7 @@ angular.module('app.business')
                 $scope.pageInfo.pageNum = pageNum;
                 $scope.loadDataSelect();
             }
-        };
-
-        // 货位列表
-        $scope.loadWare = function() {
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.ware.storehouseId).then(function(data){
-                $scope.warelist = data.wareList;
-            },function(data){
-                console.log(data);
-            });
-        };
-
-        // 仓房列表
-        $scope.loadStore = function() {
-            $scope.getBasicData();
-            StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(data){
-                $scope.storelist = data.houseList;
-            },function(data){
-                console.log(data);
-            });
-        };
+        }
 
         $scope.loadDataSelect();
     });

src/main/resources/static/app/storage/views/numberManage/emptyPolice-list.html

@@ -16,16 +16,13 @@
                                     <div class="col-xs-3 col-sm-10">
                                         <div class="form-group">
                                             <label> 仓房名称:&emsp;
-                                                <select ng-model="ware.storehouseId" class="form-control input-sm"
-                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
-                                                        ng-change="loadWare()">
-                                                    <option value="">请选择</option>
-                                                </select>&emsp;
+                                                <input ng-model="serach.cfmc" class="form-control" />&emsp;
                                             </label>
-                                            <label> 货位名称:&emsp;
-                                                <select ng-model="ware.warehouseId" class="form-control input-sm"
-                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
-                                                    <option value="">请选择</option>
+                                            <label> 仓房状态:&emsp;
+                                                <select ng-model="serach.cfzt" class="form-control input-sm">
+                                                    <option value="">-请选择-</option>
+                                                    <option value="1">空仓</option>
+                                                    <option value="2">半仓</option>
                                                 </select>&emsp;
                                             </label>
                                             <a class="btn btn-default btn-sm" ng-click="loadDataSelect()"><i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
@@ -46,15 +43,25 @@
                                     <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-class="expand">仓温</th>
+                                        <th data-class="expand">平均粮温</th>
+                                        <th data-class="expand">疑似半仓/空仓</th>
+                                        <th data-class="expand">报警日期</th>
                                     </tr>
                                     </thead>
 
                                     <tbody>
                                     <tr ng-repeat="empty in pageInfo.list">
                                         <th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
-                                        <td>{{storehouseObj[empty.cfid].storehouseName}}</td>
-                                        <td>{{empty.hwmc}}</td>
+                                        <td>{{empty.cfmc}}</td>
+                                        <td>{{empty.lyxz}}</td>
+                                        <td>{{empty.kcsl | number : 3}}</td>
+                                        <td>{{empty.cw}}</td>
+                                        <td>{{empty.pjlw}}</td>
+                                        <td>{{empty.cfzt == 1 ? '空仓' : '半仓'}}</td>
+                                        <td>{{empty.bjsj}}</td>
                                     </tr>
                                     </tbody>
                                 </table>

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

@@ -1,12 +1,13 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("stockWarningThresholdCtrl", function ($scope, $rootScope, $state, overRunAlarmService, APP_CONFIG, alertService) {
+	.controller("stockWarningThresholdCtrl", function ($scope, $rootScope, $state, overRunAlarmService, APP_CONFIG, sptService) {
 		// 默认分页
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};
 		// 加载列表
 		$scope.loadData = function () {
-			overRunAlarmService.getKcPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId).then(function (data) {
+			var kqbm = $rootScope.orgInfo.kqbm;
+			sptService.getkccxbjPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, kqbm, $scope.cfmc).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
 				// console.log(data);

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

@@ -1,19 +1,14 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("storeWarningThresholdCtrl", function ($scope, $rootScope, $state, overDueAlarmService) {
+	.controller("storeWarningThresholdCtrl", function ($scope, $rootScope, $state, sptService) {
 		// 默认分页
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};
+		$scope.serach = {cfmc:null, pzbm:null};
 		// 加载列表
 		$scope.loadData = function () {
-			overDueAlarmService.getCcPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId).then(function (data) {
-				data.data.list.forEach(function (e){
-					let fcTime = new Date(e.fcTime)
-					let cznxTime = new Date(e.fcTime)
-					cznxTime.setFullYear(fcTime.getFullYear() + e.limitYear)
-					e.cznx = cznxTime
-				});
-
+			var kqbm = $rootScope.orgInfo.kqbm;
+			sptService.getCccxbjPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, kqbm, $scope.serach).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
 				// console.log(data);

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

@@ -204,4 +204,78 @@ angular.module('app.supervise').service("sptService", function($http, $q, APP_CO
         });
         return d.promise;
     }
+
+    /**
+     * 库存超限报警
+     */
+    this.getkccxbjPageInfo = function(pageNum, pageSize, kqbm, cfmc) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getkccxbjList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : kqbm, 
+                cfmc : cfmc
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
+    /**
+     * 库存空仓报警
+     */
+    this.getkckcbjPageInfo = function(pageNum, pageSize, kqbm, cfmc, cfzt) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getkckcbjList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : kqbm, 
+                cfmc : cfmc,
+                cfzt : cfzt
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
+    /**
+     * 存储超限报警
+     */
+    this.getCccxbjPageInfo = function(pageNum, pageSize, kqbm, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getCccxbjList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : kqbm, 
+                cfmc : search.cfmc,
+                pzbm : search.pzbm
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 });

src/main/resources/static/app/supervise/views/stockWarningThreshold.html

@@ -14,7 +14,12 @@
 							<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>
+                                        <a class="btn btn-default btn-sm" ng-click="loadData()">
+                                            <i class="fa fa-search"></i>&nbsp;查&nbsp;询
+                                        </a>
 									</div>
 									<div class="col-sm-2 col-xs-2 hidden-xs">
 										<div class="dataTables_length">
@@ -31,10 +36,10 @@
 												<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>
@@ -42,13 +47,13 @@
 										<tbody>
 											<tr ng-repeat="warning in pageInfo.list">
 												<td style="text-align:center;">{{ $index + 1 }}</td>
-												<td style="text-align:center;">{{ warning.storeHouseName }}</td>
-												<td style="text-align:center;">{{ warning.grainOilQuality }}</td>
-												<td style="text-align:center;">{{ warning.grainOilName }}</td>
-<!-- 												<td style="text-align:center;">{{ warning.level }}</td> -->
-												<td style="text-align:center;">{{ warning.designCapacity | number : 2 }}</td>
-												<td style="text-align:center;">{{ warning.inventoryQuantity  | number : 2 }}</td>
-												<td style="text-align:center;">{{ warning.alarmTime }}</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.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>
 											</tr>
 										</tbody>
 									</table>

src/main/resources/static/app/supervise/views/storeWarningThreshold.html

@@ -14,7 +14,16 @@
 							<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> 仓房名称:&emsp;
+                                                <input ng-model="serach.cfmc" class="form-control" />&emsp;
+                                            </label>
+                                            <label> 品种明细:&emsp;
+                                                <select ng-model="serach.pzbm" class="form-control input-sm" 
+                                                ng-options="enum.gbcode as enum.enumname for enum in dicDataList[1061]">
+                                                    <option value="">-请选择-</option>
+                                                </select>&emsp;
+                                            </label>
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()"><i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
 									</div>
 									<div class="col-sm-2 col-xs-2 hidden-xs">
 										<div class="dataTables_length">
@@ -31,28 +40,26 @@
 												<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.storeHouseName }}</td>
-												<td style="text-align:center;">{{ warning.grainOilQuality }}</td>
-												<td style="text-align:center;">{{ warning.grainOilName }}</td>
-												<td style="text-align:center;">{{ warning.level }}</td>
-												<td style="text-align:center;">{{ warning.inventoryQuantity }}</td>
-												<td style="text-align:center;">
-													{{ warning.fcTime.split(' ')[0] }}
-												</td>
-												<td style="text-align:center;">{{ warning.limitYear }}</td>
-												<td style="text-align:center;">{{ warning.cznx | date:'yyyy-MM-dd' }}</td>
+												<td style="text-align:center;">{{ warning.cfmc }}</td>
+												<td style="text-align:center;">{{ warning.lyxz }}</td>
+												<td style="text-align:center;">{{ warning.pzmc }}</td>
+												<td style="text-align:center;">{{ warning.kcsl | number : 3 }}</td>
+												<td style="text-align:center;">{{ warning.scnf }}</td>
+												<td style="text-align:center;">{{ warning.cbnx }}</td>
+												<td style="text-align:center;">{{ warning.cccxsj }}</td>
+												<td style="text-align:center;">{{ warning.bjsj }}</td>
 											</tr>
 										</tbody>
 									</table>