防伪码送货单 取消审核

src/main/java/com/i1/srm/deliveryOrder/web/DoMstFileController.java

@@ -81,8 +81,15 @@ public class DoMstFileController extends AbstractController<DoMstFile, DoMstFile
         try {
             DoMstFile doMstFile = service.get(id);
             if (doMstFile != null) {
-                if (doMstFile.getReleased().equalsIgnoreCase(DoMstFile.UNRELEASED)) {
-                    throw new IOneServiceException("该送货单未发布，不能撤销", "该送货单未发布，不能撤销");
+                if ("Y".equals(doMstFile.getSupplier().getUseBarcode())) {
+                    if (doMstFile.getReleased().equalsIgnoreCase(DoMstFile.UNRELEASED)
+                            && doMstFile.getConfirm().equalsIgnoreCase(DoMstFile.UNCONFIRMED)) {
+                        throw new IOneServiceException("该送货单未审核未发布，不能取消审核", "该送货单未审核未发布，不能取消审核");
+                    }
+                } else {
+                    if (doMstFile.getReleased().equalsIgnoreCase(DoMstFile.UNRELEASED)) {
+                        throw new IOneServiceException("该送货单未发布，不能撤销", "该送货单未发布，不能撤销");
+                    }
                 }
                 return deliveryOrderWithdrawClient.withdraw(id);
             } else {

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

@@ -174,11 +174,17 @@
                 acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UNDO_RELEASE' "
                 ng-if="queryCondition.poMst.supplier.useBarcode !== 'Y'">发布撤回
         </button>
+        <!--启用防伪码：-->
         <button class="btn btn-default mrs" ng-click="release()"
                 ng-disabled="!currentDeliveryOrder ||  currentDeliveryOrder.confirm == '1' || currentDeliveryOrder.released == '1' || uiOption.releasing"
                 acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'RELEASE' "
                 ng-if="queryCondition.poMst.supplier.useBarcode === 'Y'">审核
         </button>
+        <button class="btn btn-default mrs" ng-click="unrelease()"
+                ng-disabled="!currentDeliveryOrder || (currentDeliveryOrder.released == '0' && currentDeliveryOrder.confirm == '0') || uiOption.unReleasing"
+                acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UNDO_RELEASE' "
+                ng-if="queryCondition.poMst.supplier.useBarcode === 'Y'">取消审核
+        </button>
         <button class="btn btn-default mrs" ng-click="clickExport()" ng-disabled="gridOptions.data.length == 0"
                 acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'EXPORT' ">导出
         </button>