|
|
@@ -166,7 +166,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
}
|
|
|
|
|
|
// 1.填充运单卸货单皮重、净重
|
|
|
- updateTareAmount(param, takeTicket);
|
|
|
+ updateTareAmount(param, waybillOrder, takeTicket);
|
|
|
|
|
|
// 2.创建卸货过磅记录
|
|
|
createWeighbridges(waybillOrder);
|
|
|
@@ -177,7 +177,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
* @param param
|
|
|
* @param takeTicket
|
|
|
*/
|
|
|
- private void updateTareAmount(WaybillOrderUnloadingWeighParam param, KwtWaybillOrderTicket takeTicket) {
|
|
|
+ private void updateTareAmount(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder, KwtWaybillOrderTicket takeTicket) {
|
|
|
//皮重
|
|
|
BigDecimal tareAmount = param.getWeighAmount();
|
|
|
//毛重
|
|
|
@@ -188,8 +188,21 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
|
|
|
takeTicket.setTareAmount(tareAmount);
|
|
|
takeTicket.setAmount(unloadAmount);
|
|
|
waybillOrderTicketRepository.updateById(takeTicket);
|
|
|
+
|
|
|
+ //2.更新子运单卸货量
|
|
|
+ updateWaybillOrderSubtask(waybillOrder, unloadAmount);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 更新子运单卸货量
|
|
|
+ * @param waybill
|
|
|
+ */
|
|
|
+ private void updateWaybillOrderSubtask(KwtWaybillOrder waybill, BigDecimal unloadAmount) {
|
|
|
+ KwtWaybillOrderSubtask subtask = getWaybillSubtask(waybill.getId());
|
|
|
+ subtask.setUnloadAmount(unloadAmount);
|
|
|
+ subtask.setUnloadTime(new Date());
|
|
|
+ waybillOrderSubtaskRepository.updateById(subtask);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
@Override
|