提交 1a523259 authored 作者: 艾庆国's avatar 艾庆国

Merge branch 'refs/heads/v30.6_order_quote_20241022' into test_jdk17

Former-commit-id: e0dde96d
...@@ -501,9 +501,9 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -501,9 +501,9 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setOrderNo(orderGoods.getOrderNo()); orderChild.setOrderNo(orderGoods.getOrderNo());
orderChild.setOrderGoodsNo(orderGoods.getOrderGoodsNo()); orderChild.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
orderChild.setFreightPrice(orderGoods.getPendingOrderFreight()); orderChild.setFreightPrice(orderGoods.getPendingOrderFreight());
orderChild.setForecastFreightPrice(orderInfo.getValidFreightPrice()); orderChild.setForecastFreightPrice(orderInfo.getValidForecastFreightQuotation());
orderChild.setLossPrice(orderGoods.getLossPrice()); orderChild.setLossPrice(orderGoods.getLossPrice());
orderChild.setOrderFreightPrice(orderInfo.getValidForecastFreightQuotation()); orderChild.setOrderFreightPrice(orderInfo.getValidFreightPrice());
orderChild.setGoodsId(orderGoods.getGoodsId()); orderChild.setGoodsId(orderGoods.getGoodsId());
orderChild.setGoodsName(orderGoods.getGoodsName()); orderChild.setGoodsName(orderGoods.getGoodsName());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论