Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -3993,7 +3993,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 null, null, auditType, OrderApprovalTypeResultEnum.typeAndResultOf(auditType, 1).getDesc(), false);
 
         orderBusinessService.addOrderOperateLog(orderId, "仓库操作",
-                "航运中-追加-" + (isAppend ? "添加新品名" : "入仓"), applyInfoList);
+                OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-追加-") + (isAppend ? "添加新品名" : "入仓"), applyInfoList);
 
         // 返回
         return true;
@@ -4173,7 +4173,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         null, null, auditType, OrderApprovalTypeResultEnum.typeAndResultOf(auditType, 1).getDesc(), false);
 
                 orderBusinessService.addOrderOperateLog(orderId, "仓库操作",
-                        "航运中-提交货物入仓修改", applyInfoList);
+                        OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-提交货物入仓修改"), applyInfoList);
             }
             return I18nMessage.getMessage("order.warehousein.update.apply.success");
         } else {
@@ -4520,9 +4520,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
                 String msg = "货物入仓修改申请已拒绝";
                 if (updateReqVO.getIsShipmentUpdate()) {
-                    msg = "航运中-入仓修改申请已拒绝";
+                    msg = OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓修改申请已拒绝");
                 } else if (updateReqVO.getIsShipmentAppend()) {
-                    msg = "航运中-入仓追加申请已拒绝";
+                    msg =  OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓追加申请已拒绝");
                 }
 
                 // 添加仓库操作日志
@@ -4553,9 +4553,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
                 String msg = "货物入仓修改申请已取消";
                 if (updateReqVO.getIsShipmentUpdate()) {
-                    msg = "航运中-入仓修改申请已取消";
+                    msg =  OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓修改申请已取消");
                 } else if (updateReqVO.getIsShipmentAppend()) {
-                    msg = "航运中-入仓追加申请已取消";
+                    msg =  OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓追加申请已取消");
                 }
                 // 添加仓库操作日志
                 orderBusinessService.addOrderOperateLog(orderId, "仓库操作", msg, updateReqVO.getApplyInfoVOList());