java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

pre-production
zhaoqiaobo 7 hours ago
parent
febe8b7e94 71e1f0729e
commit
c0e6c86242
2 changed files with 41 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  2. 66
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

8
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
Unescape View File

@ -289,9 +289,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
if (!Objects.isNull(finalWarehouse)) {
trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
if(Objects.isNull(finalNodeId)){
BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
if (!Objects.isNull(finalWarehouse)) {
trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
}
}
trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);

66
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
Unescape View File

@ -884,42 +884,48 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
}
} else {
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
if (!Objects.isNull(basicdataClientEntity)) {
String clientType = basicdataClientEntity.getClientType();
if ("5".equals(clientType)) {
stockArticleEntity.setStoreId(basicdataClientEntity.getId());
stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
//查询门店的父级商场
Long pid = basicdataClientEntity.getPid();
BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
if (!Objects.isNull(pidEntity)) {
String pidEntityClientType = pidEntity.getClientType();
if ("2".equals(pidEntityClientType)) {
//商城
stockArticleEntity.setMallId(pidEntity.getId());
stockArticleEntity.setMallName(pidEntity.getClientName());
stockArticleEntity.setMallCode(pidEntity.getClientCode());
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
if (!Objects.isNull(basicdataStoreBusinessEntity)) {
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
if(!Objects.isNull(clientId)){
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
if (!Objects.isNull(basicdataClientEntity)) {
String clientType = basicdataClientEntity.getClientType();
if ("5".equals(clientType)) {
stockArticleEntity.setStoreId(basicdataClientEntity.getId());
stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
//查询门店的父级商场
Long pid = basicdataClientEntity.getPid();
if(!Objects.isNull(pid)){
BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
if (!Objects.isNull(pidEntity)) {
String pidEntityClientType = pidEntity.getClientType();
if ("2".equals(pidEntityClientType)) {
//商城
stockArticleEntity.setMallId(pidEntity.getId());
stockArticleEntity.setMallName(pidEntity.getClientName());
stockArticleEntity.setMallCode(pidEntity.getClientCode());
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
if (!Objects.isNull(basicdataStoreBusinessEntity)) {
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
}
}
}
}
}
} else if ("2".equals(clientType)) {
//商城
stockArticleEntity.setMallId(basicdataClientEntity.getId());
stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
if (!Objects.isNull(basicdataStoreBusinessEntity)) {
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
} else if ("2".equals(clientType)) {
//商城
stockArticleEntity.setMallId(basicdataClientEntity.getId());
stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
if (!Objects.isNull(basicdataStoreBusinessEntity)) {
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
}
}
}
}
}
stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());

Write Preview
Loading…
Cancel
Save