Merge branch 'master_jiuping' into dev

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/WorkFlowEmus.java

@@ -92,8 +92,9 @@ public enum WorkFlowEmus {
     FINANCE_COMMISSION_PAYMENT_APPROVE_NO("finance_commission_payment_approve_no", "财务审核-佣金付款单反审核"),
     FINANCE_COMMISSION_PAYMENT_WRITE_OFF("finance_commission_payment_write_off", "财务审核-佣金付款单核销审核"),
     FINANCE_COMMISSION_PAYMENT_WRITE_OFF_NO("finance_commission_payment_write_off_no", "财务审核-佣金付款单反核销审核"),
-
     SHIPMENT_LINE_WEIGHT_ALLOW_OVER("shipment_line_weight_allow_over", "出货审批-允许超出线路重量上限审核"),
+    ORDER_MODEL_CHANGE("order_model_change", "订单审批-订单模式变更审核"),
+    SHIPMENT_CHANGE_RELEASE_GOODS_LIMIT("shipment_change_release_goods_limit", "出货审批-变更出货限制审核"),
     ;
     private String key;
     private String value;

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/order/listener/BmpOrderModelChangeResultListener.java

+package cn.iocoder.yudao.module.bpm.service.order.listener;
+
+import cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus;
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class BmpOrderModelChangeResultListener extends BpmProcessInstanceResultEventListener {
+
+
+    @Override
+    protected String getProcessDefinitionKey() {
+        return WorkFlowEmus.ORDER_MODEL_CHANGE.getKey();
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceResultEvent event) {
+        log.info("----------------------订单模式变更审核----------------------,{},{}" + event.getBusinessKey(), event.getResult());
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/shipment/listener/BmpChangeReleaseGoodsLimitResultListener.java

+package cn.iocoder.yudao.module.bpm.service.shipment.listener;
+
+import cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus;
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
+import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class BmpChangeReleaseGoodsLimitResultListener extends BpmProcessInstanceResultEventListener {
+
+
+    @Override
+    protected String getProcessDefinitionKey() {
+        return WorkFlowEmus.SHIPMENT_CHANGE_RELEASE_GOODS_LIMIT.getKey();
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceResultEvent event) {
+        log.info("----------------------变更出货限制回调----------------------,{},{}" + event.getBusinessKey(), event.getResult());
+    }
+
+}