|
|
@@ -942,38 +942,36 @@ public class GatekeeperOrderService {
|
|
|
//查询子运单
|
|
|
KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
|
|
|
|
|
|
- CompletableFuture.runAsync(() -> {
|
|
|
- try {
|
|
|
- KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
|
|
|
- gatekeeper.setEntId(waybillOrder.getEntId());
|
|
|
- gatekeeper.setWOrderId(waybillOrder.getId());
|
|
|
- gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
|
|
|
- gatekeeper.setLOrderId(waybillOrder.getLOrderId());
|
|
|
- // 查询商品信息
|
|
|
- KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
|
|
|
- if (orderGoods != null) {
|
|
|
- gatekeeper.setGoodsId(orderGoods.getGoodsId());
|
|
|
- gatekeeper.setGoodsName(orderGoods.getGoodsName());
|
|
|
- }
|
|
|
- gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
|
|
|
- gatekeeper.setType(GatekeeperTypeEnum.UNLOADING.getCode());
|
|
|
- gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
|
|
|
- gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
|
|
|
- gatekeeper.setTruckType(truck.getTruckType());
|
|
|
- gatekeeper.setEntrustAmount(waybillSubtask.getEntrustAmount());
|
|
|
- gatekeeper.setCarAxis(truck.getCarAxis());
|
|
|
- gatekeeper.setLegalLoad(truck.getLegalLoad());
|
|
|
- gatekeeper.setCreateTime(new Date());
|
|
|
- gatekeeper.setCreateUser(waybillOrder.getDriverId());
|
|
|
- gatekeeper.setUpdateUser(waybillOrder.getDriverId());
|
|
|
-
|
|
|
- log.debug("开始异步保存卸货门卫订单数据,运单ID:{}", waybillOrder.getId());
|
|
|
- gatekeeperWaybillOrderRepository.save(gatekeeper);
|
|
|
- log.debug("卸货门卫订单数据保存成功");
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("异步保存卸货门卫订单数据失败!运单ID: {}, 异常信息:", waybillOrder.getId(), e);
|
|
|
+ try {
|
|
|
+ KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
|
|
|
+ gatekeeper.setEntId(waybillOrder.getEntId());
|
|
|
+ gatekeeper.setWOrderId(waybillOrder.getId());
|
|
|
+ gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
|
|
|
+ gatekeeper.setLOrderId(waybillOrder.getLOrderId());
|
|
|
+ // 查询商品信息
|
|
|
+ KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
|
|
|
+ if (orderGoods != null) {
|
|
|
+ gatekeeper.setGoodsId(orderGoods.getGoodsId());
|
|
|
+ gatekeeper.setGoodsName(orderGoods.getGoodsName());
|
|
|
}
|
|
|
- });
|
|
|
+ gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
|
|
|
+ gatekeeper.setType(GatekeeperTypeEnum.UNLOADING.getCode());
|
|
|
+ gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
|
|
|
+ gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
|
|
|
+ gatekeeper.setTruckType(truck.getTruckType());
|
|
|
+ gatekeeper.setEntrustAmount(waybillSubtask.getEntrustAmount());
|
|
|
+ gatekeeper.setCarAxis(truck.getCarAxis());
|
|
|
+ gatekeeper.setLegalLoad(truck.getLegalLoad());
|
|
|
+ gatekeeper.setCreateTime(new Date());
|
|
|
+ gatekeeper.setCreateUser(waybillOrder.getDriverId());
|
|
|
+ gatekeeper.setUpdateUser(waybillOrder.getDriverId());
|
|
|
+
|
|
|
+ log.debug("开始异步保存卸货门卫订单数据,运单ID:{}", waybillOrder.getId());
|
|
|
+ gatekeeperWaybillOrderRepository.save(gatekeeper);
|
|
|
+ log.debug("卸货门卫订单数据保存成功");
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("异步保存卸货门卫订单数据失败!运单ID: {}, 异常信息:", waybillOrder.getId(), e);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|