Merge branch '#3'

src/main/resources/static/app/srm/barcode/query/query.html

@@ -6,8 +6,8 @@
             <div class="col-md-4">
                 <div class="form-group">
                     <label>营运中心</label>
-                    <select class="form-control select2" ng-model="queryCondition.factory.id" required style="width: 100%;">
-                        <option ng-repeat="factory in factories" value="{{factory.id}}">{{factory.name}}</option>
+                    <select class="form-control select2" ng-model="queryCondition.factory.factoryUid" required style="width: 100%;" ng-change="barcodeChange()">
+                        <option ng-repeat=" factory in factories" value="{{factory.factoryUid}}">{{factory.name}}</option>
                     </select>
                 </div>
             </div>

src/main/resources/static/app/srm/barcode/query/query.js

 angular.module('IOne').controller('BarcodeQueryController', function ($scope, Constants, $interval, $uibModal, UtilService,
                                                                       BaseFactoryFileService, AuthService, BarcodeService) {
     $scope.queryCondition = {
-        factory: {id: null},
+        factory: {factoryUid: null},
         barcode: null
     };
 
@@ -81,7 +81,7 @@ angular.module('IOne').controller('BarcodeQueryController', function ($scope, Co
         BaseFactoryFileService.getByAccount().then(function (response) {
             $scope.factories = response;
             if ($scope.factories.length > 0) {
-                $scope.queryCondition.factory.id = $scope.factories[0].id;
+                $scope.queryCondition.factory.factoryUid = $scope.factories[0].factoryUid;
             }
         });
     };