提交 41a80f56 authored 作者: 胡宁宁's avatar 胡宁宁

Merge branch 'v17.5_order_child_sync_broker_20240617' into test

...@@ -1630,7 +1630,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1630,7 +1630,7 @@ public class OrderChildServiceImpl implements OrderChildService {
SettlementWayEnum.WayType.UNLOAD_LOSS.getCode()) SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
&& Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(), && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) { InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
result.setGoodsOrderDetailShow(0); result.setGoodsOrderDetailShow(1);
} }
//查询进行中的运单车辆是否开启了中交兴路 //查询进行中的运单车辆是否开启了中交兴路
result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo())); result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));
......
...@@ -175,7 +175,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea ...@@ -175,7 +175,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
SettlementWayEnum.WayType.UNLOAD_LOSS.getCode()) SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
&& Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(), && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) { InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
orderGoodsVO.setGoodsOrderDetailShow(0); orderGoodsVO.setGoodsOrderDetailShow(1);
} }
log.info(" orderGoodsVO {}",orderGoodsVO); log.info(" orderGoodsVO {}",orderGoodsVO);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论