diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java index 813fd55..744f176 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java @@ -71,4 +71,11 @@ public class PdaSchPointController { return new ResponseEntity<>(pdaSchPointService.pointListByRegion(whereJson), HttpStatus.OK); } + @PostMapping("/structList") + @Log("获取仓位下拉框数组") + @SaIgnore + public ResponseEntity structList(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaSchPointService.structList(whereJson), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java index b13b6f4..68a67c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java @@ -51,4 +51,6 @@ public interface PdaSchPointService extends IService { PdaResponse pointListByRegion(JSONObject whereJson); PdaResponse allRegionList(JSONObject whereJson); + + PdaResponse structList(JSONObject whereJson); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java index a635157..3eabf0a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.vo.SelectItemVo; import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; +import org.nl.wms.basedata_manage.service.IStructattrService; +import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.pda_manage.sch_manage.service.PdaSchPointService; import org.nl.wms.pda_manage.util.PdaResponse; import org.nl.wms.sch_manage.service.ISchBasePointService; @@ -42,6 +44,8 @@ public class PdaSchPointServiceImpl extends ServiceImpl list = iStructattrService.list(new LambdaQueryWrapper() + .orderByAsc(Structattr::getStruct_code)).stream().map(p -> SelectItemVo + .builder() + .text(p.getStruct_code()) + .value(p.getStruct_code()) + .build()) + .collect(Collectors.toList()); + return PdaResponse.requestParamOk(list); + } }