|
@@ -511,7 +511,7 @@ public class KwtWaybillOrderService {
|
|
|
String wOrderNo = getRedisGenerateWaybillOrderNo(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, logisticsOrder.getLOrderNo());
|
|
String wOrderNo = getRedisGenerateWaybillOrderNo(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, logisticsOrder.getLOrderNo());
|
|
|
waybillOrder.setId(null);
|
|
waybillOrder.setId(null);
|
|
|
waybillOrder.setWOrderNo(wOrderNo);
|
|
waybillOrder.setWOrderNo(wOrderNo);
|
|
|
- ranksSave(waybillOrder, loadAddress, unloadAddress);
|
|
|
|
|
|
|
+ ranksSave(waybillOrder, loadAddress, unloadAddress, null);
|
|
|
|
|
|
|
|
/**SckwWaybillOrder数据组装**/
|
|
/**SckwWaybillOrder数据组装**/
|
|
|
SckwWaybillOrder mongoOrder = setSckwWaybillOrder(sendCarDto, waybillOrder, logisticsOrder, loadAddress,
|
|
SckwWaybillOrder mongoOrder = setSckwWaybillOrder(sendCarDto, waybillOrder, logisticsOrder, loadAddress,
|
|
@@ -581,7 +581,8 @@ public class KwtWaybillOrderService {
|
|
|
* @author zk
|
|
* @author zk
|
|
|
* @date 2023/7/21
|
|
* @date 2023/7/21
|
|
|
**/
|
|
**/
|
|
|
- public void ranksSave(KwtWaybillOrder waybillOrder, KwtWaybillOrderAddress loadAddress, KwtWaybillOrderAddress unloadAddress) {
|
|
|
|
|
|
|
+ public void ranksSave(KwtWaybillOrder waybillOrder, KwtWaybillOrderAddress loadAddress,
|
|
|
|
|
+ KwtWaybillOrderAddress unloadAddress, Date operateTime) {
|
|
|
/**车辆运单信息**/
|
|
/**车辆运单信息**/
|
|
|
waybillOrderDao.insert(waybillOrder);
|
|
waybillOrderDao.insert(waybillOrder);
|
|
|
|
|
|
|
@@ -598,7 +599,8 @@ public class KwtWaybillOrderService {
|
|
|
waybillOrderAddressDao.insert(unloadAddress);
|
|
waybillOrderAddressDao.insert(unloadAddress);
|
|
|
|
|
|
|
|
/**车辆运单状态记录**/
|
|
/**车辆运单状态记录**/
|
|
|
- this.setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), null);
|
|
|
|
|
|
|
+ this.setWaybillOrderTrack(waybillOrder.getId(), operateTime != null ? operateTime : waybillOrder.getUpdateTime(),
|
|
|
|
|
+ waybillOrder.getStatus(), null);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1257,7 +1259,7 @@ public class KwtWaybillOrderService {
|
|
|
KwtWaybillOrder waybillOrder = setKwtWaybillOrder(circulate, params, wOrderNo);
|
|
KwtWaybillOrder waybillOrder = setKwtWaybillOrder(circulate, params, wOrderNo);
|
|
|
|
|
|
|
|
/**2车辆运单存储**/
|
|
/**2车辆运单存储**/
|
|
|
- ranksSave(waybillOrder, loadAddress, unloadAddress);
|
|
|
|
|
|
|
+ ranksSave(waybillOrder, loadAddress, unloadAddress, params.getOperateTime());
|
|
|
//补上车辆运单待接单状态
|
|
//补上车辆运单待接单状态
|
|
|
setWaybillOrderTrack(circulate, waybillOrder.getId());
|
|
setWaybillOrderTrack(circulate, waybillOrder.getId());
|
|
|
|
|
|