手持接口修改+权限

highway
zhaoxiaolin 1 year ago
parent 292742f42f
commit 8678afa391

@ -31,11 +31,11 @@ public class PDAController extends BaseController {
*
*/
@PostMapping("/getAllEquipments")
public List<BaseEquipmentDto> 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));
}
/**

@ -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));
}
}

@ -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();

Loading…
Cancel
Save