diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java index 902f326c..cc7af8dc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java @@ -31,11 +31,11 @@ public class PDAController extends BaseController { * 手持人工进行下一机台设备列表 */ @PostMapping("/getAllEquipments") - public List getAllEquipments(@RequestBody BaseEquipmentDto baseEquipmentDto) { + public AjaxResult getAllEquipments(@RequestBody BaseEquipmentDto baseEquipmentDto) { if(StringUtils.isBlank(baseEquipmentDto.getFactoryCode())){ - return null; + return error("facotryCode 不能为空"); } - return pdaService.getAllEquipments(baseEquipmentDto); + return success(pdaService.getAllEquipments(baseEquipmentDto)); } /** diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index 834db50f..004f3a0a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -44,4 +44,12 @@ public class WCSInterfaceController extends BaseController { } return WCInterfaceService.requestDestinationStations(wcsdto); } + @Log(title = "下一工序机台集合获取(手持)", businessType = BusinessType.WCS) + @PostMapping("/pdaRequestDestinationStations") + public AjaxResult pdaRequestDestinationStations(@RequestBody WCSDTO wcsdto) { + if(StringUtils.isBlank(wcsdto.getFactory())){ + return error("factory is not null"); + } + return success(WCInterfaceService.requestDestinationStations(wcsdto)); + } } diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java index 077e3b72..388f3bc2 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java @@ -126,7 +126,6 @@ public class ProProcessController extends BaseController { /** * 查询设备管理列表 */ - @RequiresPermissions("mes:pro:process:equipmentList") @GetMapping("/selectEquipmentList") public TableDataInfo selectEquipmentList(Equipment equipment) { if("1".equals(equipment.getEquipmentTypeCode())){ @@ -142,7 +141,6 @@ public class ProProcessController extends BaseController { /** * 获取设备管理详细信息 */ - @RequiresPermissions("mes:pro:process:queryEquipment") @GetMapping(value = "/e/{equipmentId}") public AjaxResult selectEquipmentByEquipmentId(@PathVariable("equipmentId") Long equipmentId) { return success(proProcessService.selectEquipmentByEquipmentId(equipmentId)); @@ -151,7 +149,6 @@ public class ProProcessController extends BaseController { /** * 查询BOM物料管理列表 */ - @RequiresPermissions("mes:pro:process:bomComponentList") @GetMapping("/bomComponentList") public TableDataInfo selectBaseBomComponentList(BomComponent bomComponent) { startPage(); @@ -172,7 +169,6 @@ public class ProProcessController extends BaseController { /** * 查询设工作中心 */ - @RequiresPermissions("mes:pro:process:getWorkCenterList") @GetMapping("/getWorkCenterList") public TableDataInfo getWorkCenterList(SysFactory sysFactory) { startPage(); @@ -183,7 +179,7 @@ public class ProProcessController extends BaseController { /** * 查询设工作中心 */ - @RequiresPermissions("mes:pro:process:getEquipmentTypeList") + @GetMapping("/getEquipmentTypeList") public TableDataInfo getEquipmentTypeList(Equipment equipment) { startPage();