|
|
@@ -166,12 +166,9 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
}
|
|
|
|
|
|
// 1.填充运单卸货单皮重、净重
|
|
|
- BigDecimal unloadAmount = updateTareAmount(param, takeTicket);
|
|
|
+ updateTareAmount(param, takeTicket);
|
|
|
|
|
|
- // 2.填充子运单卸货净重
|
|
|
- updateUnLoadAmount(param, waybillOrder, unloadAmount);
|
|
|
-
|
|
|
- // 3.创建卸货过磅记录
|
|
|
+ // 2.创建卸货过磅记录
|
|
|
createWeighbridges(waybillOrder);
|
|
|
}
|
|
|
|
|
|
@@ -180,7 +177,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
* @param param
|
|
|
* @param takeTicket
|
|
|
*/
|
|
|
- private BigDecimal updateTareAmount(WaybillOrderUnloadingWeighParam param, KwtWaybillOrderTicket takeTicket) {
|
|
|
+ private void updateTareAmount(WaybillOrderUnloadingWeighParam param, KwtWaybillOrderTicket takeTicket) {
|
|
|
//皮重
|
|
|
BigDecimal tareAmount = param.getWeighAmount();
|
|
|
//毛重
|
|
|
@@ -191,22 +188,6 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
takeTicket.setTareAmount(tareAmount);
|
|
|
takeTicket.setAmount(unloadAmount);
|
|
|
waybillOrderTicketRepository.updateById(takeTicket);
|
|
|
- return unloadAmount;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 填充装货净重
|
|
|
- * @param param
|
|
|
- * @param waybillOrder
|
|
|
- * @param unloadAmount
|
|
|
- */
|
|
|
- private void updateUnLoadAmount(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder, BigDecimal unloadAmount) {
|
|
|
- //更新子运单卸货净重
|
|
|
- KwtWaybillOrderSubtask subtask = getWaybillSubtask(waybillOrder.getId());
|
|
|
- subtask.setUnloadAmount(unloadAmount);
|
|
|
- subtask.setUnloadTime(new Date());
|
|
|
- waybillOrderSubtaskRepository.updateById(subtask);
|
|
|
- log.info("物流运单离场过磅成功!运单ID: {}, 皮重: {}, 卸货净重: {}", param.getWaybillOrderId(), param.getWeighAmount(), unloadAmount);
|
|
|
}
|
|
|
|
|
|
|