|
|
|
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
|
import cn.hutool.core.exceptions.ExceptionUtil; |
|
|
|
|
import cn.hutool.core.util.IdUtil; |
|
|
|
|
import cn.hutool.core.util.NumberUtil; |
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
@ -1952,11 +1953,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
carsLoadEntity.setCarsLineName(loadLineTitleName); |
|
|
|
|
carsLoadEntity.setEndWarehouseIds(endWarehouseIds); |
|
|
|
|
carsLoadEntity.setEndWarehouseNames(endWarehouseNames); |
|
|
|
|
String[] split = endWarehouseIds.split(","); |
|
|
|
|
int length = split.length; |
|
|
|
|
Long lastEndWarehouseId = Long.parseLong(split[length - 1]); |
|
|
|
|
Long lastEndWarehouseId = null; |
|
|
|
|
if(!StringUtil.equals("4",loadType)){ |
|
|
|
|
carsLoadEntity.setEndWarehouseIds(endWarehouseIds); |
|
|
|
|
carsLoadEntity.setEndWarehouseNames(endWarehouseNames); |
|
|
|
|
String[] split = endWarehouseIds.split(","); |
|
|
|
|
int length = split.length; |
|
|
|
|
Long.parseLong(split[length - 1]); |
|
|
|
|
}else{ |
|
|
|
|
lastEndWarehouseId = warehouseId; |
|
|
|
|
} |
|
|
|
|
if(lastEndWarehouseId.equals(warehouseId)){ |
|
|
|
|
//移除当前仓作为目的仓的装车记录
|
|
|
|
|
QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
@ -3245,7 +3251,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
updateParceNumberList.add(updateNumberEntity); |
|
|
|
|
}); |
|
|
|
|
}else{ |
|
|
|
|
if(enterNum == handQuantity){ |
|
|
|
|
if(NumberUtil.equals(enterNum,handQuantity)){ |
|
|
|
|
Long finalLoadScanId = loadScanId; |
|
|
|
|
parcelListEntities.forEach(entity -> { |
|
|
|
|
Long waybillDetailId = entity.getAdvanceId(); |
|
|
|
|