仓储仓房 初检

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -218,7 +218,7 @@ angular.module('app.storage')
         }
 
     })
-    .controller("qualitycheckSaveCtrl", function($scope,$state, $http, $stateParams, StorehouseService, warehouseService, keeperService,
+    .controller("qualitycheckSaveCtrl", function($scope,$state, $http, $stateParams, StorehouseService, warehouseService, kcswService, keeperService,
                                                  $rootScope, $filter, enumService, qualitycheckService,keepAccountService, APP_CONFIG) {
 
         $scope.loadDataById = function(id) {
@@ -259,12 +259,17 @@ angular.module('app.storage')
          */
         $scope.getBasicData = function() {
             //按照单位获取单位下的仓房信息
-            //var depotId = $rootScope.depotInfo.orgId;
-            qualitycheckService.getStorehouseListFromBusiness().then(function(data){
-                $scope.storehouseList = data.houseList;
-            },function (data) {
+            $scope.kcswStr = {ch : null, hwh : null, unitid : $rootScope.orgInfo.orgId, kcsl: null};
+            kcswService.getPageInfo(null, null, $scope.kcswStr, null).then(function(data){
+                $scope.storehouseList = data.list;
+                for (var idx in $scope.storehouseList) {
+                    $scope.storehouseName = $rootScope.storehouseObj[$scope.storehouseList[idx].ch].storehouseName;
+                    $scope.storehouseList[idx].storehouseName = $scope.storehouseName;
+                }
+            },function(data){
                 console.log(data);
             });
+
         }
         $scope.getBasicData();