Merge branch 'master-fix' into dev

sql/update_2024-07.sql

@@ -13,17 +13,17 @@ alter table `ecw_order`
 
 
 CREATE TABLE `compare_air_customer_result` (
-                                               `id` bigint NOT NULL AUTO_INCREMENT,
-                                               `number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
-                                               `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
-                                               `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'phone',
-                                               `old_customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'old_customerName',
-                                               `customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'customerName',
-                                               `enter_open_sea_time` datetime DEFAULT NULL COMMENT '入公海时间',
-                                               `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
-                                               `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                               `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
-                                               PRIMARY KEY (`id`)
+       `id` bigint NOT NULL AUTO_INCREMENT,
+       `number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
+       `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
+       `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'phone',
+       `old_customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'old_customerName',
+       `customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'customerName',
+       `enter_open_sea_time` datetime DEFAULT NULL COMMENT '入公海时间',
+       `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
+       `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+       `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
+       PRIMARY KEY (`id`)
 ) ENGINE=InnoDB COMMENT='客户比对表结果表';
 
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -4203,6 +4203,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             case UNLOADED_CABINET:
 //                if (Objects.isNull(currentOrderDO.getUnloadTime())) {
                 currentOrderDO.setUnloadTime(now);
+//                }
+                break;
+            case UNLOADED_CABINET_AIR:
+//                if (Objects.isNull(currentOrderDO.getUnloadTime())) {
+                currentOrderDO.setUnloadTime(now);
 //                }
                 break;
             case PICKED_UP:

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

@@ -1976,6 +1976,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                         orderSeaTimeEnum = OrderSeaTimeEnum.SEA_CLEARED;
                         break;
                     case UNLOADED:
+                        if (Objects.isNull(businessTime)){
+                            // 到仓业务时间为空时，不更新订单到仓动态
+                            return;
+                        }
                         orderSeaTimeEnum = OrderSeaTimeEnum.SEA_UNLOADED_CABINET;
                         break;
                 }
@@ -2012,6 +2016,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                         orderAirTimeEnum = OrderAirTimeEnum.AIR_ARRIVED;
                         break;
                     case TO_WAREHOUSED:
+                        if (Objects.isNull(businessTime)){
+                            // 到仓业务时间为空时，不在做订单到仓动态更新
+                            return;
+                        }
                         orderAirTimeEnum = OrderAirTimeEnum.AIR_UNLOADED_CABINET;
                         break;
                 }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxCabinetUnload/BoxCabinetUnloadServiceImpl.java

@@ -137,14 +137,14 @@ public class BoxCabinetUnloadServiceImpl extends AbstractService<BoxCabinetUnloa
                 //修改订单状态为已到仓
                 boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
                         OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
-                        BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
+                        BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
 
                 boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_WAREHOUSE, "");
             } else {
                 //修改订单状态为已卸柜
                 boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
                         OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
-                        BoxStatusEnum.UNLOADED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
+                        BoxStatusEnum.UNLOADED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
 
                 boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_UNLOAD, "");
             }