云南代储点bug修改

src/main/resources/static/app/business/agent/bgz/bgmxz/controller/agentBgmxzCtrl.js

@@ -2,7 +2,7 @@
 
 angular.module('app.business')
     .controller("agentBgmxzCtrl", function($scope, $rootScope, $http, $state, agentBgmxzService, FileUploader, 
-    		agentService, agentDepotService, warehouseService, StorehouseService, fcbgzService, APP_CONFIG) {
+    		agentService, agentDepotService, warehouseService, StorehouseService, fcbgzService, APP_CONFIG,agentStorehouseService) {
 
     	// 分页信息
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
@@ -62,8 +62,14 @@ angular.module('app.business')
         //根据代储库获取仓房列表
         $scope.getHouseList = function(depotId) {
             if(depotId != null){
-                StorehouseService.getAgentList(depotId,$rootScope.orgInfo.orgId,"1").then(function(data){
-                    $scope.storehouseList = data;
+                // StorehouseService.getAgentList(depotId,$rootScope.orgInfo.orgId,"1").then(function(data){
+                agentStorehouseService.getDepotToStoreList($rootScope.orgInfo.orgId, depotId).then(function(data){
+                    for (var i = 0; i < $scope.depotList.length; i++) {
+                        if($scope.depotList[i].depotId == depotId){
+                            $scope.orgIds = $scope.depotList[i].orgId;
+                            $scope.storehouseList = data;
+                        }
+                    }
                 },function(data){
                     console.log(data);
                 })
@@ -77,8 +83,7 @@ angular.module('app.business')
         	//console.log(houseId);
             if(houseId != null){
                 //按照单位获取单位下的仓房信息
-                var depotId = $rootScope.orgInfo.orgId;
-                warehouseService.getStorehouse(depotId, houseId, "1").then(function(data){
+                agentStorehouseService.getStorehouse($scope.orgIds, houseId).then(function(data){
                     $scope.warelist = data.wareList;  //下拉列表数据
                 },function (data) {
                     console.log(data);
@@ -100,6 +105,7 @@ angular.module('app.business')
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
         	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId,"fcbgz").then(function (data) {
+                var data = data.strResult;
                 //console.log(data);
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来

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

@@ -20,7 +20,7 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-3 col-sm-10">
                                         <a has-permission="679" class="btn btn-primary btn-sm" ng-click="showEdit(null,'add')"><span class="fa fa-plus"></span>&nbsp;新&nbsp;增</a>&nbsp;
-                                        <a has-permission="680" class="btn btn-primary btn-sm" ng-click="synchro()">&nbsp;同&nbsp;步</a>&nbsp;
+                                        <a class="btn btn-primary btn-sm" ng-click="synchro()">&nbsp;同&nbsp;步</a>&nbsp;
                                         <div class="form-group" ng-hide="true">
                                             <label class="btn btn-primary btn-sm" for="exampleInputFile1"><i class="glyphicon glyphicon-import"></i>&nbsp;导&nbsp;入</label>
                                         </div>&nbsp;

src/main/resources/static/app/business/agent/bgz/fcbgz/controller/agentFcbgzCtrl.js

@@ -2,7 +2,7 @@
 
 angular.module('app.business')
     .controller("agentFcbgzCtrl", function($scope, $rootScope, $http, $state, $filter, agentFcbgzService, 
-    		agentService, agentDepotService, warehouseService, StorehouseService, APP_CONFIG) {
+    		agentService, agentDepotService, warehouseService, agentStorehouseService, APP_CONFIG) {
 
     	// 分页信息
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
@@ -51,8 +51,13 @@ angular.module('app.business')
         //根据代储库获取仓房列表
         $scope.getHouseList = function(depotId) {
             if(depotId != null){
-                StorehouseService.getAgentList(depotId,$rootScope.orgInfo.orgId,"1").then(function(data){
-                    $scope.storehouseList = data;
+                agentStorehouseService.getDepotToStoreList($rootScope.orgInfo.orgId, depotId).then(function(data){
+                    for (var i = 0; i < $scope.depotList.length; i++) {
+                        if($scope.depotList[i].depotId == depotId){
+                            $scope.orgIds = $scope.depotList[i].orgId;
+                            $scope.storehouseList = data;
+                        }
+                    }
                 },function(data){
                     console.log(data);
                 })
@@ -65,8 +70,7 @@ angular.module('app.business')
         $scope.getWareList = function(houseId) {
             if(houseId != null){
                 //按照单位获取单位下的仓房信息
-                var depotId = $rootScope.orgInfo.orgId;
-                warehouseService.getStorehouse(depotId, houseId, "1").then(function(data){
+                agentStorehouseService.getStorehouse($scope.orgIds, houseId).then(function(data){
                     $scope.warelist = data.wareList;  //下拉列表数据
                 },function (data) {
                     console.log(data);

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

@@ -27,8 +27,8 @@ angular.module('app.business')
         $scope.getAgentDepotData = function(agentId){
             if(agentId != null){
                 //获取代储库名称做成下拉列表；
-                agentDepotService.getAgentDepotHouse("",agentId).then(function(data){
-                    $scope.depotList = data.map(function(item) {
+                agentDepotService.getPageInfo("1", "100", "",agentId).then(function(data){
+                    $scope.depotList = data.list.map(function(item) {
                         return {
                             depotId: item.id,
                             depotName: item.agentDepotName
@@ -101,6 +101,7 @@ angular.module('app.business')
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
         	agentHcService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
+                var data = data.strResult;
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
                     //把传回来的数据在插入到代储点的火车出入库记录表中

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

@@ -27,8 +27,8 @@ angular.module('app.business')
         $scope.getAgentDepotData = function(agentId){
             if(agentId != null){
                 //获取代储库名称做成下拉列表；
-                agentDepotService.getAgentDepotHouse("",agentId).then(function(data){
-                    $scope.depotList = data.map(function(item) {
+                agentDepotService.getPageInfo("1", "100", "",agentId).then(function(data){
+                    $scope.depotList = data.list.map(function(item) {
                         return {
                             depotId: item.id,
                             depotName: item.agentDepotName
@@ -84,6 +84,7 @@ angular.module('app.business')
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
         	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId,"kcsw").then(function (data) {
+                var data = data.strResult;
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
                     //把传回来的数据在插入到代储点的保管明细账表中

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

@@ -27,8 +27,8 @@ angular.module('app.business')
         $scope.getAgentDepotData = function(agentId){
             if(agentId != null){
                 //获取代储库名称做成下拉列表；
-                agentDepotService.getAgentDepotHouse("",agentId).then(function(data){
-                    $scope.depotList = data.map(function(item) {
+                agentDepotService.getPageInfo("1", "100", "",agentId).then(function(data){
+                    $scope.depotList = data.list.map(function(item) {
                         return {
                             depotId: item.id,
                             depotName: item.agentDepotName
@@ -123,6 +123,7 @@ angular.module('app.business')
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
         	agentQcService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
+                var data = data.strResult;
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
                     //把传回来的数据在插入到代储点的汽车出入库记录表中
@@ -220,7 +221,7 @@ angular.module('app.business')
                     }
                 },function(data){
                     console.log(data);
-                });
+                })
             }else{
                 $scope.storehouseList = {};
             }

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

@@ -33,8 +33,8 @@ angular.module('app.business')
         $scope.getAgentDepotData = function(agentId){
             if(agentId != null){
                 //获取代储库名称做成下拉列表；
-                agentDepotService.getAgentDepotHouse("",agentId).then(function(data){
-                    $scope.depotList = data.map(function(item) {
+                agentDepotService.getPageInfo("1", "100", "",agentId).then(function(data){
+                    $scope.depotList = data.list.map(function(item) {
                         return {
                             depotId: item.id,
                             depotName: item.agentDepotName