aship/aship#1 防伪码功能:申请防伪码接口

src/main/java/com/i1/srm/base/web/dto/BaseSupplierFileDto.java

@@ -122,6 +122,7 @@ public class BaseSupplierFileDto extends Dto<BaseSupplierFile> {
     private String stopReason;
     private String uploadErp;
     private String uploadErpResult;
+    private String useBarcode;
 
     public String getSupplierUid() {
         return supplierUid;
@@ -978,4 +979,12 @@ public class BaseSupplierFileDto extends Dto<BaseSupplierFile> {
     public void setUploadErpResult(String uploadErpResult) {
         this.uploadErpResult = uploadErpResult;
     }
+
+    public String getUseBarcode() {
+        return useBarcode;
+    }
+
+    public void setUseBarcode(String useBarcode) {
+        this.useBarcode = useBarcode;
+    }
 }

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

@@ -120,7 +120,8 @@
     <div class="button-bar">
         <button class="btn btn-default mrs" ng-click="view()" ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'VIEW' ">查看</button>
         <button class="btn btn-default mrs" ng-click="openReturnPage()" ng-disabled="!canDoReturn()" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'RETURN' ">回执</button>
-        <button class="btn btn-default mrs" data-toggle="modal" data-target="#get-barcode-dlg"
+        <button class="btn btn-default mrs" ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'"
+                data-toggle="modal" data-target="#get-barcode-dlg"
                 ng-disabled="!currentPurchaseOrderMaster" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'GEN_BARCODE' ">申请防伪码
         </button>
         <button class="btn btn-default mrs" ng-click="clickExport()" ng-disabled="gridOptions.data.length == 0" acl-check func=" 'PURCHASE_ORDER_FUNCTION' " resource=" 'EXPORT' ">导出</button>

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

@@ -2,7 +2,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
                                                                             PoMstFileService, PoDtlFileService, BaseFactoryFileService, AuthService,
                                                                             BaseSupplierFileService, BaseProductFileService, UtilService, Constants) {
     //variables
-    var interval;
+    var intervals = [];
 
     $scope.Constants = Constants;
     $scope.baseProductFileService = BaseProductFileService;
@@ -51,7 +51,8 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
         if ($scope.queryCondition.poMst.supplier.id) {
             $scope.queryCondition.poMst.supplier = {
                 id: $scope.queryCondition.poMst.supplier.id,
-                name: $scope.queryCondition.poMst.supplier.name
+                name: $scope.queryCondition.poMst.supplier.name,
+                useBarcode: $scope.queryCondition.poMst.supplier.useBarcode
             };
         }
 
@@ -144,9 +145,9 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
     $scope.gridOptions.onRegisterApi = function (gridApi) {
         //set gridApi on scope
         $scope.gridApi = gridApi;
-        interval = $interval(function () {
+        intervals.push($interval(function () {
             $scope.gridApi.core.handleWindowResize();
-        }, 100);
+        }, 100));
 
         gridApi.selection.on.rowSelectionChanged($scope, function (row) {
             if (row.isSelected) {
@@ -223,7 +224,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
             UtilService.exportExcel(jsonData, '采购单', header);
         });
 
-    }
+    };
 
 
     $scope.canDoReturn = function () {
@@ -244,8 +245,10 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
         });
 
         $scope.$on("$destroy", function () {
-            if (interval) {
-                $interval.cancel(interval);
+            if (intervals) {
+                angular.forEach(intervals, function (item) {
+                    $interval.cancel(item);
+                })
             }
         });
 
@@ -273,6 +276,10 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
         }
     };
 
+    $scope.isAdmin = function () {
+        return $rootScope.isAdmin;
+    };
+
     // 申请防伪码
     $scope.barcodeGridOptions = {
         enableRowSelection: false,
@@ -295,6 +302,13 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
         data: []
     };
 
+    $scope.barcodeGridOptions.onRegisterApi = function (barcodeGridApi) {
+        $scope.barcodeGridApi = barcodeGridApi;
+        intervals.push($interval(function () {
+            $scope.barcodeGridApi.core.handleWindowResize();
+        }, 100));
+    };
+
     $scope.genBarcodeClick = function () {
         var barcodeInput = {};
         var barcodeDtlInput = [];
@@ -310,6 +324,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
             }
         });
         barcodeInput.dtl = barcodeDtlInput;
+        
         PoMstFileService.genBarcode(barcodeInput).then(
             function (response) {
                 if (response.data) {