|
|
@@ -290,7 +290,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
|
|
|
// 2. 铲车司机完成装载
|
|
|
loadingCompleted(forkliftWaybillOrder);
|
|
|
-
|
|
|
+
|
|
|
waybillOrder.setIsAutoCompleteLoading(Boolean.TRUE);
|
|
|
}
|
|
|
|
|
|
@@ -637,6 +637,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
// 第一条:称重完成
|
|
|
KwtWaybillOrderNode node1 = getWaybillOrderNode(param, waybillOrder);
|
|
|
node1.setRemark("车辆[" + waybillOrder.getTruckNo() + "]已到达装货点");
|
|
|
+ // 如果第一次过磅是自动装载的,前面已经更改状态了,这里需要赋值到达装货点
|
|
|
+ if (waybillOrder.getIsAutoCompleteLoading()) {
|
|
|
+ node1.setOrderStatus(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode());
|
|
|
+ }
|
|
|
waybillOrderNodeRepository.save(node1);
|
|
|
log.info("记录【已装货】节点轨迹成功,节点ID:{}", node1.getId());
|
|
|
// 间隔5秒钟,防止时间相同
|
|
|
@@ -647,6 +651,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
String tareAmount = getWeighAmount(param);
|
|
|
node2.setRemark("[" + param.getWeighbridgeName() + "]首次称重[" + tareAmount + "吨]");
|
|
|
node2.setCreateTime(fiveSecondsLater);
|
|
|
+ // 如果第一次过磅是自动装载的,前面已经更改状态了,这里需要赋值到达装货点
|
|
|
+ if (waybillOrder.getIsAutoCompleteLoading()) {
|
|
|
+ node2.setOrderStatus(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode());
|
|
|
+ }
|
|
|
waybillOrderNodeRepository.save(node2);
|
|
|
log.info("记录【过磅称重】节点轨迹成功,节点ID:{}", node2.getId());
|
|
|
}
|