|
|
@@ -290,7 +290,8 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
|
|
|
// 2. 铲车司机完成装载
|
|
|
loadingCompleted(forkliftWaybillOrder);
|
|
|
-
|
|
|
+
|
|
|
+ waybillOrder.setIsAutoCompleteLoading(Boolean.TRUE);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -311,7 +312,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
|
|
|
|
|
|
//修改司机状态
|
|
|
- updateWaybillOrder(forkliftWaybillOrder, CarWaybillV1Enum.REFUSE_TRAFFIC);
|
|
|
+ updateWaybillOrder(forkliftWaybillOrder, CarWaybillV1Enum.EXIT_COMPLETED);
|
|
|
|
|
|
log.info("[自动接单]铲车接单成功,铲车订单ID:{}", forkliftWaybillOrder.getWOrderId());
|
|
|
}
|
|
|
@@ -560,6 +561,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
|
|
|
@Override
|
|
|
protected void getStatus(KwtWaybillOrder waybillOrder) {
|
|
|
+ // 如果第一次过磅是自动装载的,前面已经更改状态了,这里不需要继续更改
|
|
|
+ if (waybillOrder.getIsAutoCompleteLoading()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
Integer status;
|
|
|
// 校验是否第一次过磅
|
|
|
if (waybillOrder.getIsExistWeighbridges()) {
|