流程枚举名称变更

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

@@ -93,8 +93,8 @@ public enum WorkFlowEmus {
     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", "订单审批-收货人限制修改申请"),
+    ORDER_OVERSEAS_WAREHOUSE_CHANGE("order_overseas_warehouse_change", "订单审批-海外仓修改申请"),
+    ORDER_CONSIGNEE_LIMIT_CHANGE("order_consignee_limit_change", "订单审批-收货人限制修改申请"),
     ;
     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

@@ -3,7 +3,6 @@ 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 cn.iocoder.yudao.module.order.service.order.OrderFeeApplicationService;
 import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,7 +17,7 @@ public class BmpOrderModelChangeResultListener extends BpmProcessInstanceResultE
     OrderCargoControlService orderCargoControlService;
     @Override
     protected String getProcessDefinitionKey() {
-        return WorkFlowEmus.ORDER_MODEL_CHANGE.getKey();
+        return WorkFlowEmus.ORDER_OVERSEAS_WAREHOUSE_CHANGE.getKey();
     }
 
     @Override

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

@@ -18,7 +18,7 @@ public class BmpChangeReleaseGoodsLimitResultListener extends BpmProcessInstance
     OrderCargoControlService orderCargoControlService;
     @Override
     protected String getProcessDefinitionKey() {
-        return WorkFlowEmus.SHIPMENT_CHANGE_RELEASE_GOODS_LIMIT.getKey();
+        return WorkFlowEmus.ORDER_CONSIGNEE_LIMIT_CHANGE.getKey();
     }
 
     @Override

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -31,7 +31,6 @@ import cn.iocoder.yudao.module.order.dal.mysql.approval.OrderApprovalMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
 import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
-import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum;
 import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum;
 import cn.iocoder.yudao.module.order.enums.OrderStatusEnum;
 import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
@@ -638,7 +637,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             orderApprovalDO.setType(61);
             orderApprovalDO.setDetails(JSONObject.toJSONString(orderCargoControlApplyVO));
             orderApprovalMapper.insert(orderApprovalDO);
-            String formId = bpmCreateServiceFactory.createBmp(userId, orderApprovalDO.getOrderApprovalId(), WorkFlowEmus.ORDER_MODEL_CHANGE.getKey(), orderDO.getOrderNo(),
+            String formId = bpmCreateServiceFactory.createBmp(userId, orderApprovalDO.getOrderApprovalId(), WorkFlowEmus.ORDER_OVERSEAS_WAREHOUSE_CHANGE.getKey(), orderDO.getOrderNo(),
                     StringUtils.isNotBlank(orderCargoControlApplyVO.getCcIds()) ? orderCargoControlApplyVO.getCcIds().split(StrUtil.COMMA) : null);
             orderApprovalDO.setFormId(formId);
             msg = "收货人限制修改申请";
@@ -665,7 +664,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             orderApprovalDO.setType(62);
             orderApprovalDO.setDetails(JSONObject.toJSONString(orderCargoControlApplyVO));
             orderApprovalMapper.insert(orderApprovalDO);
-            String formId = bpmCreateServiceFactory.createBmp(userId, orderApprovalDO.getOrderApprovalId(), WorkFlowEmus.SHIPMENT_CHANGE_RELEASE_GOODS_LIMIT.getKey(), orderDO.getOrderNo(),
+            String formId = bpmCreateServiceFactory.createBmp(userId, orderApprovalDO.getOrderApprovalId(), WorkFlowEmus.ORDER_CONSIGNEE_LIMIT_CHANGE.getKey(), orderDO.getOrderNo(),
                     StringUtils.isNotBlank(orderCargoControlApplyVO.getCcIds()) ? orderCargoControlApplyVO.getCcIds().split(StrUtil.COMMA) : null);
             orderApprovalDO.setFormId(formId);
             msg = "海外仓修改申请";