|
|
@@ -1580,7 +1580,8 @@ public class KwtWaybillOrderV1Service {
|
|
|
KwtWaybillOrderSubtask orderSubtask = waybillOrderSubtaskDao.selectById(params.getWSubtaskId());
|
|
|
//榜单信息
|
|
|
List<WaybillOrderTicketLoadingDto> loading = params.getLoading();
|
|
|
- orderSubtask.setLoadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getLoadAmount()));
|
|
|
+ BigDecimal loadAmout = waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getLoadAmount());
|
|
|
+ orderSubtask.setLoadAmount(orderSubtask.getLoadAmount().add(loadAmout));
|
|
|
orderSubtask.setStatus(waybillOrder.getStatus());
|
|
|
waybillOrderSubtaskDao.updateById(orderSubtask);
|
|
|
|
|
|
@@ -1659,7 +1660,8 @@ public class KwtWaybillOrderV1Service {
|
|
|
KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
|
|
|
//榜单信息
|
|
|
List<WaybillOrderTicketLoadingDto> loading = params.getLoading();
|
|
|
- orderSubtask.setUnloadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getUnloadAmount()));
|
|
|
+ BigDecimal unloadAmout = waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getLoadAmount());
|
|
|
+ orderSubtask.setUnloadAmount(orderSubtask.getUnloadAmount().add(unloadAmout));
|
|
|
orderSubtask.setDeficitAmount(orderSubtask.getLoadAmount().subtract(orderSubtask.getUnloadAmount()));
|
|
|
BigDecimal deficitPrice = deficitPrice(orderSubtask.getLoadAmount(), orderSubtask.getDeficitAmount(),
|
|
|
logisticsOrder.getLoss(), logisticsOrder.getLossUnit(), logisticsOrder.getGoodsPrice());
|
|
|
@@ -2227,7 +2229,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
* @date 2024/3/7
|
|
|
**/
|
|
|
public BigDecimal countEntrustAmount(KwtWaybillOrderSubtask subtask, Long lAddressId) {
|
|
|
- List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findBySubtaskId(subtask.getId(), AddressTypeEnum.SHIPMENT.getCode());
|
|
|
+ List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findByLAddressIds(subtask.getWOrderId(), new ArrayList<>(){{add(lAddressId);}});
|
|
|
//运单地址进行统计
|
|
|
Map<String, Object> queryParams = new HashMap<>(NumberConstant.SIXTEEN);
|
|
|
queryParams.put("wOrderId", subtask.getWOrderId());
|