|
|
@@ -184,14 +184,14 @@ public class TransportServiceImpl implements TransportRemoteService {
|
|
|
KwtLogisticsOrderUnit carrierOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
|
|
|
.eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
.eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
|
|
|
- KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
- .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
- .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
|
|
|
- );
|
|
|
- KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
- .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
- .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
|
|
|
- );
|
|
|
+// KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
+// .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
+// .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
|
|
|
+// );
|
|
|
+// KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
|
|
|
+// .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
+// .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
|
|
|
+// );
|
|
|
KwtLogisticsOrderContract contract = logisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
|
|
|
.eq(KwtLogisticsOrderContract::getLOrderId, logisticsOrderDTO.getLOrderId())
|
|
|
);
|
|
|
@@ -253,14 +253,14 @@ public class TransportServiceImpl implements TransportRemoteService {
|
|
|
logisticsOrderDTO.setContractNo(contract.getContractNo());
|
|
|
logisticsOrderDTO.setGoodsPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
|
|
|
logisticsOrderDTO.setCreateByName(remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()) == null ? null : remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()).getName());
|
|
|
- logisticsOrderDTO.setLoadAddress(loadOrderAddress.getDetailAddress());
|
|
|
- logisticsOrderDTO.setLoadName(loadOrderAddress.getName());
|
|
|
- logisticsOrderDTO.setLoadContacts(loadOrderAddress.getContacts());
|
|
|
- logisticsOrderDTO.setLoadPhone(loadOrderAddress.getPhone());
|
|
|
- logisticsOrderDTO.setUnloadAddress(unloadOrderAddress.getDetailAddress());
|
|
|
- logisticsOrderDTO.setUnloadName(unloadOrderAddress.getName());
|
|
|
- logisticsOrderDTO.setUnloadContacts(unloadOrderAddress.getContacts());
|
|
|
- logisticsOrderDTO.setUnloadPhone(unloadOrderAddress.getPhone());
|
|
|
+// logisticsOrderDTO.setLoadAddress(loadOrderAddress.getDetailAddress());
|
|
|
+// logisticsOrderDTO.setLoadName(loadOrderAddress.getName());
|
|
|
+// logisticsOrderDTO.setLoadContacts(loadOrderAddress.getContacts());
|
|
|
+// logisticsOrderDTO.setLoadPhone(loadOrderAddress.getPhone());
|
|
|
+// logisticsOrderDTO.setUnloadAddress(unloadOrderAddress.getDetailAddress());
|
|
|
+// logisticsOrderDTO.setUnloadName(unloadOrderAddress.getName());
|
|
|
+// logisticsOrderDTO.setUnloadContacts(unloadOrderAddress.getContacts());
|
|
|
+// logisticsOrderDTO.setUnloadPhone(unloadOrderAddress.getPhone());
|
|
|
logisticsOrderDTO.setCarrierCompany(carrierOrderUnit == null ? null : carrierOrderUnit.getFirmName());
|
|
|
logisticsOrderDTO.setCarrierPhone(carrierOrderUnit == null ? null : carrierOrderUnit.getPhone());
|
|
|
logisticsOrderDTO.setCarrierContacts(carrierOrderUnit == null ? null : carrierOrderUnit.getContacts());
|