.

src/main/resources/static/app/basic/warehouse/service/warehouseService.js

@@ -133,4 +133,27 @@ angular.module('app.basic').service("warehouseService", function($http, $q, $roo
         return d.promise;
     }
 
+    //查询空仓的货位和油罐
+    this.getPageInfoWareAndTank = function(pageNum, pageSize, ware) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.basicUrl + '/Warehouse/getPageInfoWareAndTank',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                houseId : ware == undefined?"":ware.storehouseId, //仓房
+                warehouseId : ware == undefined?"":ware.warehouseId,  //货位id
+                orgId : $rootScope.orgInfo.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
 });

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

@@ -3,12 +3,11 @@
 angular.module('app.business')
     .controller("emptyPoliceCtrl", function($scope, $rootScope, $http, $state, $filter, StorehouseService, warehouseService) {
         // 获取列表数据
-        $scope.searchCondition = {};
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
+        $scope.ware = {storehouseId:null, warehouseId:null};
         $scope.loadDataSelect = function() {
             var orgId = $rootScope.userInfo.orgId;//当前登录者的库id
-            $scope.ware = {storehouseId:"", warehouseId:""};
-            warehouseService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.ware,orgId,"3").then(function(data){
+            warehouseService.getPageInfoWareAndTank($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.ware).then(function(data){
                 $scope.pageInfo = data;
             },function(data){
                 console.log(data);
@@ -19,13 +18,13 @@ angular.module('app.business')
         $scope.goPage = function(pageNum) {
             if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
                 $scope.pageInfo.pageNum = pageNum;
-                $scope.loadData();
+                $scope.loadDataSelect();
             }
         };
 
         // 货位列表
         $scope.loadWare = function() {
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.searchCondition.houseId).then(function(data){
+            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.ware.storehouseId).then(function(data){
                 $scope.warelist = data.wareList;
             },function(data){
                 console.log(data);
@@ -42,24 +41,5 @@ angular.module('app.business')
             });
         };
 
-        $scope.getBasicData = function() {
-            //按照单位获取单位下的仓房信息
-            var depotId = $rootScope.orgInfo.orgId;
-            StorehouseService.getStorehouseList(depotId).then(function(data){
-                $scope.storehouseList = data.houseList;
-                $scope.storehouseObj = data.houseObj;
-            },function (data) {
-                console.log(data);
-            });
-            var depotId = $rootScope.depotInfo.orgId;
-            var cfh = '';
-            warehouseService.getStorehouse(depotId,cfh).then(function(data){
-                $scope.warehouseList = data.houseList;  //下拉列表数据
-                $scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
-            },function (data) {
-                console.log(data);
-            });
-        };
-
         $scope.loadDataSelect();
     });

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

@@ -17,18 +17,18 @@
                                         <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 storelist"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
                                                         ng-change="loadWare()">
                                                     <option value="">请选择</option>
                                                 </select>&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">
+                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
                                                     <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>
+                                            <a class="btn btn-default btn-sm" ng-click="loadDataSelect()"><i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
                                         </div>
                                     </div>
                                     <div class="col-sm-2 col-xs-6 hidden-xs">
@@ -53,8 +53,8 @@
                                     <tbody>
                                     <tr ng-repeat="empty in pageInfo.list">
                                         <th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
-                                        <td>{{storehouseObj[empty.storehouseId].storehouseName}}</td>
-                                        <td>{{empty.warehouseName}}</td>
+                                        <td>{{storehouseObj[empty.cfid].storehouseName}}</td>
+                                        <td>{{empty.hwmc}}</td>
                                     </tr>
                                     </tbody>
                                 </table>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -1141,7 +1141,6 @@
 									</div>
 
 									<!-- 成品大豆油7052，大米7107，小麦粉7051 -->
-
 									<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 2">
 										<header>质量指标</header>
 										<fieldset>
@@ -1473,7 +1472,8 @@
 										</fieldset>
 									</div>
 
-									<div ng-if="qualitycheck.subType==7051">
+									<!-- 小麦粉7038和混合小麦粉7051 -->
+									<div ng-if="qualitycheck.subType==7051 || qualitycheck.subType==7038">
 										<header>质量指标</header>
 										<fieldset>
 											<div class="col-xs-15 col-sm-15">
@@ -2681,7 +2681,7 @@
 			</div>
 		</div>
 
-		<div ng-if="qualitycheck.subType==7051">
+		<div ng-if="qualitycheck.subType==7051 || qualitycheck.subType==7038">
 			<div class="col-xs-15 col-sm-15">
 				<table class="table table-striped  table-bordered table-hover" style="border-collapse:collapse;border:none;" border="1" width="100%">
 					<tr colspan="8">

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-edit.html

@@ -1123,8 +1123,7 @@
 										</fieldset>
 									</div>
 
-									<!-- 成品大豆油7052，大米7107，小麦粉7051 -->
-
+									<!-- 成品大豆油7052 -->
 									<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 2">
 										<header>质量指标</header>
 										<fieldset>
@@ -1236,7 +1235,7 @@
 											</div>
 										</fieldset>
 									</div>
-
+									<!-- 大米7107 -->
 									<div ng-if="qualitycheck.subType==7107">
 										<header>质量指标</header>
 										<fieldset>
@@ -1455,8 +1454,8 @@
 											</div>
 										</fieldset>
 									</div>
-
-									<div ng-if="qualitycheck.subType==7051">
+									<!-- 小麦粉7038和混合小麦粉7051 -->
+									<div ng-if="qualitycheck.subType==7051 || qualitycheck.subType==7038">
 										<header>质量指标</header>
 										<fieldset>
 											<div class="col-xs-15 col-sm-15">

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

@@ -35,6 +35,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>
 											</tr>
 										</thead>
 
@@ -47,6 +48,7 @@
 <!-- 												<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>
 											</tr>
 										</tbody>
 									</table>