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

Merge remote-tracking branch 'origin/dev' into pre-production

visual
zhenghaoyu 6 months ago
parent
f9c45bca0f 8f74cc781b
commit
4c47097b5f
1 changed files with 12 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

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

@ -2377,6 +2377,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>(); List<String> orderPackageCodes = new ArrayList<>();
List<String> noUnloadOrderPackageCodes = new ArrayList<>(); List<String> noUnloadOrderPackageCodes = new ArrayList<>();
List<Long> noUnloadOrderPackageScanIds = new ArrayList<>();
String deliveryType = carsLoadEntity.getDeliveryType(); String deliveryType = carsLoadEntity.getDeliveryType();
//处理三方中转未卸车数据 //处理三方中转未卸车数据
@ -2395,6 +2396,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Integer num = trunklineCarsLoadScanEntity.getNum(); Integer num = trunklineCarsLoadScanEntity.getNum();
Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum(); Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum();
String scanStatus = trunklineCarsLoadScanEntity.getScanStatus(); String scanStatus = trunklineCarsLoadScanEntity.getScanStatus();
Long carsLoadScanId = trunklineCarsLoadScanEntity.getId();
if(unloadNum == num){ if(unloadNum == num){
orderPackageCodes.add(scanCode); orderPackageCodes.add(scanCode);
}else{ }else{
@ -2402,6 +2404,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(scanStatus.equals("1")){ if(scanStatus.equals("1")){
if(deliveryType.equals("2")){ if(deliveryType.equals("2")){
noUnloadOrderPackageCodes.add(scanCode); noUnloadOrderPackageCodes.add(scanCode);
noUnloadOrderPackageScanIds.add(carsLoadScanId);
} }
} }
} }
@ -2450,7 +2453,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(CollUtil.isNotEmpty(noUnloadOrderPackageCodes)){ if(CollUtil.isNotEmpty(noUnloadOrderPackageCodes)){
String content = "包件在 " + warehouseEntity.getName() + "三方中转取消装车"; String content = "包件在 " + warehouseEntity.getName() + "三方中转取消装车";
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), noUnloadOrderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content); packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), noUnloadOrderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
distributionParcelListClient.updatePackageStatus(noUnloadOrderPackageCodes,warehouseId,"20"); removeCarsLoadScan(noUnloadOrderPackageScanIds, warehouseId);
} }
} catch (Exception e) { } catch (Exception e) {
@ -3006,13 +3009,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
loadScanId = carsLoadScanEntity.getId(); loadScanId = carsLoadScanEntity.getId();
String loadType = carsLoadEntity.getLoadType(); String loadType = carsLoadEntity.getLoadType();
String content = null;
if(!"4".equals(loadType)){ if(!"4".equals(loadType)){
List<String> orderPackageCodes = new ArrayList<>(); content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName;
orderPackageCodes.add(orderPackageCode); }else{
String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName; content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,数据来源仓库 " + fromWarehouseName;
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content);
} }
List<String> orderPackageCodes = new ArrayList<>();
orderPackageCodes.add(orderPackageCode);
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content);
trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1, trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1,
1, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark); 1, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark);
updateNumByLoadId(loadId); updateNumByLoadId(loadId);

Write Preview
Loading…
Cancel
Save