|
|
|
@ -10773,7 +10773,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
for (UnloadScanOrderVO unloadScanOrderVO : unloadScanOrderList) { |
|
|
|
|
String waybillNo = StringUtil.isBlank(unloadScanOrderVO.getWaybillNo())?"null":unloadScanOrderVO.getWaybillNo(); |
|
|
|
|
String orderCode = StringUtil.isBlank(unloadScanOrderVO.getOrderCode())?"null":unloadScanOrderVO.getOrderCode(); |
|
|
|
|
unloadScanOrderVO.setTotalNumber(orderCodeNumMap.get(orderCode).getTotalNum()); |
|
|
|
|
OrderCodeNumVO orderCodeNumVO = orderCodeNumMap.get(orderCode); |
|
|
|
|
if(!Objects.isNull(orderCodeNumVO)){ |
|
|
|
|
unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum()); |
|
|
|
|
}else{ |
|
|
|
|
unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<UnloadPackageVO> unloadPackageList = new ArrayList<>(); |
|
|
|
|
unloadList.forEach(unloadPackageVO -> { |
|
|
|
|
String orderCode1 = StringUtil.isBlank(unloadPackageVO.getOrderCode())?"null":unloadPackageVO.getOrderCode(); |
|
|
|
|