sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、优化工位能力关联接口

master_hella_20240701
bjang03 1 year ago
parent
9bd95b2eee
commit
7cff3d29b8
7 changed files with 23 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationAbilityController.java
  2. 18
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationEquipmentController.java
  3. 38
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationOperstepsController.java
  4. 13
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationEquipmentService.java
  5. 9
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationEquipmentServiceImpl.java
  6. 29
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationOperstepsService.java
  7. 33
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationOperstepsServiceImpl.java

2
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationAbilityController.java
View File

@ -44,7 +44,7 @@ public class WorkstationAbilityController {
return success(result > 0);
}
@GetMapping("/page")
@GetMapping("/getWorkstationAbilityPage")
@Operation(summary = "获得工位能力关联分页")
@PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
public CommonResult<PageResult<WorkstationAbilityRespVO>> getWorkstationAbilityPage(@Valid WorkstationAbilityPageReqVO pageVO) {

18
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationEquipmentController.java
View File

@ -40,27 +40,19 @@ public class WorkstationEquipmentController {
@Resource
private WorkstationEquipmentService workstationEquipmentService;
@GetMapping("/page")
@GetMapping("/getEquipmentPage")
@Operation(summary = "获得工位设备关联分页")
@PreAuthorize("@ss.hasPermission('workstation:equipment:query')")
public CommonResult<PageResult<WorkstationEquipmentRespVO>> getEquipmentPage(@Valid WorkstationEquipmentPageReqVO pageVO) {
PageResult<WorkstationEquipmentDO> pageResult = workstationEquipmentService.getWorkstationEquipmentPage(pageVO);
return success(WorkstationEquipmentConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/pageListByWorkstationCode")
@Operation(summary = "根据工位code获得设备列表")
@Parameter(name = "code", description = "工位编号", required = true)
@PreAuthorize("@ss.hasPermission('workstation:equipment:query')")
public CommonResult<PageResult<WorkstationEquipmentRespVO>> pageListByWorkstationCode(@Valid WorkstationEquipmentPageReqVO pageVO) {
PageResult<WorkstationEquipmentRespVO> pageResult = workstationEquipmentService.pageListByWorkstationCode(pageVO);
PageResult<WorkstationEquipmentRespVO> pageResult = workstationEquipmentService.getEquipmentPage(pageVO);
return success(pageResult);
}
@GetMapping("/pageCheckListByWorkstationCode")
@GetMapping("/pageCheckList")
@Operation(summary = "根据工位code获得可关联设备列表")
@Parameter(name = "code", description = "工位编号", required = true)
@PreAuthorize("@ss.hasPermission('workstation:equipment:query')")
public CommonResult<PageResult<WorkstationEquipmentRespVO>> pageCheckListByWorkstationCode(@Valid WorkstationEquipmentPageReqVO pageVO) {
PageResult<WorkstationEquipmentRespVO> pageResult = workstationEquipmentService.pageCheckListByWorkstationCode(pageVO);
public CommonResult<PageResult<WorkstationEquipmentRespVO>> pageCheckList(@Valid WorkstationEquipmentPageReqVO pageVO) {
PageResult<WorkstationEquipmentRespVO> pageResult = workstationEquipmentService.pageCheckList(pageVO);
return success(pageResult);
}
@PostMapping("/createRelation")

38
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationOperstepsController.java
View File

@ -40,50 +40,26 @@ public class WorkstationOperstepsController {
@Resource
private WorkstationOperstepsService workstationOperstepsService;
@GetMapping("/get")
@Operation(summary = "获得工位操作步骤关联")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:query')")
public CommonResult<WorkstationOperstepsRespVO> getMesWorkstationOpersteps(@RequestParam("id") Long id) {
WorkstationOperstepsDO mesWorkstationOpersteps = workstationOperstepsService.getMesWorkstationOpersteps(id);
return success(WorkstationOperstepsConvert.INSTANCE.convert(mesWorkstationOpersteps));
}
@GetMapping("/page")
@Operation(summary = "获得工位操作步骤关联分页")
@PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:query')")
public CommonResult<PageResult<WorkstationOperstepsRespVO>> getMesWorkstationOperstepsPage(@Valid WorkstationOperstepsPageReqVO pageVO) {
PageResult<WorkstationOperstepsDO> pageResult = workstationOperstepsService.getMesWorkstationOperstepsPage(pageVO);
return success(WorkstationOperstepsConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/pageListByWorkstationCode")
@GetMapping("/getWorkstationOperstepsPage")
@Operation(summary = "根据工位code获得操作步骤")
@Parameter(name = "code", description = "工位编号", required = true)
@PreAuthorize("@ss.hasPermission('mes:workstation-process:query')")
public CommonResult<PageResult<WorkstationOperstepsRespVO>> pageListByWorkstationCode(@Valid WorkstationOperstepsPageReqVO pageVO) {
PageResult<WorkstationOperstepsRespVO> pageResult = workstationOperstepsService.pageListByWorkstationCode(pageVO);
return success(pageResult);
}
@GetMapping("/pageCheckListByWorkstationCode")
@Operation(summary = "根据工位code获得可关联操作步骤列表")
@Parameter(name = "code", description = "工位编号", required = true)
@PreAuthorize("@ss.hasPermission('mes:workstation-process:query')")
public CommonResult<PageResult<WorkstationOperstepsRespVO>> pageCheckListByWorkstationCode(@Valid WorkstationOperstepsPageReqVO pageVO) {
PageResult<WorkstationOperstepsRespVO> pageResult = workstationOperstepsService.pageCheckListByWorkstationCode(pageVO);
public CommonResult<PageResult<WorkstationOperstepsRespVO>> getWorkstationOperstepsPage(@Valid WorkstationOperstepsPageReqVO pageVO) {
PageResult<WorkstationOperstepsRespVO> pageResult = workstationOperstepsService.getWorkstationOperstepsPage(pageVO);
return success(pageResult);
}
@PostMapping("/createRelation")
@PostMapping("/create")
@Operation(summary = "关联工位操作步骤")
@PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:create')")
public CommonResult<Object> createRelation(@Valid @RequestBody WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO) {
workstationOperstepsService.createRelation(workstationProcessRelationReqVO);
workstationOperstepsService.create(workstationProcessRelationReqVO);
return success(null);
}
@PostMapping("/deleteRelation")
@PostMapping("/delete")
@Operation(summary = "删除工位操作步骤关联")
@PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:delete')")
public CommonResult<Object> deleteRelation(@Valid @RequestBody WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO) {
return success(workstationOperstepsService.deleteRelation(workstationProcessRelationReqVO));
return success(workstationOperstepsService.delete(workstationProcessRelationReqVO));
}
}

13
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationEquipmentService.java
View File

@ -12,23 +12,14 @@ import com.win.module.mes.dal.dataobject.workstation.WorkstationEquipmentDO;
*/
public interface WorkstationEquipmentService {
/**
* 获得工位设备关联分页
*
* @param pageReqVO 分页查询
* @return 工位设备关联分页
*/
PageResult<WorkstationEquipmentDO> getWorkstationEquipmentPage(WorkstationEquipmentPageReqVO pageReqVO);
PageResult<WorkstationEquipmentRespVO> pageListByWorkstationCode(WorkstationEquipmentPageReqVO pageVO);
PageResult<WorkstationEquipmentRespVO> getEquipmentPage(WorkstationEquipmentPageReqVO pageVO);
/**
* 根据工位code获得可关联设备列表
*
* @param pageVO
* @return 设备列表
*/
PageResult<WorkstationEquipmentRespVO> pageCheckListByWorkstationCode(WorkstationEquipmentPageReqVO pageVO);
PageResult<WorkstationEquipmentRespVO> pageCheckList(WorkstationEquipmentPageReqVO pageVO);
/**
* 创建工位设备关联

9
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationEquipmentServiceImpl.java
View File

@ -30,12 +30,7 @@ public class WorkstationEquipmentServiceImpl implements WorkstationEquipmentServ
private WorkstationEquipmentMapper workstationEquipmentMapper;
@Override
public PageResult<WorkstationEquipmentDO> getWorkstationEquipmentPage(WorkstationEquipmentPageReqVO pageReqVO) {
return workstationEquipmentMapper.selectPage(pageReqVO);
}
@Override
public PageResult<WorkstationEquipmentRespVO> pageListByWorkstationCode(WorkstationEquipmentPageReqVO pageVO) {
public PageResult<WorkstationEquipmentRespVO> getEquipmentPage(WorkstationEquipmentPageReqVO pageVO) {
Long count = workstationEquipmentMapper.count(pageVO);
PageResult<WorkstationEquipmentRespVO> pageResult = new PageResult();
if (count > 0){
@ -48,7 +43,7 @@ public class WorkstationEquipmentServiceImpl implements WorkstationEquipmentServ
}
@Override
public PageResult<WorkstationEquipmentRespVO> pageCheckListByWorkstationCode(WorkstationEquipmentPageReqVO pageVO) {
public PageResult<WorkstationEquipmentRespVO> pageCheckList(WorkstationEquipmentPageReqVO pageVO) {
Map<String,Object> params = BeanUtil.beanToMap(pageVO);
params.put("productionLineCodeCheck",false);
Long count = workstationEquipmentMapper.checkCountByWorkstationCode(params);

29
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationOperstepsService.java
View File

@ -1,10 +1,7 @@
package com.win.module.mes.service.workstation;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.mes.controller.workstation.vo.*;
import com.win.module.mes.dal.dataobject.workstation.WorkstationOperstepsDO;
/**
* 工位操作步骤关联 Service 接口
@ -13,29 +10,9 @@ import com.win.module.mes.dal.dataobject.workstation.WorkstationOperstepsDO;
*/
public interface WorkstationOperstepsService {
void create(WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO);
/**
* 获得工位操作步骤关联
*
* @param id 编号
* @return 工位操作步骤关联
*/
WorkstationOperstepsDO getMesWorkstationOpersteps(Long id);
Object delete(WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO);
/**
* 获得工位操作步骤关联分页
*
* @param pageReqVO 分页查询
* @return 工位操作步骤关联分页
*/
PageResult<WorkstationOperstepsDO> getMesWorkstationOperstepsPage(WorkstationOperstepsPageReqVO pageReqVO);
void createRelation(WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO);
Object deleteRelation(WorkstationOperstepsRelationReqVO workstationProcessRelationReqVO);
PageResult<WorkstationOperstepsRespVO> pageListByWorkstationCode(WorkstationOperstepsPageReqVO pageVO);
PageResult<WorkstationOperstepsRespVO> pageCheckListByWorkstationCode(WorkstationOperstepsPageReqVO pageVO);
PageResult<WorkstationOperstepsRespVO> getWorkstationOperstepsPage(WorkstationOperstepsPageReqVO pageVO);
}

33
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationOperstepsServiceImpl.java
View File

@ -26,19 +26,9 @@ public class WorkstationOperstepsServiceImpl implements WorkstationOperstepsServ
@Resource
private WorkstationOperstepsMapper workstationOperstepsMapper;
@Resource
private OperstepsMapper operstepsMapper;
@Override
public WorkstationOperstepsDO getMesWorkstationOpersteps(Long id) {
return workstationOperstepsMapper.selectById(id);
}
@Override
public PageResult<WorkstationOperstepsDO> getMesWorkstationOperstepsPage(WorkstationOperstepsPageReqVO pageReqVO) {
return workstationOperstepsMapper.selectPage(pageReqVO);
}
@Override
public void createRelation(WorkstationOperstepsRelationReqVO workstationOperstepsRelationReqVO) {
public void create(WorkstationOperstepsRelationReqVO workstationOperstepsRelationReqVO) {
workstationOperstepsMapper.deleteRelation(workstationOperstepsRelationReqVO);
List<WorkstationOperstepsDO> workstationEquipmentDOList = new ArrayList<>();
for (String operstepsCode : workstationOperstepsRelationReqVO.getOperstepsCodes()) {
@ -51,12 +41,12 @@ public class WorkstationOperstepsServiceImpl implements WorkstationOperstepsServ
}
@Override
public Object deleteRelation(WorkstationOperstepsRelationReqVO workstationOperstepsRelationReqVO) {
public Object delete(WorkstationOperstepsRelationReqVO workstationOperstepsRelationReqVO) {
return workstationOperstepsMapper.deleteRelation(workstationOperstepsRelationReqVO);
}
@Override
public PageResult<WorkstationOperstepsRespVO> pageListByWorkstationCode(WorkstationOperstepsPageReqVO pageVO) {
public PageResult<WorkstationOperstepsRespVO> getWorkstationOperstepsPage(WorkstationOperstepsPageReqVO pageVO) {
Long count = workstationOperstepsMapper.count(pageVO.getWorkstationCode());
PageResult<WorkstationOperstepsRespVO> pageResult = new PageResult();
if (count > 0){
@ -67,21 +57,4 @@ public class WorkstationOperstepsServiceImpl implements WorkstationOperstepsServ
}
return pageResult;
}
@Override
public PageResult<WorkstationOperstepsRespVO> pageCheckListByWorkstationCode(WorkstationOperstepsPageReqVO pageVO) {
PageResult<OperstepsDO> OperstepsDOResult = operstepsMapper.selectPage(new OperstepsPageReqVO());
PageResult<WorkstationOperstepsRespVO> pageResult= new PageResult<>();
pageResult.setTotal(OperstepsDOResult.getTotal());
if (pageResult.getTotal()!=null && pageResult.getTotal()>0){
pageResult.setList(new ArrayList<>());
OperstepsDOResult.getList().forEach(item->{
pageResult.getList().add(new WorkstationOperstepsRespVO(){{
setCode(item.getStepsCode());
setName(item.getStepsName());
}});
});
}
return pageResult;
}
}

Write Preview
Loading…
Cancel
Save