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

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

@@ -158,12 +158,12 @@
         </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' "
-                ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'">创建箱标签
+                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' "
-                ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode == 'Y'">修改箱标签
+                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/update/update.html

@@ -49,9 +49,15 @@
             <!--ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL && op == 'MODIFY' && isSteelCoil()"-->
             <!--ng-disabled="!updateDeliveryOrderForm.$valid">保存</button>-->
             <button class="btn btn-default mrs" ng-click="saveDeliveryOrderProductList(true)"
-                    ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL"
+                    ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL && (currentDeliveryOrder.supplier.useBarcode !='Y')"
                     ng-disabled="!updateDeliveryOrderForm.$valid">保存并创建箱标签
             </button>
+            <!--启用防伪码供应商useBarcode不创建箱标签-->
+            <button class="btn btn-default mrs" ng-click="saveDeliveryOrderProductList(false)"
+                    ng-if="(uiOption.currentStatus == uiStatus.CREATE_LABEL) && (currentDeliveryOrder.supplier.useBarcode =='Y')"
+                    ng-disabled="!updateDeliveryOrderForm.$valid">保存
+            </button>
+
         </div>
     </div>
 

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

@@ -689,7 +689,8 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
             }
 
             //check if the steel coil amount has been changed
-            if (!generateLabel) {
+            // barcode不产生箱标签修改 && $scope.deliveryOrderAggregationGridOptions.data[0].steelCoil == '1'
+            if (!generateLabel && $scope.deliveryOrderAggregationGridOptions.data[0].steelCoil == '1') {
                 DoDtlProductLabelFileService.getAllByExample({
                     doMst: {id: $scope.currentDeliveryOrderId}
                 }).then(function (response) {