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

1.干线卸车确认bug修复

pre-production
zhenghaoyu 7 days ago
parent
58fc656af1
commit
ca07a12ab4
1 changed files with 34 additions and 0 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. 34
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

34
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -9934,6 +9934,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String packageStatus = advanceDetailEntity.getPackageStatus();
String orderCode = advanceDetailEntity.getOrderCode();
String waybillNo = advanceDetailEntity.getWaybillNo();
Long advanceId = advanceDetailEntity.getAdvanceId();
TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
if ("0".equals(packageStatus)) {
InComingDTO inComingDTO = new InComingDTO();
inComingDTO.setOrderPackageCode(scanCode);
@ -9949,6 +9953,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
if(!Objects.isNull(advanceEntity)){
carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
}
carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
}
@ -9991,6 +10005,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
if(!Objects.isNull(advanceEntity)){
carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
}
carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
@ -10022,6 +10046,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
if(!Objects.isNull(advanceEntity)){
carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
}
carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");

Write Preview
Loading…
Cancel
Save