rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
@@ -49,11 +49,11 @@ PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true)); for (BasStation station : page.getRecords()) { if (!Cools.isEmpty(station.getCrossZoneArea())) { List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class); List<Long> longs1 = station.getCrossZoneArea(); station.setAreaIds(longs1); } if (!Cools.isEmpty(station.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class); List<Long> longs1 = station.getContainerType(); station.setContainerTypes(longs1); }
@@ -83,15 +83,15 @@ if (Cools.isEmpty(basStation)) { throw new CoolException("未找到接驳站点信息，请检查站点状态"); } List<Long> ids = new ArrayList<>(); ids.add(basStation.getArea()); if (basStation.getIsCrossZone() == 1) { String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1); String[] parts = content.split(","); for (int i = 0; i < parts.length; i++) { ids.add(Long.parseLong(parts[i].trim())); } } List<Long> ids = basStation.getCrossZoneArea(); // ids.add(basStation.getArea()); // if (basStation.getIsCrossZone() == 1) { // String content = basStation.getCrossZoneArea().substring(1,.length() - 1); // String[] parts = content.split(","); // for (int i = 0; i < parts.length; i++) { // ids.add(Long.parseLong(parts[i].trim())); // } // } List<WarehouseAreas> warehouseAreasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>() .in(WarehouseAreas::getId, ids) ); @@ -213,15 +213,15 @@ if (Cools.isEmpty(waitPakinItems)) { throw new CoolException("数据错误，未找到组托明细"); } List<Long> ids = new ArrayList<>(); ids.add(basStation.getArea()); if (basStation.getIsCrossZone() == 1) { String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1); String[] parts = content.split(","); for (int i = 0; i < parts.length; i++) { ids.add(Long.parseLong(parts[i].trim())); } } List<Long> ids = basStation.getCrossZoneArea(); // ids.add(basStation.getArea()); // if (basStation.getIsCrossZone() == 1) { // String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1); // String[] parts = content.split(","); // for (int i = 0; i < parts.length; i++) { // ids.add(Long.parseLong(parts[i].trim())); // } // } List<WarehouseAreas> warehouseAreasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>() .in(WarehouseAreas::getId, ids) ); @@ -274,7 +274,7 @@ throw new CoolException("未找到站点信息"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class); List<Long> longs1 = basStation.getCrossZoneArea(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) @@ -330,12 +330,12 @@ throw new CoolException("站点为光电站点，禁止呼叫AGV"); } List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class); if (!areaList.contains(area)) { List<Long> areaList = basStation.getCrossZoneArea(); if (!areaList.contains(Long.parseLong(area))) { throw new CoolException("当前站点不支持目标库区"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class); List<Long> longs1 = basStation.getContainerType(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -80,7 +80,7 @@ throw new CoolException("站点状态不为空闲"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Integer> longs1 = basStation.getContainerType(); List<Long> longs1 = basStation.getContainerType(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) @@ -131,12 +131,12 @@ throw new CoolException("站点状态不为空闲"); } List<Integer> areaList = basStation.getCrossZoneArea(); if (!areaList.contains(Integer.parseInt(area))) { List<Long> areaList = basStation.getCrossZoneArea(); if (!areaList.contains(Long.parseLong(area))) { throw new CoolException("当前站点不支持目标库区"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Integer> longs1 = basStation.getContainerType(); List<Long> longs1 = basStation.getContainerType(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -393,7 +393,7 @@ throw new CoolException("站点状态不为空闲"); } List<Long> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), Long.class); List<Long> areaList = basStation.getCrossZoneArea(); if (Cools.isEmpty(areaList)) { throw new CoolException("当前站点库区未配置"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -35,11 +35,11 @@ PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true)); for (BasStation station : page.getRecords()) { if (!Cools.isEmpty(station.getCrossZoneArea())) { List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class); List<Long> longs1 = station.getCrossZoneArea(); station.setAreaIds(longs1); } if (!Cools.isEmpty(station.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class); List<Long> longs1 = station.getContainerType(); station.setContainerTypes(longs1); } @@ -72,11 +72,11 @@ public R get(@PathVariable("id") Long id) { BasStation station = basStationService.getById(id); if (!Cools.isEmpty(station.getCrossZoneArea())) { List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class); List<Long> longs1 = station.getCrossZoneArea(); station.setAreaIds(longs1); } if (!Cools.isEmpty(station.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class); List<Long> longs1 = station.getContainerType(); station.setContainerTypes(longs1); } @@ -96,10 +96,10 @@ return R.error(basStation.getStationName()+"站已被初始化"); } if (null !=basStation.getAreaIds()){ basStation.setCrossZoneArea(basStation.getAreaIds().toString()); basStation.setCrossZoneArea(basStation.getAreaIds()); } if (null !=basStation.getContainerTypes()){ basStation.setContainerType(basStation.getContainerTypes().toString()); basStation.setContainerType(basStation.getContainerTypes()); } if (Cools.isEmpty(basStation.getStationAlias())){ basStation.setStationAlias(new ArrayList<>()); @@ -120,10 +120,10 @@ basStation.setUpdateBy(getLoginUserId()); basStation.setUpdateTime(new Date()); if (null !=basStation.getAreaIds() && !basStation.getContainerTypes().isEmpty()){ basStation.setCrossZoneArea(basStation.getAreaIds().toString()); basStation.setCrossZoneArea(basStation.getAreaIds()); } if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){ basStation.setContainerType(basStation.getContainerTypes().toString()); basStation.setContainerType(basStation.getContainerTypes()); } if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)){ basStation.setBarcode(null); rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -89,7 +89,7 @@ */ @ApiModelProperty(value = "可跨区区域id") @TableField(typeHandler = JacksonTypeHandler.class) private List<Integer> crossZoneArea; private List<Long> crossZoneArea; /** * 是否wcs站点 @@ -108,7 +108,7 @@ */ @ApiModelProperty(value = "容器类型") @TableField(typeHandler = JacksonTypeHandler.class) private List<Integer> containerType; private List<Long> containerType; /** * 条码 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -494,12 +494,12 @@ throw new CoolException("站点状态不为空闲"); } List<Integer> areaList = basStation.getCrossZoneArea(); if (!areaList.contains(Integer.parseInt(area))) { List<Long> areaList = basStation.getCrossZoneArea(); if (!areaList.contains(Long.parseLong(area))) { throw new CoolException("当前站点不支持目标库区"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Integer> longs1 = basStation.getContainerType(); List<Long> longs1 = basStation.getContainerType(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) @@ -558,7 +558,7 @@ throw new CoolException("站点状态不为空闲"); } if (!Cools.isEmpty(basStation.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class); List<Long> longs1 = basStation.getContainerType(); List<BasContainer> containers = basContainerService.list( new LambdaQueryWrapper<BasContainer>() .in(BasContainer::getContainerType, longs1) @@ -612,7 +612,7 @@ } warehouseAreasList.add(warehouseArea); } else { List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class); List<Long> areaList = basStation.getCrossZoneArea(); if (areaList.isEmpty()) { throw new CoolException("当前站点库区未配置"); }
