|
|
@ -257,8 +257,14 @@ public class SyncWarehouseData { |
|
|
|
public ReturnT<String> syncWarehouseTrayToNew(String param) { |
|
|
|
public ReturnT<String> syncWarehouseTrayToNew(String param) { |
|
|
|
log.info("############syncWarehouseTrayToNew: 同步仓库及货位托盘信息开始 param={}", param); |
|
|
|
log.info("############syncWarehouseTrayToNew: 同步仓库及货位托盘信息开始 param={}", param); |
|
|
|
|
|
|
|
|
|
|
|
//查询所有仓库
|
|
|
|
List<Integer> allWarehouseIds = new ArrayList<>(); |
|
|
|
List<Integer> allWarehouseIds = warehouseClient.getAllWarehouseIds(); |
|
|
|
if(StringUtil.isBlank(param)){ |
|
|
|
|
|
|
|
allWarehouseIds = warehouseClient.getAllWarehouseIds(); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
WarehouseEntity warehouseEntity = warehouseClient.selectEntityById(Integer.parseInt(param)); |
|
|
|
|
|
|
|
allWarehouseIds.add(warehouseEntity.getId()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (Integer oldWarehouseId:allWarehouseIds){ |
|
|
|
for (Integer oldWarehouseId:allWarehouseIds){ |
|
|
|
WarehouseEntity oldWarehouse = warehouseClient.selectEntityById(oldWarehouseId); |
|
|
|
WarehouseEntity oldWarehouse = warehouseClient.selectEntityById(oldWarehouseId); |
|
|
|
if(Objects.isNull(oldWarehouse)){ |
|
|
|
if(Objects.isNull(oldWarehouse)){ |
|
|
|