Merge branch 'master-fix' into release

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

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

@@ -6,6 +6,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.apollo.core.event.box.BoxCheckOrderRemoveLadingBillEvent;
+import cn.iocoder.yudao.framework.apollo.core.event.box.BoxCheckOrderSchedulingEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.Order.OrderApprovalTypeCheckEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.QueryChannelInfoEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.box.BoxCheckOrderSchedulingEvent;
@@ -4433,7 +4435,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         orderService.shipmentOrderInWarehouse(orderWarehouseInVO);
 
 
-                        orderBusinessService.addOrderOperateLog(orderId, "仓库操作", "航运中-入仓修改审批已通过", updateReqVO.getApplyInfoVOList());
+                        orderBusinessService.addOrderOperateLog(orderId, "仓库操作", OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓修改审批已通过"), updateReqVO.getApplyInfoVOList());
 
                         // 预装、理货、装柜
                         applicationContext.publishEvent(new BoxOrderShipmentWarehouseInEvent(orderId));
@@ -4482,12 +4484,14 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         orderItemService.updateById(orderItemDO);
                     }
 
-                    orderBusinessService.addOrderOperateLog(orderId, "仓库操作", "航运中-入仓追加审批已通过", updateReqVO.getApplyInfoVOList());
+                    orderBusinessService.addOrderOperateLog(orderId, "仓库操作", OrderStatusEnum.valueOf(orderDO.getStatus()).getNameZh().concat("-入仓追加审批已通过"), updateReqVO.getApplyInfoVOList());
 
                     // 预装、理货、装柜
                     applicationContext.publishEvent(new BoxOrderShipmentWarehouseInEvent(orderId));
 
                 }
+                // 入仓修改或入仓追加审批通过后，需要重置可能存在的提单(当订单已经开始出货了就可能已制作提单)
+                applicationContext.publishEvent(new BoxCheckOrderRemoveLadingBillEvent(orderId));
 
             }