|
@@ -3472,10 +3472,10 @@ public class KwtWaybillOrderV1Service {
|
|
|
//氧化钙
|
|
//氧化钙
|
|
|
WaybillOrderSaleDto waybillOrderSaleDto2 = waybillOrderV1Dao.saleSum(List.of("003", "0007", "0008", "0009"));
|
|
WaybillOrderSaleDto waybillOrderSaleDto2 = waybillOrderV1Dao.saleSum(List.of("003", "0007", "0008", "0009"));
|
|
|
WaybillOrderSaleVo waybillOrderSaleVo = new WaybillOrderSaleVo();
|
|
WaybillOrderSaleVo waybillOrderSaleVo = new WaybillOrderSaleVo();
|
|
|
- waybillOrderSaleVo.setShsChl(waybillOrderSaleDto.getChl());
|
|
|
|
|
- waybillOrderSaleVo.setShsXsl(waybillOrderSaleDto.getXsl());
|
|
|
|
|
- waybillOrderSaleVo.setYhgChl(waybillOrderSaleDto2.getChl());
|
|
|
|
|
- waybillOrderSaleVo.setYhgXsl(waybillOrderSaleDto2.getXsl());
|
|
|
|
|
|
|
+ waybillOrderSaleVo.setShsChl(Objects.nonNull(waybillOrderSaleDto) ? waybillOrderSaleDto.getChl() : BigDecimal.ZERO);
|
|
|
|
|
+ waybillOrderSaleVo.setShsXsl(Objects.nonNull(waybillOrderSaleDto) ? waybillOrderSaleDto.getXsl() : BigDecimal.ZERO);
|
|
|
|
|
+ waybillOrderSaleVo.setYhgChl(Objects.nonNull(waybillOrderSaleDto2) ? waybillOrderSaleDto2.getChl() : BigDecimal.ZERO);
|
|
|
|
|
+ waybillOrderSaleVo.setYhgXsl(Objects.nonNull(waybillOrderSaleDto2) ? waybillOrderSaleDto2.getXsl() : BigDecimal.ZERO);
|
|
|
|
|
|
|
|
return waybillOrderSaleVo;
|
|
return waybillOrderSaleVo;
|
|
|
}
|
|
}
|