Skip to content

J
jiedao-api-boot-master
Commit 14dc8f3d authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

bug修复

parent fec004c1
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 20 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 14dc8f3d
...@@ -1865,15 +1865,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements ...@@ -1865,15 +1865,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
for (Long orderId : orderIdList) { for (Long orderId : orderIdList) {
orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null); orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
} }
if (transportType == 3) { if (Objects.nonNull(shipmentState)) {
if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) { if (transportType == 1) {
// 空运清关 this.shipmentSeaOrderTimeLog(orderIdList, null, businessTime, shipmentState);
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, null, businessTime, null); } else if (transportType == 3) {
} else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus()) { if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) {
// 空运到港 // 空运清关
addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, null, businessTime, null); addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_CLEARED, null, null, null, businessTime, null);
} else { } else if (shipmentState == BoxStatusEnum.ARRIVAL_WAIT_DISCHARGE.getStatus() || shipmentState == BoxStatusEnum.DISCHARGE_WAIT_CLEARANCE.getStatus()) {
this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState); // 空运到港
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 ...@@ -1902,17 +1906,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
for (Long orderId : orderIdList) { for (Long orderId : orderIdList) {
orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null); orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
} }
if (transportType == 1) { if (Objects.nonNull(shipmentState)) {
this.shipmentSeaOrderTimeLog(orderIdList, estTime, businessTime, shipmentState); if (transportType == 1) {
} else if (transportType == 3) { this.shipmentSeaOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
if (shipmentState == BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus()) { } 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_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 { addOrderAirTimeLog(orderIdList, OrderAirTimeEnum.AIR_ARRIVED, null, null, estTime, businessTime, null);
this.shipmentAirOrderTimeLog(orderIdList, estTime, businessTime, shipmentState); } else {
this.shipmentAirOrderTimeLog(orderIdList, estTime, businessTime, shipmentState);
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment