流程新增作废

sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuy.java

@@ -50,7 +50,7 @@ public class ApplyBuy extends BasePo {
     private Long flowId;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已采购
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废 10已采购
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/flow/ApplyBuyFlow.java

@@ -111,6 +111,18 @@ public class ApplyBuyFlow extends FlowDelegate {
     }
 
     /**
+     * 作废
+     *
+     * @param flowId     流程id
+     * @param businessId 业务id
+     * @param flowStatus 流程状态枚举
+     */
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        reject(flowId, businessId, flowStatus);
+    }
+
+    /**
      * 验证数据
      */
     private void validated(ApplyBuyDto applyBuyDto) {

sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java

@@ -145,4 +145,16 @@ public class PurchaseFlow  extends FlowDelegate {
         );
     }
 
+    /**
+     * 作废
+     *
+     * @param flowId     流程id
+     * @param businessId 业务id
+     * @param flowStatus 流程状态枚举
+     */
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        reject(flowId, businessId, flowStatus);
+    }
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuServiceImpl.java

@@ -41,6 +41,7 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         wrapper.eq("oi", OrderInfo::getDepartmentId, dto.getDepartmentId());
         wrapper.ge("oi", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("oi", OrderInfo::getWlnCreateTime, dto.getEndTime());
+        // wrapper.eq("oi", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
 
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }