|
|
@ -1947,7 +1947,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { |
|
|
|
String orderCode = advanceEntity.getOrderCode(); |
|
|
|
String orderCode = advanceEntity.getOrderCode(); |
|
|
|
String trainNumber = advanceEntity.getTrainNumber(); |
|
|
|
String trainNumber = advanceEntity.getTrainNumber(); |
|
|
|
ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(orderCode + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber)); |
|
|
|
ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(orderCode + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber)); |
|
|
|
if(Objects.isNull(importOrderNoPackageExcelDTO)){ |
|
|
|
if(!Objects.isNull(importOrderNoPackageExcelDTO)){ |
|
|
|
String firsts = importOrderNoPackageExcelDTO.getFirsts(); |
|
|
|
String firsts = importOrderNoPackageExcelDTO.getFirsts(); |
|
|
|
Integer totalNum = advanceEntity.getTotalNum(); |
|
|
|
Integer totalNum = advanceEntity.getTotalNum(); |
|
|
|
TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); |
|
|
|
TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity(); |
|
|
|