diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java index 86a91d7..89636f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -10,6 +10,8 @@ import org.nl.wms.pda.service.PdaService; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.nl.wms.sch.region.service.ISchBaseRegionService; +import org.nl.wms.sch.region.service.dao.SchBaseRegion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpStatus; @@ -38,8 +40,10 @@ public class PdaController { @Resource private PdaService pdaService; - @Autowired + @Resource private ISchBasePointService pointService; + @Resource + private ISchBaseRegionService regionService; @PostMapping("/point") @Log("查询设备编号及状态") @@ -53,6 +57,14 @@ public class PdaController { return new ResponseEntity<>(pointService.getPointList(region), HttpStatus.OK); } + @PostMapping("/region") + @Log("区域列表") + @ApiOperation("区域列表") + public ResponseEntity region(@RequestBody JSONObject param){ + SchBaseRegion region = new SchBaseRegion(); + return new ResponseEntity<>(regionService.getRegionList(region), HttpStatus.OK); + } + @PostMapping("/yclrk") @Log("原材料入库") @ApiOperation("原材料入库")