diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 9040af3..8c1697f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -59,8 +59,8 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 9fc1516..c9a66f0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -74,10 +74,9 @@ public class SchBasePointServiceImpl extends ServiceImpl selectPointByRegion(String regionCode) { - return pointMapper.selectPointByRegion(regionCode); + List jsonObjectList = pointMapper.selectPointByRegion(regionCode); + jsonObjectList.stream().forEach(jsonObject -> { + if (ObjectUtil.isNotEmpty(jsonObject.get("point_status"))) { + if (jsonObject.get("point_status").equals(GoodsEnum.EMPTY_PALLETS.getValue()) || jsonObject.get("point_status").equals(GoodsEnum.IN_STOCK.getValue())) { + jsonObject.put("point_status", "1"); + } + }else{ + jsonObject.put("point_status", "0"); + } + }); + return jsonObjectList; } @Override public SchBasePoint selectPointByEmpAndRegion(String region_code, String vehicle_code, String s) { - synchronized (lock2) { + synchronized (lock4) { //查询载具的类型 MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.getById(vehicle_code); if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具类型不存在!");