云南最新bug修改

src/main/resources/static/app/basic/warehouse/controller/warehouseCtrl.js

@@ -40,7 +40,7 @@ angular.module('app.basic')
      $scope.loadData = function() {
          if($scope.libraryType == '1'){
              // 获取货位列表
-             agentStorehouseService.getWareList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.ware.warehouseName,$scope.ware.storehouseId).then(function(data){
+             agentStorehouseService.getWareList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.agentDepotName).then(function(data){
                  $scope.pageInfo = data;
              },function(data){
                  console.log(data);

src/main/resources/static/app/basic/warehouse/views/warehouseAgent-list.html

@@ -24,15 +24,9 @@
 										<a class="btn btn-primary btn-sm" ng-click="edit(ware.libraryType)">
 												<span class="fa fa-plus"></span>&nbsp;新&nbsp;增
 										</a>&emsp;
-										<label>仓房名称:&emsp;
-                                                <select ng-model="ware.storehouseId" class="form-control"
-	                                                ng-options="store.storehouseId as store.storehouseName for store in storeHouseList"
-	                                                ng-change="loadWare()">
-                                                <option value="">--请选择--</option>
-                                                </select>
-                                            </label>&emsp;
-                                            <label>货位名称:&emsp;<input class="form-control input-sm" ng-model="ware.warehouseName" placeholder=""> &emsp;
-                                            </label>
+										<label> 粮库名称:&emsp;
+											<input type="search" ng-model="agentDepotName" class="form-control input-sm" placeholder="">&emsp;
+										</label>
 										<a class="btn btn-default btn-sm" ng-click="loadData()">
 											<i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>&emsp;
 										<a class="btn btn-primary btn-sm" ng-click="print()">
@@ -53,9 +47,9 @@
 									width="100%">
 									<thead>
 										<tr>
+											<th data-class="expand">粮库名称</th>
 											<th data-class="expand">仓房名称</th>
 											<th data-class="expand">货位名称</th>
-											<th data-hide="expand">使用状态</th>
 											<th data-hide="expand">使用情况</th>
 											<th data-hide="expand">货位容量(吨)</th>
 											<th data-hide="expand">操作</th>
@@ -64,9 +58,9 @@
 
 									<tbody>
 										<tr ng-repeat="warehouse in pageInfo.list | filter:search">
+											<td>{{warehouse.agentDepotName}}</td>
 											<td>{{warehouse.viewState == 0?storehouseObj[warehouse.storehouseId].storehouseName:warehouse.storehouseName}}</td>
 											<td>{{warehouse.warehouseName}}</td>
-											<td>{{dicData[warehouse.warehouseStatus]}}</td>
 											<td>{{warehouse.delFlag=='1'?"在用":"删除"}}</td>
 											<td>{{warehouse.warehouseCapacity}}</td>
 											<td><a ng-show="warehouse.viewState == 0" href-void ng-click="edit(warehouse.warehouseId)">

src/main/resources/static/app/business/agent/basic/controller/agentTankCtrl.js

@@ -5,7 +5,7 @@ angular.module('app.business')
         // 获取列表数据
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
         $scope.loadData = function() {
-            agentTankService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.tankNumber)
+            agentTankService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.agentDepotName)
             .then(function(data){
                 $scope.pageInfo = data;
             },function(data){

src/main/resources/static/app/business/agent/basic/service/agentStorehouseService.js

@@ -151,7 +151,7 @@ angular.module('app.business')
         }
 
         //分页货位查询
-        this.getWareList = function(pageNum, pageSize, warehouseName, storehouseId) {
+        this.getWareList = function(pageNum, pageSize, agentDepotName) {
             var orgId = $rootScope.orgInfo.orgId;
             var d = $q.defer();
             $http({
@@ -160,8 +160,7 @@ angular.module('app.business')
                 params : {
                     pageNum : pageNum,
                     pageSize : pageSize,
-                    warehouseName : warehouseName == undefined?"":warehouseName,
-                    storehouseId : storehouseId == undefined?"":storehouseId,
+                    agentDepotName : agentDepotName == undefined?"":agentDepotName,
                     orgId : orgId
                 }
             }).then(function successCallback(response) {

src/main/resources/static/app/business/agent/basic/service/agentTankService.js

@@ -3,7 +3,7 @@
 angular.module('app.business')
     .service("agentTankService", function($http, $q, APP_CONFIG, $rootScope) {
         //分页数据查询
-        this.getPageInfo = function(pageNum, pageSize, tankNumber) {
+        this.getPageInfo = function(pageNum, pageSize, agentDepotName) {
         	var orgId = $rootScope.orgInfo.orgId;
             var d = $q.defer();
             $http({
@@ -12,7 +12,7 @@ angular.module('app.business')
                 params : {
                     pageNum : pageNum,
                     pageSize : pageSize,
-                    tankNumber : tankNumber == undefined?"":tankNumber,
+                    agentDepotName : agentDepotName == undefined?"":agentDepotName,
                     orgId : orgId
                 }
             }).then(function successCallback(response) {

src/main/resources/static/app/business/agent/basic/views/agent-edit.html

@@ -30,7 +30,7 @@
 								<fieldset>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label txt-bg-red">代储点名称<span style="color: red;">*</span></label>
+											<label class="label txt-bg-red">代储企业名称<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="agentName" ng-model="agentEdit.agentName"

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

@@ -25,7 +25,7 @@
                                         </div>&nbsp;
                                         <a class="btn btn-primary btn-sm" href="app/mould/代储企业数据模板.xlsx"><i class="glyphicon glyphicon-export"></i>&nbsp;导出模板</a>&emsp;
                                         <div class="form-group">
-                                            <label> 代储点名称:&emsp;<input type="search" ng-model="agentName" class="form-control input-sm" placeholder="">&emsp;</label>
+                                            <label> 代储企业名称:&emsp;<input type="search" ng-model="agentName" class="form-control input-sm" placeholder="">&emsp;</label>
                                             <a class="btn btn-default btn-sm" ng-click="loadData()"><i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
                                         </div>
                                     </div>
@@ -42,7 +42,7 @@
                                 <table class="table table-striped table-bordered table-hover" width="100%">
                                     <thead>
                                     <tr>
-                                        <th data-class="expand">代储点名称</th>
+                                        <th data-class="expand">代储企业名称</th>
                                         <th data-class="expand">法定代表人</th>
                                         <th data-class="expand">代储点性质</th>
                                         <th data-hide="phone">代储点类型</th>

src/main/resources/static/app/business/agent/basic/views/agentDepot-edit.html

@@ -38,7 +38,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">代储点名称</label>
+											<label class="label">代储企业名称</label>
 											<label class="select">
 												<select ng-model="agentDepotEdit.agentId" required
 														ng-options="agent.id as agent.agentName for agent in agentData.list"

src/main/resources/static/app/business/agent/basic/views/agentDepot-list.html

@@ -43,7 +43,7 @@
                                     <thead>
                                     <tr>
                                         <th data-class="expand">粮库名称</th>
-                                        <th data-class="expand">代储点名称</th>
+                                        <th data-class="expand">代储企业名称</th>
                                         <th data-class="expand">库点类别</th>
                                         <th data-hide="phone">设计仓容</th>
                                         <th data-hide="phone">地址</th>

src/main/resources/static/app/business/agent/basic/views/agentTank-list.html

@@ -25,7 +25,9 @@
                                         </div>&nbsp;
                                         <a class="btn btn-primary btn-sm" href="app/mould/油罐数据模板.xlsx"><i class="glyphicon glyphicon-export"></i>&nbsp;导出模板</a>&emsp;
                                         <div class="form-group">
-                                            <label> 油罐编号:&emsp;<input type="search" ng-model="tankNumber" class="form-control input-sm" placeholder="">&emsp;</label>
+                                            <label> 粮库名称:&emsp;
+                                                <input type="search" ng-model="agentDepotName" class="form-control input-sm" placeholder="">&emsp;
+                                            </label>
                                             <a class="btn btn-default btn-sm" ng-click="loadData()"><i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
                                         </div>
                                     </div>

src/main/resources/static/app/business/agent/grainStorage/controller/qcCtrl.js

@@ -79,15 +79,15 @@ angular.module('app.business')
         $scope.showEdit = function(id,type, qcData) {
         	if (qcData.sjly == "1") {
         		// 汽车出入库详情
-        		if ("汽车入库" == qcData.ywlx) {
-                    qcData.ywlx = "入仓";
+        		if ("汽车入库" == qcData.businessType) {
+                    qcData.businessType = "入仓";
         		} else {
-                    qcData.ywlx = "出仓";
+                    qcData.businessType = "出仓";
         		}
                 var dicData = $rootScope.dicData;
         		$scope.obj = {
         			bizNo : id,
-        			ywlx : qcData.ywlx,
+        			ywlx : qcData.businessType,
                     agentOrgId : qcData.agentOrgId,
                     rq : $filter('date')(qcData.crkTime, 'yyyy-MM-dd HH:mm:ss'),
                     jhdh : "0",

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

@@ -4,56 +4,45 @@ angular.module('app.business')
     .controller("emptyPoliceCtrl", function($scope, $rootScope, $http, $state, $filter, StorehouseService, warehouseService,
            kcswService, foodbasicinfoService, APP_CONFIG) {
         // 获取列表数据
+        var hwh = "KC";
         $scope.searchCondition = {};
         $scope.loadDataSelect = function() {
             $scope.getBasicData();
-            /* 先拿到库存实物表的数据 */
-            var serchCh = null;
-            var serchHwh = null;
-            if (undefined != $scope.searchCondition) {
-                if (undefined != $scope.searchCondition.houseId) {
-                    serchCh = $scope.searchCondition.houseId;
-                }
-                if (undefined != $scope.searchCondition.warehouseId) {
-                    serchHwh = $scope.searchCondition.warehouseId;
-                }
-                $scope.kcswStr = {ch : serchCh, hwh : serchHwh, unitid : $rootScope.orgInfo.orgId};
-            } else {
-                $scope.kcswStr = {ch : null, hwh : null, unitid : $rootScope.orgInfo.orgId};
-            }
             /* 分页信息 */
             $scope.pageInfo = {pageNum : 1, pageSize : 10};
+            $scope.kcswStr = {ch : null, hwh : null, unitid : $rootScope.orgInfo.orgId};
             kcswService.getEmptyList(null, null, $scope.kcswStr).then(function(data){
-                if (null != data.list && undefined != data.list) {
-                    var ch = "";
-                    var hwh = "";
-                    var lkmc = "";
-                    var shnd = "";
+                if (null != data.list && undefined != data.list && data.list.length != 0) {
                     for (var i = 0; i < data.list.length; i++) {
-                        ch = data.list[i].ch;
-                        hwh = data.list[i].hwh;
-                        shnd = $filter('date')(data.list[i].rq, "yyyy");
-                        data.list[i].rq = shnd;
-
-                        foodbasicinfoService.findBasicinfoByStoreWarehouse(ch, hwh, $rootScope.orgInfo.orgId).then(function(datas){
-                            if (null != datas.list && undefined != datas.list) {
-                                data.list[i].lkmc = datas.list[0].recordUnite;
-                            }
-                        },function(datas){
-                            console.log(datas);
-                        });
+                        hwh += data.list[i].hwh + ",";
+                        if(i == data.list.length - 1 ){
+                            hwh = hwh.substring(0,hwh.length);
+                            $scope.loadData();
+                        }
                     }
+                }else{
+                    $scope.loadData();
                 }
-                $scope.pageInfo = data;
             },function(data){
                 console.log(data);
             });
         };
 
+        $scope.loadData = function () {
+            warehouseService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,
+                $scope.ware, $rootScope.orgInfo.orgId, hwh, null).then(function (data) {
+                $scope.pageInfo = data;
+            }, function (data) {
+                console.log(data);
+            });
+        }
+
         // 翻页
         $scope.goPage = function(pageNum) {
-            $scope.pageInfo.pageNum = pageNum;
-            $scope.loadData();
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
         };
 
         // 货位列表

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

@@ -16,14 +16,14 @@
                                     <div class="col-xs-3 col-sm-10">
                                         <div class="form-group">
                                             <label> 仓房名称:&emsp;
-                                                <select ng-model="emptyPolice.houseId" class="form-control input-sm"
+                                                <select ng-model="ware.storehouseId" class="form-control input-sm"
                                                         ng-options="store.storehouseId as store.storehouseName for store in storelist"
                                                         ng-change="loadWare()">
                                                     <option value="">请选择</option>
                                                 </select>&emsp;
                                             </label>
                                             <label> 货位名称:&emsp;
-                                                <select ng-model="emptyPolice.warehouseId" class="form-control input-sm"
+                                                <select ng-model="ware.warehouseId" class="form-control input-sm"
                                                         ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
                                                     <option value="">请选择</option>
                                                 </select>&emsp;
@@ -45,20 +45,16 @@
                                     <thead>
                                     <tr>
                                         <th data-hide="phone">序号</th>
-                                        <th data-class="expand">粮权所属</th>
                                         <th data-class="expand">仓房名称</th>
                                         <th data-class="expand">货位名称</th>
-                                        <th data-hide="phone">修改时间</th>
                                     </tr>
                                     </thead>
 
                                     <tbody>
                                     <tr ng-repeat="empty in pageInfo.list">
                                         <th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
-                                        <td>{{empty.lkmc}}</td>
-                                        <td>{{storehouseObj[empty.ch].storehouseName}}</td>
-                                        <td>{{warehouseObj[empty.hwh].warehouseName}}</td>
-                                        <td>{{empty.modifydate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                        <td>{{storehouseObj[empty.storehouseId].storehouseName}}</td>
+                                        <td>{{empty.warehouseName}}</td>
                                     </tr>
                                     </tbody>
                                 </table>