Merge branch 'master-fix' into dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1923,21 +1923,11 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
         for (Long orderId : orderIdList) {
             orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
         }
-        this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
-
-        /**
-         * 修改订单状态
-         * @param orderId          订单ID 与订单号选择一个填写
-         * @param orderNo          订单号 与订单ID选择一个填写
-         * @param status           订单状态 订单主状态
-         * @param abnormalState    订单异常状态 0 原始状态
-         * @param inWarehouseState 入仓状态 0 原始状态
-         * @param shipmentState    出货状态 0 原始状态
-         * @param toWarehouseState 到仓状态 0 原始状态
-         * @param addOrderTime     是否添加订单动态  true添加  false不添加
-         */
-//        void updateStatus(Long orderId, String orderNo, Integer status, Integer abnormalState,
-//                Integer inWarehouseState, Integer shipmentState, Integer toWarehouseState, boolean addOrderTime);
+        // 卸柜/到仓操作时，不在此处更新动态
+        if (TO_WAREHOUSED.getStatus() != shipmentState) {
+            this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
+        }
+
     }
 
     @Override