Skip to content

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

海运订单更新了空运到仓动态的bug修复

parent f8a5c2fa
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 82 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 1bcf5646
......@@ -3090,7 +3090,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
if (boxDO.getTransportType().equals(TransportTypeEnum.AIR.getType())) {
checkOrderTagNum(shipmentId, 0);
//空运，修改订单状态
updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.SHIPMENT.getValue(), null, BoxAirStatusEnum.TALLY_COMPLETE.getStatus(), null, null);
updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.SHIPMENT.getValue(), null,
BoxAirStatusEnum.TALLY_COMPLETE.getStatus(), null, null, Integer.parseInt(boxDO.getTransportType()));
}
}
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxApproval/BoxApprovalServiceImpl.java
View file @ 1bcf5646
......@@ -137,8 +137,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum pre_install_processing = OrderApprovalTypeResultEnum.pre_install_processing;
//修改为预装审核中、预装时需要将入仓子状态置0
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
BoxStatusEnum.PREINSTALL_EXAMINE.getStatus(), pre_install_processing.getType(), pre_install_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
BoxStatusEnum.PREINSTALL_EXAMINE.getStatus(), pre_install_processing.getType(), pre_install_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (createReqVO.getApprovalType() ==
BoxApprovalTypeEnum.SEALING_CABINET.getType()) {
......@@ -158,8 +158,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum closure_processing = OrderApprovalTypeResultEnum.closure_processing;
//修改为封柜审核中
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.INSTALLED_CABINET.getValue(), null,
BoxStatusEnum.SEAL_EXAMINE.getStatus(), closure_processing.getType(), closure_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.INSTALLED_CABINET.getValue(), null,
BoxStatusEnum.SEAL_EXAMINE.getStatus(), closure_processing.getType(), closure_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
//封柜申请日志
boxOpLogService.createBoxOpLog(boxDO.getId(), ldStatusEnum.getLdStatus(), ldStatusEnum.getStatusNameZh(), ldStatusEnum.getStatusNameEn(), boxApproval.getId());
......@@ -182,9 +182,9 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum unloading_cabinet_processing = OrderApprovalTypeResultEnum.unloading_cabinet_processing;
//修改为卸柜审核中
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus, null,
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, null,
BoxStatusEnum.UNLOAD_EXAMINE.getStatus(), unloading_cabinet_processing.getType(),
unloading_cabinet_processing.getDesc());
unloading_cabinet_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
//卸柜审核日志
boxOpLogService.createBoxOpLog(shipmentId, ulStatusEnum.getUlStatus(), ulStatusEnum.getStatusNameZh(), ulStatusEnum.getStatusNameEn(), boxApproval.getId());
......@@ -200,8 +200,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
PrStatusEnum.PRELOAD_BACK_APPROVAL_ING.getStatusNameZh(), PrStatusEnum.PRELOAD_BACK_APPROVAL_ING.getStatusNameEn(), boxApproval.getId());
OrderApprovalTypeResultEnum pre_install_back_processing = OrderApprovalTypeResultEnum.pre_install_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, pre_install_back_processing.getType(), pre_install_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, pre_install_back_processing.getType(), pre_install_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//------------------------------------------封柜反审-------------------------------------------
......@@ -214,8 +214,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
LdStatusEnum.CABINET_BACK_EXAMINE_ING.getStatusNameZh(), LdStatusEnum.CABINET_BACK_EXAMINE_ING.getStatusNameEn(), boxApproval.getId());
OrderApprovalTypeResultEnum closure_back_processing = OrderApprovalTypeResultEnum.closure_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, closure_back_processing.getType(), closure_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, closure_back_processing.getType(), closure_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//-------------------------------------------报关全退----------------------------------------
......@@ -232,8 +232,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(boxDO.getId(), opStatus, "报关全部退场审核中", "Full return of customs declaration under review", boxApproval.getId());
OrderApprovalTypeResultEnum customs_exit_processing = OrderApprovalTypeResultEnum.customs_exit_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//------------------------------------------------报关部分退-------------------------------------
......@@ -251,8 +251,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum customs_exit_processing = OrderApprovalTypeResultEnum.customs_exit_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//---------------------------------------------卸柜反审-------------------------------------
......@@ -265,8 +265,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
ULStatusEnum.UNLOADING_BACK_EXAMINE_ING.getStatusNameZh(), ULStatusEnum.UNLOADING_BACK_EXAMINE_ING.getStatusNameEn(), boxApproval.getId());
OrderApprovalTypeResultEnum unloading_cabinet_back_processing = OrderApprovalTypeResultEnum.unloading_cabinet_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, unloading_cabinet_back_processing.getType(), unloading_cabinet_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, unloading_cabinet_back_processing.getType(), unloading_cabinet_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//--------------------------------------出货拆单-----------------------------------
......@@ -433,8 +433,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(boxDO.getId(), opStatus, "报关删单退场审核中", "The customs clearance part is undergoing exit review", boxApproval.getId());
OrderApprovalTypeResultEnum customs_exit_processing = OrderApprovalTypeResultEnum.customs_exit_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, customs_exit_processing.getType(), customs_exit_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
boxDO.setOverMachineExamineStatus(BpmProcessInstanceResultEnum.PROCESS.getResult());
CustomsExitType customsExitType = JSON.parseObject(boxApproval.getDetails(), CustomsExitType.class);
......@@ -460,9 +460,9 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum warehoused_processing = OrderApprovalTypeResultEnum.warehoused_processing;
//修改为到仓审核中
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.CLEARED.getValue(), null,
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.CLEARED.getValue(), null,
BoxAirStatusEnum.TO_WAREHOUSE_EXAMINE.getStatus(), warehoused_processing.getType(),
warehoused_processing.getDesc());
warehoused_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
//到仓审核日志
boxOpLogService.createBoxOpLog(shipmentId, twStatusEnum.getTwStatus(), twStatusEnum.getStatusNameZh(), twStatusEnum.getStatusNameEn(), boxApproval.getId());
......@@ -477,8 +477,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_ING.getStatusNameZh(), TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_ING.getStatusNameEn(), boxApproval.getId());
OrderApprovalTypeResultEnum warehoused_back_processing = OrderApprovalTypeResultEnum.warehoused_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, warehoused_back_processing.getType(), warehoused_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, warehoused_back_processing.getType(), warehoused_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
......@@ -498,8 +498,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
OrderApprovalTypeResultEnum sorting_processing = OrderApprovalTypeResultEnum.sorting_processing;
//修改为分拣审核中、分拣时需要将入仓子状态置0 ? 空运的是否需要修改???
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
BoxStatusEnum.PREINSTALL_EXAMINE.getStatus(), sorting_processing.getType(), sorting_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
BoxStatusEnum.PREINSTALL_EXAMINE.getStatus(), sorting_processing.getType(), sorting_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//------------------------------------------分拣反审核-------------------------
......@@ -511,8 +511,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
StStatusEnum.SORTING_BACK_APPROVAL_ING.getStatusNameZh(), StStatusEnum.SORTING_BACK_APPROVAL_ING.getStatusNameEn(), boxApproval.getId());
OrderApprovalTypeResultEnum sorting_back_processing = OrderApprovalTypeResultEnum.sorting_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, sorting_back_processing.getType(), sorting_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, sorting_back_processing.getType(), sorting_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
......@@ -525,8 +525,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
AirShipmentStatusEnum.SHIPMENT_APPROVAL_ING.getText(), AirShipmentStatusEnum.SHIPMENT_APPROVAL_ING.getTextEn(), boxApproval.getId());
OrderApprovalTypeResultEnum shipment_processing = OrderApprovalTypeResultEnum.shipment_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, shipment_processing.getType(), shipment_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, shipment_processing.getType(), shipment_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
//------------------------------------------出货反审核-------------------------
......@@ -538,8 +538,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_ING.getText(), AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_ING.getTextEn(), boxApproval.getId());
OrderApprovalTypeResultEnum shipment_back_processing = OrderApprovalTypeResultEnum.shipment_back_processing;
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, shipment_back_processing.getType(), shipment_back_processing.getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, shipment_back_processing.getType(), shipment_back_processing.getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
......@@ -705,8 +705,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
PrStatusEnum.PRELOAD_BACK_APPROVAL_SUCCESS.getStatusNameZh(), PrStatusEnum.PRELOAD_BACK_APPROVAL_SUCCESS.getStatusNameEn(), boxApprovalDO.getId());
//反审后修改订单为入仓状态
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.IN_WAREHOUSE.getValue(),
OrderWarehouseInStatusEnum.warehouse_finished.getValue(), 0, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.IN_WAREHOUSE.getValue(),
OrderWarehouseInStatusEnum.warehouse_finished.getValue(), 0, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//反审后清除订单表的提单号
boxService.clearOrderTidanNo(shipmentId, false);
......@@ -722,12 +722,12 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(boxDO.getId(), PrStatusEnum.PRELOAD_BACK_APPROVAL_FAIL.getPrStatus(),
PrStatusEnum.PRELOAD_BACK_APPROVAL_FAIL.getStatusNameZh(), PrStatusEnum.PRELOAD_BACK_APPROVAL_FAIL.getStatusNameEn(), boxApprovalDO.getId());
//反审失败
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
//反审取消
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(24, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
case SHIPMENT_CLOSE_CONTAINER_NO:
......@@ -750,8 +750,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxDO.setLdStatus(LdStatusEnum.IN_CABINET.getLdStatus());
//反审后修改订单为预装状态
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.PRE_INSTALLED.getValue(),
0, BoxStatusEnum.IN_THE_CABINETS.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.PRE_INSTALLED.getValue(),
0, BoxStatusEnum.IN_THE_CABINETS.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//封柜反审日志
boxOpLogService.createBoxOpLog(boxDO.getId(), LdStatusEnum.CABINET_BACK_EXAMINE_SUCCESS.getLdStatus(),
......@@ -770,12 +770,12 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
LdStatusEnum.CABINET_BACK_EXAMINE_FAIL.getStatusNameZh(), LdStatusEnum.CABINET_BACK_EXAMINE_FAIL.getStatusNameEn(), boxApprovalDO.getId());
//反审失败
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
//反审取消
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(25, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
case SHIPMENT_CLOSE_CONTAINER:
......@@ -845,7 +845,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
}
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus, 0, shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(20, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, 0,
shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(20, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
case SHIPMENT_UNLOAD_CONTAINER_NO:
......@@ -861,8 +862,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
orderStatus = OrderStatusEnum.TWP_WAY_ARRIVAL.getValue();
shipmentState = BoxStatusEnum.TWO_WAY_ARRIVAL.getStatus();
}
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus,
0, shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, 0,
shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//卸柜反审核日志
boxOpLogService.createBoxOpLog(shipmentId, ULStatusEnum.UNLOADING_BACK_EXAMINE_SUCCESS.getUlStatus(),
......@@ -873,11 +874,11 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(shipmentId, ULStatusEnum.UNLOADING_BACK_EXAMINE_FAIL.getUlStatus(),
ULStatusEnum.UNLOADING_BACK_EXAMINE_FAIL.getStatusNameZh(), ULStatusEnum.UNLOADING_BACK_EXAMINE_FAIL.getStatusNameEn(), boxApprovalDO.getId());
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(26, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
case SHIPMENT_CUSTOMS_EXIT_ALL:
......@@ -891,8 +892,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
} else if(result == BpmProcessInstanceResultEnum.REJECT.getResult()) {
boxOpLogService.createBoxOpLog(boxDO.getId(), opStatus, "报关全部退场审核失败", "Full return of customs declaration under review fail", boxApprovalDO.getId());
}
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
break;
case SHIPMENT_CUSTOMS_EXIT_PART:
//报关部分退
......@@ -905,8 +906,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
} else if(result == BpmProcessInstanceResultEnum.REJECT.getResult()) {
boxOpLogService.createBoxOpLog(boxDO.getId(), opStatus, "报关部分退场审核失败", "part return of customs declaration under review fail", boxApprovalDO.getId());
}
boxService.updateOrderStatusByShipmentId(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, 0,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
break;
case SHIPMENT_CUSTOMS_DECLARE_REMOVE_SPLIT:
// 删单退场拆单业务(主要操作流程与部分退场拆单一致)
......@@ -1204,8 +1205,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxApprovalDO.getId());
}
}
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(27, result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
boxDO.setOverMachineExamineStatus(result);
......@@ -1257,7 +1258,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
}
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus, inWarehouseState, shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, inWarehouseState,
shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
......@@ -1285,8 +1287,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
StStatusEnum.SORTING_BACK_APPROVAL_SUCCESS.getStatusNameZh(), StStatusEnum.SORTING_BACK_APPROVAL_SUCCESS.getStatusNameEn(), boxApprovalDO.getId());
//反审后修改订单为入仓状态
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.IN_WAREHOUSE.getValue(),
OrderWarehouseInStatusEnum.warehouse_finished.getValue(), 0, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.IN_WAREHOUSE.getValue(),
OrderWarehouseInStatusEnum.warehouse_finished.getValue(), 0, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//反审后清除订单表的提单号
boxService.clearOrderTidanNo(shipmentId, false);
......@@ -1308,12 +1310,12 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(boxDO.getId(), StStatusEnum.SORTING_BACK_APPROVAL_FAIL.getStStatus(),
StStatusEnum.SORTING_BACK_APPROVAL_FAIL.getStatusNameZh(), StStatusEnum.SORTING_BACK_APPROVAL_FAIL.getStatusNameEn(), boxApprovalDO.getId());
//反审失败
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
//反审取消
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.sorting_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
......@@ -1351,7 +1353,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
}
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus, 0, shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, 0,
shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
......@@ -1365,8 +1368,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
orderStatus = OrderStatusEnum.CLEARED.getValue();
shipmentState = BoxStatusEnum.CLEARANCE_WAIT_UNLOAD.getStatus();
boxService.updateOrderStatusByShipmentId(shipmentId, orderStatus,
0, shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, orderStatus, 0,
shipmentState, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//到仓反审核日志
boxOpLogService.createBoxOpLog(shipmentId, TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_SUCCESS.getTwStatus(),
......@@ -1377,11 +1380,11 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(shipmentId, TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_FAIL.getTwStatus(),
TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_FAIL.getStatusNameZh(), TWStatusEnum.TO_WAREHOUSE_BACK_EXAMINE_FAIL.getStatusNameEn(), boxApprovalDO.getId());
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.warehoused_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
......@@ -1395,19 +1398,21 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
//修改为出货审核后生成提单号
// boxService.generateBillLadingNo(shipmentId, true, false);
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.SHIPMENT.getValue(),
null, BoxAirStatusEnum.AIR_SHIPPED.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.SHIPMENT.getValue(),
null, BoxAirStatusEnum.AIR_SHIPPED.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.AIR_OUT_SHIPMENT, "");
} else if (result == BpmProcessInstanceResultEnum.REJECT.getResult()) {
airShipmentStatusEnum = AirShipmentStatusEnum.SHIPMENT_APPROVAL_FAIL;
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, null, null, null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_reject.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_reject.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
airShipmentStatusEnum = AirShipmentStatusEnum.UNSHIPMENT;
//修改订单状态
boxService.updateOrderStatusByShipmentId(shipmentId, null, null, null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_cancel.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_cancel.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
if (result != BpmProcessInstanceResultEnum.CANCEL.getResult()) {
//新增审核日志
......@@ -1437,8 +1442,8 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_SUCCESS.getText(), AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_SUCCESS.getTextEn(), boxApprovalDO.getId());
//反审后修改订单为出货状态
boxService.updateOrderStatusByShipmentId(shipmentId, OrderStatusEnum.SHIPMENT.getValue(),
null, BoxAirStatusEnum.TALLY_COMPLETE.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.SHIPMENT.getValue(), null,
BoxAirStatusEnum.TALLY_COMPLETE.getStatus(), 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
//反审后清除订单表的提单号
// boxService.clearOrderTidanNo(shipmentId, false);
......@@ -1455,12 +1460,12 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
boxOpLogService.createBoxOpLog(boxDO.getId(), AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_FAIL.getStatus(),
AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_FAIL.getText(), AirShipmentStatusEnum.SHIPMENT_BACK_APPROVAL_FAIL.getTextEn(), boxApprovalDO.getId());
//反审失败
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
} else if (result == BpmProcessInstanceResultEnum.CANCEL.getResult()) {
//反审取消
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc());
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(OrderApprovalTypeResultEnum.shipment_back_pass.getType(), result).getDesc(), Integer.parseInt(boxDO.getTransportType()));
}
break;
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxTrailer/BoxTrailerServiceImpl.java
View file @ 1bcf5646
......@@ -85,8 +85,8 @@ public class BoxTrailerServiceImpl extends AbstractService<BoxTrailerMapper, Box
//如果是已经派车，则不用再次更新订单状态
if(tlStatus != TlStatueEnum.HAS_SEND_CAR.getTlStatus()) {
boxService.updateOrderStatusByShipmentId(shipmentId, null, null,
boxDO.getShipmentStatus(), null, null);
boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, null, null,
boxDO.getShipmentStatus(), null, null, Integer.parseInt(boxDO.getTransportType()));
}
}
boxService.updateById(boxDO);
......
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