aship/aship#4 防伪码功能-送货审核：防伪码启用供应商不创建箱标签

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

@@ -157,11 +157,13 @@
                 resource=" 'DELETE' ">删除
         </button>
         <button class="btn btn-default mrs" ng-click="createLabel()" ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || currentDeliveryOrderDetails.size == 0"
-                acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'CREATE_LABEL' ">创建箱标签
+                acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'CREATE_LABEL' "
+                ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'">创建箱标签
         </button>
         <button class="btn btn-default mrs" ng-click="openSteelCoilOrNotDlg()"
                 ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || currentDeliveryOrderDetails.size == 0"
-                acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UPDATE_LABEL' ">修改箱标签
+                acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UPDATE_LABEL' "
+                ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'">修改箱标签
         </button>
         <button class="btn btn-default mrs" ng-click="release()" ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || uiOption.releasing"
                 acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'RELEASE' ">发布

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

@@ -166,7 +166,8 @@ angular.module('IOne').controller('DeliveryOrderQueryController', 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
             };
         }