bug修复

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

@@ -1865,15 +1865,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
         for (Long orderId : orderIdList) {
             orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
         }
-        if (transportType == 3) {
-            if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
-                // 空运清关
-                addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, null, businessTime, null);
-            } else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus()) {
-                // 空运到港
-                addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, null, businessTime, null);
-            } else {
-                this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
+        if (Objects.nonNull(shipmentState)) {
+            if (transportType == 1) {
+                this.shipmentSeaOrderTimeLog(orderIdList, null, businessTime, shipmentState);
+            } else if (transportType == 3) {
+                if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
+                    // 空运清关
+                    addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, null, businessTime, null);
+                } else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
+                    // 空运到港
+                    addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, null, businessTime, null);
+                } else {
+                    this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
+                }
             }
         }
     }
@@ -1902,17 +1906,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
         for (Long orderId : orderIdList) {
             orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
         }
-        if (transportType == 1) {
-            this.shipmentSeaOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
-        } else if (transportType == 3) {
-            if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
-                // 空运清关
-                addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, estTime, businessTime, null);
-            } else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
-                // 空运到港
-                addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, estTime, businessTime, null);
-            } else {
-                this.shipmentAirOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
+        if (Objects.nonNull(shipmentState)) {
+            if (transportType == 1) {
+                this.shipmentSeaOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
+            } else if (transportType == 3) {
+                if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
+                    // 空运清关
+                    addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, estTime, businessTime, null);
+                } else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
+                    // 空运到港
+                    addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, estTime, businessTime, null);
+                } else {
+                    this.shipmentAirOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
+                }
             }
         }
     }