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

win-module-mes/win-module-mes-api/src/main/java/com/win/module/mes/enums/ErrorCodeConstants.java

@@ -153,6 +153,6 @@ public interface ErrorCodeConstants {
     ErrorCode HOLIDAY_CALENDAR_IMPORT_LIST_IS_EMPTY=new ErrorCode(1_006_006_001, "日计划操作日志记录导入的数据不存在！");
 
     //========== 工位配置 ==========
-    ErrorCode WORKSTATION_PEOPLE_NOT_EXISTS=new ErrorCode(1_006_008_001, "工位人员关联关系不存在！");
+    ErrorCode WORKSTATION_POST_NOT_EXISTS=new ErrorCode(1_006_008_001, "工位岗位关联关系不存在！");
     ErrorCode WORKSTATION_ABILITY_NOT_EXISTS=new ErrorCode(1_006_008_002, "工位技能关联关系不存在！");
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/MesWorkstationAbilityController.java

@@ -1,111 +0,0 @@
-package com.win.module.mes.controller.workstation;
-
-import com.win.module.mes.controller.workstation.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
-import com.win.framework.common.pojo.CustomConditions;
-import static com.win.framework.common.pojo.CommonResult.success;
-
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationAbilityDO;
-import com.win.module.mes.convert.workstation.MesWorkstationAbilityConvert;
-import com.win.module.mes.service.workstation.MesWorkstationAbilityService;
-
-@Tag(name = "管理后台 - 工位能力关联")
-@RestController
-@RequestMapping("/mes/workstation-ability")
-@Validated
-public class MesWorkstationAbilityController {
-
-    @Resource
-    private MesWorkstationAbilityService workstationAbilityService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建工位能力关联")
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:create')")
-    public CommonResult<Long> createWorkstationAbility(@Valid @RequestBody WorkstationAbilityCreateReqVO createReqVO) {
-        return success(workstationAbilityService.createWorkstationAbility(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新工位能力关联")
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:update')")
-    public CommonResult<Boolean> updateWorkstationAbility(@Valid @RequestBody WorkstationAbilityUpdateReqVO updateReqVO) {
-        int result = workstationAbilityService.updateWorkstationAbility(updateReqVO);
-        return success(result > 0);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除工位能力关联")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:delete')")
-    public CommonResult<Boolean> deleteWorkstationAbility(@RequestParam("id") Long id) {
-        int result = workstationAbilityService.deleteWorkstationAbility(id);
-        return success(result > 0);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得工位能力关联")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
-    public CommonResult<WorkstationAbilityRespVO> getWorkstationAbility(@RequestParam("id") Long id) {
-        MesWorkstationAbilityDO workstationAbility = workstationAbilityService.getWorkstationAbility(id);
-        return success(MesWorkstationAbilityConvert.INSTANCE.convert(workstationAbility));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得工位能力关联分页")
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
-    public CommonResult<PageResult<WorkstationAbilityRespVO>> getWorkstationAbilityPage(@Valid WorkstationAbilityPageReqVO pageVO) {
-        PageResult<MesWorkstationAbilityDO> pageResult = workstationAbilityService.getWorkstationAbilityPage(pageVO);
-        return success(MesWorkstationAbilityConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @PostMapping("/senior")
-    @Operation(summary = "高级搜索获得检验任务主分页")
-    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
-    public CommonResult<PageResult<WorkstationAbilityRespVO>> getWorkstationAbilitySenior(@Valid @RequestBody CustomConditions conditions) {
-        PageResult<MesWorkstationAbilityDO> pageResult = workstationAbilityService.getWorkstationAbilitySenior(conditions);
-        return success(MesWorkstationAbilityConvert.INSTANCE.convertPage(pageResult));
-    }
-
-
-    @GetMapping("/pageListByWorkstationCode")
-    @Operation(summary = "根据工位code获得操作步骤")
-    @Parameter(name = "code", description = "工位编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:workstation-process:query')")
-    public CommonResult<PageResult<WorkstationAbilityRespVO>> pageListByWorkstationCode(@Valid WorkstationAbilityPageReqVO pageVO) {
-        PageResult<WorkstationAbilityRespVO> pageResult = workstationAbilityService.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<WorkstationAbilityRespVO>> pageCheckListByWorkstationCode(@Valid WorkstationAbilityPageReqVO pageVO) {
-        PageResult<WorkstationAbilityRespVO> pageResult = workstationAbilityService.pageCheckListByWorkstationCode(pageVO);
-        return success(pageResult);
-    }
-    @PostMapping("/createRelation")
-    @Operation(summary = "关联工位操作步骤")
-    @PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:create')")
-    public CommonResult<Object> createRelation(@Valid @RequestBody WorkstationAbilityRelationReqVO reqVO) {
-        workstationAbilityService.createRelation(reqVO);
-        return success(null);
-    }
-    @PostMapping("/deleteRelation")
-    @Operation(summary = "删除工位操作步骤关联")
-    @PreAuthorize("@ss.hasPermission('strategy:workstation-opersteps:delete')")
-    public CommonResult<Object> deleteRelation(@Valid @RequestBody WorkstationAbilityRelationReqVO reqVO) {
-        return success(workstationAbilityService.deleteRelation(reqVO));
-    }
-}

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

@@ -0,0 +1,62 @@
+package com.win.module.mes.controller.workstation;
+
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.convert.workstation.WorkstationAbilityConvert;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationAbilityDO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
+import static com.win.framework.common.pojo.CommonResult.success;
+
+import com.win.module.mes.service.workstation.WorkstationAbilityService;
+
+@Tag(name = "管理后台 - 工位能力关联")
+@RestController
+@RequestMapping("/mes/workstation-ability")
+@Validated
+public class WorkstationAbilityController {
+
+    @Resource
+    private WorkstationAbilityService workstationAbilityService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建工位能力关联")
+    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:create')")
+    public CommonResult<Void> createWorkstationAbility(@Valid @RequestBody WorkstationAbilityRelationReqVO reqVO) {
+        workstationAbilityService.createWorkstationAbility(reqVO);
+        return success(null);
+    }
+    @PostMapping("/delete")
+    @Operation(summary = "删除工位能力关联")
+    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:delete')")
+    public CommonResult<Boolean> deleteWorkstationAbility(@Valid @RequestBody WorkstationAbilityRelationReqVO reqVO) {
+        int result = workstationAbilityService.deleteWorkstationAbility(reqVO);
+        return success(result > 0);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得工位能力关联分页")
+    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
+    public CommonResult<PageResult<WorkstationAbilityRespVO>> getWorkstationAbilityPage(@Valid WorkstationAbilityPageReqVO pageVO) {
+        PageResult<WorkstationAbilityRespVO> pageResult = workstationAbilityService.getWorkstationAbilityPage(pageVO);
+        return success(pageResult);
+    }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验任务主分页")
+    @PreAuthorize("@ss.hasPermission('mes:workstation-ability:query')")
+    public CommonResult<PageResult<WorkstationAbilityRespVO>> getWorkstationAbilitySenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<WorkstationAbilityDO> pageResult = workstationAbilityService.getWorkstationAbilitySenior(conditions);
+        return success(WorkstationAbilityConvert.INSTANCE.convertPage(pageResult));
+    }
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/MesWorkstationPostController.java → win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/WorkstationPostController.java

@@ -3,8 +3,8 @@ package com.win.module.mes.controller.workstation;
 import com.win.module.mes.controller.workstation.vo.*;
 import com.win.module.mes.controller.workstation.vo.WorkstationPostRespVO;
 import com.win.module.mes.controller.workstation.vo.WorkstationPostUpdateReqVO;
-import com.win.module.mes.convert.workstation.MesWorkstationPostConvert;
+import com.win.module.mes.convert.workstation.WorkstationPostConvert;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationPostDO;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationPostDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -20,26 +20,26 @@ import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import static com.win.framework.common.pojo.CommonResult.success;
 
-import com.win.module.mes.service.workstation.MesWorkstationPostService;
+import com.win.module.mes.service.workstation.WorkstationPostService;
 
 @Tag(name = "管理后台 - 工位岗位关联")
 @RestController
 @RequestMapping("/mes/workstation-post")
 @Validated
-public class MesWorkstationPostController {
+public class WorkstationPostController {
 
     @Resource
-    private MesWorkstationPostService workstationPostService;
+    private WorkstationPostService workstationPostService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建工位人员关联")
+    @Operation(summary = "创建工位岗位关联")
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:create')")
     public CommonResult<Long> createWorkstationPeople(@Valid @RequestBody WorkstationPostCreateReqVO createReqVO) {
         return success(workstationPostService.createWorkstationPost(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新工位人员关联")
+    @Operation(summary = "更新工位岗位关联")
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:update')")
     public CommonResult<Boolean> updateWorkstationPeople(@Valid @RequestBody WorkstationPostUpdateReqVO updateReqVO) {
         int result = workstationPostService.updateWorkstationPost(updateReqVO);
@@ -47,7 +47,7 @@ public class MesWorkstationPostController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除工位人员关联")
+    @Operation(summary = "删除工位岗位关联")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:delete')")
     public CommonResult<Boolean> deleteWorkstationPeople(@RequestParam("id") Long id) {
@@ -56,27 +56,27 @@ public class MesWorkstationPostController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得工位人员关联")
+    @Operation(summary = "获得工位岗位关联")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:query')")
     public CommonResult<WorkstationPostRespVO> getWorkstationPeople(@RequestParam("id") Long id) {
-        MesWorkstationPostDO workstationPeople = workstationPostService.getWorkstationPost(id);
+        WorkstationPostDO workstationPeople = workstationPostService.getWorkstationPost(id);
-        return success(MesWorkstationPostConvert.INSTANCE.convert(workstationPeople));
+        return success(WorkstationPostConvert.INSTANCE.convert(workstationPeople));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得工位人员关联分页")
+    @Operation(summary = "获得工位岗位关联分页")
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:query')")
     public CommonResult<PageResult<WorkstationPostRespVO>> getWorkstationPeoplePage(@Valid WorkstationPostPageReqVO pageVO) {
-        PageResult<MesWorkstationPostDO> pageResult = workstationPostService.getWorkstationPostPage(pageVO);
+        PageResult<WorkstationPostDO> pageResult = workstationPostService.getWorkstationPostPage(pageVO);
-        return success(MesWorkstationPostConvert.INSTANCE.convertPage(pageResult));
+        return success(WorkstationPostConvert.INSTANCE.convertPage(pageResult));
     }
 
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得检验任务主分页")
     @PreAuthorize("@ss.hasPermission('mes:workstation-post:query')")
     public CommonResult<PageResult<WorkstationPostRespVO>> getWorkstationPeopleSenior(@Valid @RequestBody CustomConditions conditions) {
-        PageResult<MesWorkstationPostDO> pageResult = workstationPostService.getWorkstationPostSenior(conditions);
+        PageResult<WorkstationPostDO> pageResult = workstationPostService.getWorkstationPostSenior(conditions);
-        return success(MesWorkstationPostConvert.INSTANCE.convertPage(pageResult));
+        return success(WorkstationPostConvert.INSTANCE.convertPage(pageResult));
     }
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/vo/WorkstationAbilityCreateReqVO.java

@@ -1,12 +0,0 @@
-package com.win.module.mes.controller.workstation.vo;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "管理后台 - 工位能力关联创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class WorkstationAbilityCreateReqVO extends WorkstationAbilityBaseVO {
-
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/vo/WorkstationAbilityRespVO.java

@@ -16,4 +16,12 @@ public class WorkstationAbilityRespVO extends WorkstationAbilityBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "给前端Detail组件使用的，没有这个属性不显示添加修改按钮")
+    private String status = "1";
+
+    @Schema(description = "用于前端展示的临时变量")
+    private String code;
+
+    @Schema(description = "用于前端展示的临时变量")
+    private String name;
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/workstation/vo/WorkstationPostRelationReqVO.java

@@ -0,0 +1,19 @@
+package com.win.module.mes.controller.workstation.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 关联岗位 Request VO")
+@Data
+@ToString(callSuper = true)
+public class WorkstationPostRelationReqVO {
+    @Schema(description = "工位code")
+    @NotNull(message = "工位code不能为空")
+    private String workstationCode;
+    @Schema(description = "岗位code数组")
+    @NotNull(message = "岗位不能为空")
+    private String[] postCodes;
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/convert/workstation/MesWorkstationAbilityConvert.java

@@ -1,34 +0,0 @@
-package com.win.module.mes.convert.workstation;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityCreateReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityRespVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityUpdateReqVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationAbilityDO;
-
-/**
- * 工位能力关联 Convert
- *
- * @author 张斌
- */
-@Mapper
-public interface MesWorkstationAbilityConvert {
-
-    MesWorkstationAbilityConvert INSTANCE = Mappers.getMapper(MesWorkstationAbilityConvert.class);
-
-    MesWorkstationAbilityDO convert(WorkstationAbilityCreateReqVO bean);
-
-    MesWorkstationAbilityDO convert(WorkstationAbilityUpdateReqVO bean);
-
-    WorkstationAbilityRespVO convert(MesWorkstationAbilityDO bean);
-
-    List<WorkstationAbilityRespVO> convertList(List<MesWorkstationAbilityDO> list);
-
-    PageResult<WorkstationAbilityRespVO> convertPage(PageResult<MesWorkstationAbilityDO> page);
-
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/convert/workstation/MesWorkstationPostConvert.java

@@ -1,34 +0,0 @@
-package com.win.module.mes.convert.workstation;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.mes.controller.workstation.vo.WorkstationPostCreateReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostRespVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostUpdateReqVO;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationPostDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-/**
- * 工位岗位关联 Convert
- *
- * @author 张斌
- */
-@Mapper
-public interface MesWorkstationPostConvert {
-
-    MesWorkstationPostConvert INSTANCE = Mappers.getMapper(MesWorkstationPostConvert.class);
-
-    MesWorkstationPostDO convert(WorkstationPostCreateReqVO bean);
-
-    MesWorkstationPostDO convert(WorkstationPostUpdateReqVO bean);
-
-    WorkstationPostRespVO convert(MesWorkstationPostDO bean);
-
-    List<WorkstationPostRespVO> convertList(List<MesWorkstationPostDO> list);
-
-    PageResult<WorkstationPostRespVO> convertPage(PageResult<MesWorkstationPostDO> page);
-
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/convert/workstation/WorkstationAbilityConvert.java

@@ -0,0 +1,31 @@
+package com.win.module.mes.convert.workstation;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+
+import com.win.module.mes.controller.workstation.vo.WorkstationAbilityRespVO;
+import com.win.module.mes.controller.workstation.vo.WorkstationAbilityUpdateReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationAbilityDO;
+
+/**
+ * 工位能力关联 Convert
+ *
+ * @author 张斌
+ */
+@Mapper
+public interface WorkstationAbilityConvert {
+
+    WorkstationAbilityConvert INSTANCE = Mappers.getMapper(WorkstationAbilityConvert.class);
+
+    WorkstationAbilityDO convert(WorkstationAbilityUpdateReqVO bean);
+
+    WorkstationAbilityRespVO convert(WorkstationAbilityDO bean);
+
+    List<WorkstationAbilityRespVO> convertList(List<WorkstationAbilityDO> list);
+
+    PageResult<WorkstationAbilityRespVO> convertPage(PageResult<WorkstationAbilityDO> page);
+
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/convert/workstation/WorkstationPostConvert.java

@@ -0,0 +1,34 @@
+package com.win.module.mes.convert.workstation;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+
+import com.win.module.mes.controller.workstation.vo.WorkstationPostCreateReqVO;
+import com.win.module.mes.controller.workstation.vo.WorkstationPostRespVO;
+import com.win.module.mes.controller.workstation.vo.WorkstationPostUpdateReqVO;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationPostDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 工位岗位关联 Convert
+ *
+ * @author 张斌
+ */
+@Mapper
+public interface WorkstationPostConvert {
+
+    WorkstationPostConvert INSTANCE = Mappers.getMapper(WorkstationPostConvert.class);
+
+    WorkstationPostDO convert(WorkstationPostCreateReqVO bean);
+
+    WorkstationPostDO convert(WorkstationPostUpdateReqVO bean);
+
+    WorkstationPostRespVO convert(WorkstationPostDO bean);
+
+    List<WorkstationPostRespVO> convertList(List<WorkstationPostDO> list);
+
+    PageResult<WorkstationPostRespVO> convertPage(PageResult<WorkstationPostDO> page);
+
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/workstation/MesWorkstationAbilityDO.java → win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/workstation/WorkstationAbilityDO.java

@@ -1,10 +1,9 @@
 package com.win.module.mes.dal.dataobject.workstation;
 
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 
@@ -20,7 +19,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MesWorkstationAbilityDO extends BaseDO {
+public class WorkstationAbilityDO extends BaseDO {
 
     /**
      * id
@@ -55,9 +54,5 @@ public class MesWorkstationAbilityDO extends BaseDO {
      * 地点ID
      */
     private String siteId;
-    /**
-     * 设备名称
-     */
-    private String equipmentName;
 
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/workstation/MesWorkstationPostDO.java → win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/workstation/WorkstationPostDO.java

@@ -19,7 +19,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MesWorkstationPostDO extends BaseDO {
+public class WorkstationPostDO extends BaseDO {
 
     /**
      * id

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/mysql/workstation/MesWorkstationAbilityMapper.java

@@ -1,63 +0,0 @@
-package com.win.module.mes.dal.mysql.workstation;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CustomConditions;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.win.framework.mybatis.core.mapper.BaseMapperX;
-import com.win.framework.mybatis.core.util.QueryWrapperUtils;
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityPageReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityRelationReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationAbilityRespVO;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationAbilityDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 工位能力关联 Mapper
- *
- * @author 张斌
- */
-@Mapper
-public interface MesWorkstationAbilityMapper extends BaseMapperX<MesWorkstationAbilityDO> {
-
-    default PageResult<MesWorkstationAbilityDO> selectPage(WorkstationAbilityPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MesWorkstationAbilityDO>()
-                .eqIfPresent(MesWorkstationAbilityDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(MesWorkstationAbilityDO::getAbilityCode, reqVO.getAbilityCode())
-                .betweenIfPresent(MesWorkstationAbilityDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(MesWorkstationAbilityDO::getDeletionTime, reqVO.getDeletionTime())
-                .eqIfPresent(MesWorkstationAbilityDO::getDeleterId, reqVO.getDeleterId())
-                .eqIfPresent(MesWorkstationAbilityDO::getExtraProperties, reqVO.getExtraProperties())
-                .eqIfPresent(MesWorkstationAbilityDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .eqIfPresent(MesWorkstationAbilityDO::getSiteId, reqVO.getSiteId())
-                .likeIfPresent(MesWorkstationAbilityDO::getEquipmentName, reqVO.getEquipmentName())
-                .orderByDesc(MesWorkstationAbilityDO::getId));
-    }
-
-    default PageResult<MesWorkstationAbilityDO> selectSenior(CustomConditions conditions) {
-        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
-    }
-
-    default List<MesWorkstationAbilityDO> selectList(WorkstationAbilityPageReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<MesWorkstationAbilityDO>()
-                .eqIfPresent(MesWorkstationAbilityDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(MesWorkstationAbilityDO::getAbilityCode, reqVO.getAbilityCode())
-                .betweenIfPresent(MesWorkstationAbilityDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(MesWorkstationAbilityDO::getDeletionTime, reqVO.getDeletionTime())
-                .eqIfPresent(MesWorkstationAbilityDO::getDeleterId, reqVO.getDeleterId())
-                .eqIfPresent(MesWorkstationAbilityDO::getExtraProperties, reqVO.getExtraProperties())
-                .eqIfPresent(MesWorkstationAbilityDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .eqIfPresent(MesWorkstationAbilityDO::getSiteId, reqVO.getSiteId())
-                .likeIfPresent(MesWorkstationAbilityDO::getEquipmentName, reqVO.getEquipmentName())
-                .orderByDesc(MesWorkstationAbilityDO::getId));
-    }
-
-    default int deleteRelation(WorkstationAbilityRelationReqVO reqVO){
-        return delete(new LambdaQueryWrapperX<MesWorkstationAbilityDO>()
-                .eq(MesWorkstationAbilityDO::getWorkstationCode,reqVO.getWorkstationCode())
-                .inIfPresent(MesWorkstationAbilityDO::getAbilityCode,reqVO.getAbilityCodes()));
-    }
-    Long count(String workstationCode);
-    List<WorkstationAbilityRespVO> listByWorkstationCode(String workstationCode);
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/mysql/workstation/MesWorkstationPostMapper.java

@@ -1,54 +0,0 @@
-package com.win.module.mes.dal.mysql.workstation;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CustomConditions;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.win.framework.mybatis.core.mapper.BaseMapperX;
-import com.win.framework.mybatis.core.util.QueryWrapperUtils;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostPageReqVO;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationPostDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 工位岗位关联 Mapper
- *
- * @author 张斌
- */
-@Mapper
-public interface MesWorkstationPostMapper extends BaseMapperX<MesWorkstationPostDO> {
-
-    default PageResult<MesWorkstationPostDO> selectPage(WorkstationPostPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MesWorkstationPostDO>()
-                .eqIfPresent(MesWorkstationPostDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(MesWorkstationPostDO::getPostCode, reqVO.getPostCode())
-                .betweenIfPresent(MesWorkstationPostDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(MesWorkstationPostDO::getDeletionTime, reqVO.getDeletionTime())
-                .eqIfPresent(MesWorkstationPostDO::getDeleterId, reqVO.getDeleterId())
-                .eqIfPresent(MesWorkstationPostDO::getExtraProperties, reqVO.getExtraProperties())
-                .eqIfPresent(MesWorkstationPostDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .eqIfPresent(MesWorkstationPostDO::getSiteId, reqVO.getSiteId())
-                .likeIfPresent(MesWorkstationPostDO::getEquipmentName, reqVO.getEquipmentName())
-                .orderByDesc(MesWorkstationPostDO::getId));
-    }
-
-    default PageResult<MesWorkstationPostDO> selectSenior(CustomConditions conditions) {
-        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
-    }
-
-    default List<MesWorkstationPostDO> selectList(WorkstationPostPageReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<MesWorkstationPostDO>()
-                .eqIfPresent(MesWorkstationPostDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(MesWorkstationPostDO::getPostCode, reqVO.getPostCode())
-                .betweenIfPresent(MesWorkstationPostDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(MesWorkstationPostDO::getDeletionTime, reqVO.getDeletionTime())
-                .eqIfPresent(MesWorkstationPostDO::getDeleterId, reqVO.getDeleterId())
-                .eqIfPresent(MesWorkstationPostDO::getExtraProperties, reqVO.getExtraProperties())
-                .eqIfPresent(MesWorkstationPostDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .eqIfPresent(MesWorkstationPostDO::getSiteId, reqVO.getSiteId())
-                .likeIfPresent(MesWorkstationPostDO::getEquipmentName, reqVO.getEquipmentName())
-                .orderByDesc(MesWorkstationPostDO::getId));
-    }
-
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/mysql/workstation/WorkstationAbilityMapper.java

@@ -0,0 +1,31 @@
+package com.win.module.mes.dal.mysql.workstation;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationAbilityDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工位能力关联 Mapper
+ *
+ * @author 张斌
+ */
+@Mapper
+public interface WorkstationAbilityMapper extends BaseMapperX<WorkstationAbilityDO> {
+    default PageResult<WorkstationAbilityDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+    default int deleteWorkstationAbility(WorkstationAbilityRelationReqVO reqVO){
+        return delete(new LambdaQueryWrapperX<WorkstationAbilityDO>()
+                .eq(WorkstationAbilityDO::getWorkstationCode,reqVO.getWorkstationCode())
+                .inIfPresent(WorkstationAbilityDO::getAbilityCode,reqVO.getAbilityCodes()));
+    }
+    Long count(WorkstationAbilityPageReqVO reqVO);
+    List<WorkstationAbilityRespVO> listByWorkstationCode(WorkstationAbilityPageReqVO reqVO);
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/mysql/workstation/WorkstationPostMapper.java

@@ -0,0 +1,62 @@
+package com.win.module.mes.dal.mysql.workstation;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationPostDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工位岗位关联 Mapper
+ *
+ * @author 张斌
+ */
+@Mapper
+public interface WorkstationPostMapper extends BaseMapperX<WorkstationPostDO> {
+
+    default PageResult<WorkstationPostDO> selectPage(WorkstationPostPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<WorkstationPostDO>()
+                .eqIfPresent(WorkstationPostDO::getWorkstationCode, reqVO.getWorkstationCode())
+                .eqIfPresent(WorkstationPostDO::getPostCode, reqVO.getPostCode())
+                .betweenIfPresent(WorkstationPostDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(WorkstationPostDO::getDeletionTime, reqVO.getDeletionTime())
+                .eqIfPresent(WorkstationPostDO::getDeleterId, reqVO.getDeleterId())
+                .eqIfPresent(WorkstationPostDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(WorkstationPostDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(WorkstationPostDO::getSiteId, reqVO.getSiteId())
+                .likeIfPresent(WorkstationPostDO::getEquipmentName, reqVO.getEquipmentName())
+                .orderByDesc(WorkstationPostDO::getId));
+    }
+
+    default PageResult<WorkstationPostDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
+    default List<WorkstationPostDO> selectList(WorkstationPostPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<WorkstationPostDO>()
+                .eqIfPresent(WorkstationPostDO::getWorkstationCode, reqVO.getWorkstationCode())
+                .eqIfPresent(WorkstationPostDO::getPostCode, reqVO.getPostCode())
+                .betweenIfPresent(WorkstationPostDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(WorkstationPostDO::getDeletionTime, reqVO.getDeletionTime())
+                .eqIfPresent(WorkstationPostDO::getDeleterId, reqVO.getDeleterId())
+                .eqIfPresent(WorkstationPostDO::getExtraProperties, reqVO.getExtraProperties())
+                .eqIfPresent(WorkstationPostDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
+                .eqIfPresent(WorkstationPostDO::getSiteId, reqVO.getSiteId())
+                .likeIfPresent(WorkstationPostDO::getEquipmentName, reqVO.getEquipmentName())
+                .orderByDesc(WorkstationPostDO::getId));
+    }
+    default int deleteRelation(WorkstationPostRelationReqVO reqVO){
+        return delete(new LambdaQueryWrapperX<WorkstationPostDO>()
+                .eq(WorkstationPostDO::getWorkstationCode,reqVO.getWorkstationCode())
+                .inIfPresent(WorkstationPostDO::getPostCode,reqVO.getPostCodes()));
+    }
+    Long count(WorkstationPostPageReqVO reqVO);
+    List<WorkstationPostRespVO> listByWorkstationCode(WorkstationPostPageReqVO reqVO);
+    Long checkCountByWorkstationCode(WorkstationPostPageReqVO reqVO);
+    List<WorkstationPostRespVO> checkListByWorkstationCode(WorkstationPostPageReqVO reqVO);
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/MesWorkstationAbilityService.java

@@ -1,70 +0,0 @@
-package com.win.module.mes.service.workstation;
-
-import javax.validation.*;
-
-import com.win.module.mes.controller.workstation.vo.*;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationAbilityDO;
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CustomConditions;
-
-/**
- * 工位能力关联 Service 接口
- *
- * @author 张斌
- */
-public interface MesWorkstationAbilityService {
-
-    /**
-     * 创建工位能力关联
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createWorkstationAbility(@Valid WorkstationAbilityCreateReqVO createReqVO);
-
-    /**
-     * 更新工位能力关联
-     *
-     * @param updateReqVO 更新信息
-     */
-    Integer updateWorkstationAbility(@Valid WorkstationAbilityUpdateReqVO updateReqVO);
-
-    /**
-     * 删除工位能力关联
-     *
-     * @param id 编号
-     */
-    Integer deleteWorkstationAbility(Long id);
-
-    /**
-     * 获得工位能力关联
-     *
-     * @param id 编号
-     * @return 工位能力关联
-     */
-    MesWorkstationAbilityDO getWorkstationAbility(Long id);
-
-    /**
-     * 获得工位能力关联分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 工位能力关联分页
-     */
-    PageResult<MesWorkstationAbilityDO> getWorkstationAbilityPage(WorkstationAbilityPageReqVO pageReqVO);
-
-    /**
-     * 获得用高级搜索工位能力关联分页列表
-     *
-     * @param conditions 分页、排序和自定义条件
-     * @return 分页列表
-     */
-    PageResult<MesWorkstationAbilityDO> getWorkstationAbilitySenior(CustomConditions conditions);
-
-    PageResult<WorkstationAbilityRespVO> pageListByWorkstationCode(WorkstationAbilityPageReqVO pageVO);
-
-    PageResult<WorkstationAbilityRespVO> pageCheckListByWorkstationCode(WorkstationAbilityPageReqVO pageVO);
-
-    void createRelation(WorkstationAbilityRelationReqVO reqVO);
-
-    Object deleteRelation(WorkstationAbilityRelationReqVO reqVO);
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/MesWorkstationAbilityServiceImpl.java

@@ -1,113 +0,0 @@
-package com.win.module.mes.service.workstation;
-
-import com.win.module.mes.controller.workstation.vo.*;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.*;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationAbilityDO;
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CustomConditions;
-
-import com.win.module.mes.convert.workstation.MesWorkstationAbilityConvert;
-import com.win.module.mes.dal.mysql.workstation.MesWorkstationAbilityMapper;
-
-import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.mes.enums.ErrorCodeConstants.*;
-
-/**
- * 工位能力关联 Service 实现类
- *
- * @author 张斌
- */
-@Service
-@Validated
-public class MesWorkstationAbilityServiceImpl implements MesWorkstationAbilityService {
-
-    @Resource
-    private MesWorkstationAbilityMapper workstationAbilityMapper;
-
-    @Override
-    public Long createWorkstationAbility(WorkstationAbilityCreateReqVO createReqVO) {
-        // 插入
-        MesWorkstationAbilityDO workstationAbility = MesWorkstationAbilityConvert.INSTANCE.convert(createReqVO);
-        workstationAbilityMapper.insert(workstationAbility);
-        // 返回
-        return workstationAbility.getId();
-    }
-
-    @Override
-    public Integer updateWorkstationAbility(WorkstationAbilityUpdateReqVO updateReqVO) {
-        // 校验存在
-        validateWorkstationAbilityExists(updateReqVO.getId());
-        // 更新
-        MesWorkstationAbilityDO updateObj = MesWorkstationAbilityConvert.INSTANCE.convert(updateReqVO);
-        return workstationAbilityMapper.updateById(updateObj);
-    }
-
-    @Override
-    public Integer deleteWorkstationAbility(Long id) {
-        // 校验存在
-        validateWorkstationAbilityExists(id);
-        // 删除
-        return workstationAbilityMapper.deleteById(id);
-    }
-
-    private void validateWorkstationAbilityExists(Long id) {
-        if (workstationAbilityMapper.selectById(id) == null) {
-            throw exception(WORKSTATION_ABILITY_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public MesWorkstationAbilityDO getWorkstationAbility(Long id) {
-        return workstationAbilityMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<MesWorkstationAbilityDO> getWorkstationAbilityPage(WorkstationAbilityPageReqVO pageReqVO) {
-        return workstationAbilityMapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    public PageResult<MesWorkstationAbilityDO> getWorkstationAbilitySenior(CustomConditions conditions) {
-        return workstationAbilityMapper.selectSenior(conditions);
-    }
-
-    @Override
-    public PageResult<WorkstationAbilityRespVO> pageListByWorkstationCode(WorkstationAbilityPageReqVO pageVO) {
-        Long count = workstationAbilityMapper.count(pageVO.getWorkstationCode());
-        PageResult<WorkstationAbilityRespVO> pageResult = new PageResult();
-        if (count > 0){
-            pageResult.setList(workstationAbilityMapper.listByWorkstationCode(pageVO.getWorkstationCode()));
-            pageResult.setTotal(count);
-        }else{
-            pageResult.setList(new ArrayList<>());
-        }
-        return pageResult;
-    }
-
-    @Override
-    public PageResult<WorkstationAbilityRespVO> pageCheckListByWorkstationCode(WorkstationAbilityPageReqVO pageVO) {
-        return null;
-    }
-
-    @Override
-    public void createRelation(WorkstationAbilityRelationReqVO reqVO) {
-        workstationAbilityMapper.deleteRelation(reqVO);
-        List<MesWorkstationAbilityDO> workstationAbilityDOList = new ArrayList<>();
-        for (String operstepsCode : reqVO.getAbilityCodes()) {
-            MesWorkstationAbilityDO workstationAbilityDO = new MesWorkstationAbilityDO();
-            workstationAbilityDO.setWorkstationCode(reqVO.getWorkstationCode());
-            workstationAbilityDO.setWorkstationCode(operstepsCode);
-            workstationAbilityDOList.add(workstationAbilityDO);
-        }
-        workstationAbilityMapper.insertBatch(workstationAbilityDOList);
-    }
-
-    @Override
-    public Object deleteRelation(WorkstationAbilityRelationReqVO reqVO) {
-        return workstationAbilityMapper.deleteRelation(reqVO);
-    }
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/MesWorkstationPostServiceImpl.java

@@ -1,85 +0,0 @@
-package com.win.module.mes.service.workstation;
-
-import com.win.module.mes.controller.workstation.vo.WorkstationPostCreateReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostPageReqVO;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostUpdateReqVO;
-import com.win.module.mes.convert.workstation.MesWorkstationPostConvert;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationPostDO;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CustomConditions;
-
-import com.win.module.mes.dal.mysql.workstation.MesWorkstationPostMapper;
-
-import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.mes.enums.ErrorCodeConstants.WORKSTATION_PEOPLE_NOT_EXISTS;
-
-/**
- * 工位岗位关联 Service 实现类
- *
- * @author 张斌
- */
-@Service
-@Validated
-public class MesWorkstationPostServiceImpl implements MesWorkstationPostService {
-
-    @Resource
-    private MesWorkstationPostMapper workstationPostMapper;
-
-    @Override
-    public Long createWorkstationPost(WorkstationPostCreateReqVO createReqVO) {
-        // 插入
-        MesWorkstationPostDO workstationPost = MesWorkstationPostConvert.INSTANCE.convert(createReqVO);
-        workstationPostMapper.insert(workstationPost);
-        // 返回
-        return workstationPost.getId();
-    }
-
-    @Override
-    public Integer updateWorkstationPost(WorkstationPostUpdateReqVO updateReqVO) {
-        // 校验存在
-        validateWorkstationPostExists(updateReqVO.getId());
-        // 更新
-        MesWorkstationPostDO updateObj = MesWorkstationPostConvert.INSTANCE.convert(updateReqVO);
-        return workstationPostMapper.updateById(updateObj);
-    }
-
-    @Override
-    public Integer deleteWorkstationPost(Long id) {
-        // 校验存在
-        validateWorkstationPostExists(id);
-        // 删除
-        return workstationPostMapper.deleteById(id);
-    }
-
-    private void validateWorkstationPostExists(Long id) {
-        if (workstationPostMapper.selectById(id) == null) {
-            throw exception(WORKSTATION_PEOPLE_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public MesWorkstationPostDO getWorkstationPost(Long id) {
-        return workstationPostMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<MesWorkstationPostDO> getWorkstationPostPage(WorkstationPostPageReqVO pageReqVO) {
-        return workstationPostMapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    public PageResult<MesWorkstationPostDO> getWorkstationPostSenior(CustomConditions conditions) {
-        return workstationPostMapper.selectSenior(conditions);
-    }
-
-    @Override
-    public List<MesWorkstationPostDO> getWorkstationPostList(WorkstationPostPageReqVO exportReqVO) {
-        return workstationPostMapper.selectList(exportReqVO);
-    }
-}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationAbilityService.java

@@ -0,0 +1,45 @@
+package com.win.module.mes.service.workstation;
+
+import javax.validation.*;
+
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationAbilityDO;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CustomConditions;
+
+/**
+ * 工位能力关联 Service 接口
+ *
+ * @author 张斌
+ */
+public interface WorkstationAbilityService {
+
+    /**
+     * 创建工位能力关联
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    void createWorkstationAbility(@Valid WorkstationAbilityRelationReqVO createReqVO);
+
+    /**
+     * 删除工位能力关联
+     */
+    Integer deleteWorkstationAbility(WorkstationAbilityRelationReqVO req);
+
+    /**
+     * 获得工位能力关联分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 工位能力关联分页
+     */
+    PageResult<WorkstationAbilityRespVO> getWorkstationAbilityPage(WorkstationAbilityPageReqVO pageReqVO);
+
+    /**
+     * 获得用高级搜索工位能力关联分页列表
+     *
+     * @param conditions 分页、排序和自定义条件
+     * @return 分页列表
+     */
+    PageResult<WorkstationAbilityDO> getWorkstationAbilitySenior(CustomConditions conditions);
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationAbilityServiceImpl.java

@@ -0,0 +1,63 @@
+package com.win.module.mes.service.workstation;
+
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationAbilityDO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CustomConditions;
+
+import com.win.module.mes.dal.mysql.workstation.WorkstationAbilityMapper;
+
+/**
+ * 工位能力关联 Service 实现类
+ *
+ * @author 张斌
+ */
+@Service
+@Validated
+public class WorkstationAbilityServiceImpl implements WorkstationAbilityService {
+
+    @Resource
+    private WorkstationAbilityMapper workstationAbilityMapper;
+    @Override
+    public void createWorkstationAbility(WorkstationAbilityRelationReqVO createReqVO) {
+        workstationAbilityMapper.deleteWorkstationAbility(createReqVO);
+        List<WorkstationAbilityDO> workstationAbilityDOList = new ArrayList<>();
+        for (String code : createReqVO.getAbilityCodes()) {
+            WorkstationAbilityDO workstationAbilityDO = new WorkstationAbilityDO();
+            workstationAbilityDO.setWorkstationCode(createReqVO.getWorkstationCode());
+            workstationAbilityDO.setAbilityCode(code);
+            workstationAbilityDOList.add(workstationAbilityDO);
+        }
+        workstationAbilityMapper.insertBatch(workstationAbilityDOList);
+    }
+
+    @Override
+    public Integer deleteWorkstationAbility(WorkstationAbilityRelationReqVO req) {
+        return workstationAbilityMapper.deleteWorkstationAbility(req);
+    }
+
+
+    @Override
+    public PageResult<WorkstationAbilityRespVO> getWorkstationAbilityPage(WorkstationAbilityPageReqVO pageReqVO) {
+        Long count = workstationAbilityMapper.count(pageReqVO);
+        PageResult<WorkstationAbilityRespVO> pageResult = new PageResult();
+        if (count > 0){
+            pageResult.setList(workstationAbilityMapper.listByWorkstationCode(pageReqVO));
+            pageResult.setTotal(count);
+        }else{
+            pageResult.setList(new ArrayList<>());
+        }
+        return pageResult;
+    }
+
+    @Override
+    public PageResult<WorkstationAbilityDO> getWorkstationAbilitySenior(CustomConditions conditions) {
+        return workstationAbilityMapper.selectSenior(conditions);
+    }
+}

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/MesWorkstationPostService.java → win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationPostService.java

@@ -1,12 +1,9 @@
 package com.win.module.mes.service.workstation;
 
-import java.util.*;
 import javax.validation.*;
 
-import com.win.module.mes.controller.workstation.vo.WorkstationPostCreateReqVO;
+import com.win.module.mes.controller.workstation.vo.*;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostPageReqVO;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationPostDO;
-import com.win.module.mes.controller.workstation.vo.WorkstationPostUpdateReqVO;
-import com.win.module.mes.dal.dataobject.workstation.MesWorkstationPostDO;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CustomConditions;
 
@@ -15,7 +12,7 @@ import com.win.framework.common.pojo.CustomConditions;
  *
  * @author 张斌
  */
-public interface MesWorkstationPostService {
+public interface WorkstationPostService {
 
     /**
      * 创建工位岗位关联
@@ -45,7 +42,7 @@ public interface MesWorkstationPostService {
      * @param id 编号
      * @return 工位岗位关联
      */
-    MesWorkstationPostDO getWorkstationPost(Long id);
+    WorkstationPostDO getWorkstationPost(Long id);
 
     /**
      * 获得工位岗位关联分页
@@ -53,7 +50,7 @@ public interface MesWorkstationPostService {
      * @param pageReqVO 分页查询
      * @return 工位岗位关联分页
      */
-    PageResult<MesWorkstationPostDO> getWorkstationPostPage(WorkstationPostPageReqVO pageReqVO);
+    PageResult<WorkstationPostDO> getWorkstationPostPage(WorkstationPostPageReqVO pageReqVO);
 
     /**
      * 获得用高级搜索工位岗位关联分页列表
@@ -61,7 +58,14 @@ public interface MesWorkstationPostService {
      * @param conditions 分页、排序和自定义条件
      * @return 分页列表
      */
-    PageResult<MesWorkstationPostDO> getWorkstationPostSenior(CustomConditions conditions);
+    PageResult<WorkstationPostDO> getWorkstationPostSenior(CustomConditions conditions);
 
-    List<MesWorkstationPostDO> getWorkstationPostList(WorkstationPostPageReqVO exportReqVO);
+
+    PageResult<WorkstationPostRespVO> pageListByWorkstationCode(WorkstationPostPageReqVO pageVO);
+
+    PageResult<WorkstationPostRespVO> pageCheckListByWorkstationCode(WorkstationPostPageReqVO pageVO);
+
+    void createRelation(WorkstationPostRelationReqVO reqVO);
+
+    Object deleteRelation(WorkstationPostRelationReqVO reqVO);
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/workstation/WorkstationPostServiceImpl.java

@@ -0,0 +1,114 @@
+package com.win.module.mes.service.workstation;
+
+import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.convert.workstation.WorkstationPostConvert;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationPostDO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.common.pojo.CustomConditions;
+
+import com.win.module.mes.dal.mysql.workstation.WorkstationPostMapper;
+
+import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.module.mes.enums.ErrorCodeConstants.WORKSTATION_POST_NOT_EXISTS;
+
+/**
+ * 工位岗位关联 Service 实现类
+ *
+ * @author 张斌
+ */
+@Service
+@Validated
+public class WorkstationPostServiceImpl implements WorkstationPostService {
+
+    @Resource
+    private WorkstationPostMapper workstationPostMapper;
+
+    @Override
+    public Long createWorkstationPost(WorkstationPostCreateReqVO createReqVO) {
+        // 插入
+        WorkstationPostDO workstationPost = WorkstationPostConvert.INSTANCE.convert(createReqVO);
+        workstationPostMapper.insert(workstationPost);
+        // 返回
+        return workstationPost.getId();
+    }
+
+    @Override
+    public Integer updateWorkstationPost(WorkstationPostUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateWorkstationPostExists(updateReqVO.getId());
+        // 更新
+        WorkstationPostDO updateObj = WorkstationPostConvert.INSTANCE.convert(updateReqVO);
+        return workstationPostMapper.updateById(updateObj);
+    }
+
+    @Override
+    public Integer deleteWorkstationPost(Long id) {
+        // 校验存在
+        validateWorkstationPostExists(id);
+        // 删除
+        return workstationPostMapper.deleteById(id);
+    }
+
+    private void validateWorkstationPostExists(Long id) {
+        if (workstationPostMapper.selectById(id) == null) {
+            throw exception(WORKSTATION_POST_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public WorkstationPostDO getWorkstationPost(Long id) {
+        return workstationPostMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<WorkstationPostDO> getWorkstationPostPage(WorkstationPostPageReqVO pageReqVO) {
+        return workstationPostMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public PageResult<WorkstationPostDO> getWorkstationPostSenior(CustomConditions conditions) {
+        return workstationPostMapper.selectSenior(conditions);
+    }
+
+    @Override
+    public PageResult<WorkstationPostRespVO> pageListByWorkstationCode(WorkstationPostPageReqVO pageVO) {
+        Long count = workstationPostMapper.count(pageVO);
+        PageResult<WorkstationPostRespVO> pageResult = new PageResult();
+        if (count > 0){
+            pageResult.setList(workstationPostMapper.listByWorkstationCode(pageVO));
+            pageResult.setTotal(count);
+        }else{
+            pageResult.setList(new ArrayList<>());
+        }
+        return pageResult;
+    }
+
+    @Override
+    public PageResult<WorkstationPostRespVO> pageCheckListByWorkstationCode(WorkstationPostPageReqVO pageVO) {
+        return null;
+    }
+
+    @Override
+    public void createRelation(WorkstationPostRelationReqVO reqVO) {
+        workstationPostMapper.deleteRelation(reqVO);
+        List<WorkstationPostDO> workstationPostDOList = new ArrayList<>();
+        for (String code : reqVO.getPostCodes()) {
+            WorkstationPostDO workstationPostDO = new WorkstationPostDO();
+            workstationPostDO.setWorkstationCode(reqVO.getWorkstationCode());
+            workstationPostDO.setPostCode(code);
+            workstationPostDOList.add(workstationPostDO);
+        }
+        workstationPostMapper.insertBatch(workstationPostDOList);
+    }
+
+    @Override
+    public Object deleteRelation(WorkstationPostRelationReqVO reqVO) {
+        return workstationPostMapper.deleteRelation(reqVO);
+    }
+}

win-module-mes/win-module-mes-biz/src/main/resources/mapper/workstation/MesWorkstationAbilityMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.win.module.mes.dal.mysql.workstation.MesWorkstationAbilityMapper">
-
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>

win-module-mes/win-module-mes-biz/src/main/resources/mapper/workstation/MesWorkstationPostMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.win.module.mes.dal.mysql.workstation.MesWorkstationPostMapper">
-
-    <select id="count" resultType="java.lang.Long">
-        select count(1) from basic_team t where exists (
-            select 1 from strategy_mes_workstation_opersteps where deleted=0 and t.steps_code=opersteps_code and workstation_code=#{workstationCode}
-        ) and deleted=0
-    </select>
-    <select id="listByWorkstationCode" resultType="com.win.module.mes.controller.workstation.vo.WorkstationOperstepsRespVO">
-        select t.steps_code code,t.steps_name name from basic_opersteps t where exists(
-            select 1 from strategy_mes_workstation_opersteps where deleted=0 and t.steps_code=opersteps_code and workstation_code=#{workstationCode}
-        ) and deleted=0
-    </select>
-</mapper>

win-module-mes/win-module-mes-biz/src/main/resources/mapper/workstation/WorkstationAbilityMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.mes.dal.mysql.workstation.WorkstationAbilityMapper">
+
+    <select id="count" resultType="java.lang.Long">
+        select count(1) from basic_ability_info t where exists (
+            select 1 from strategy_mes_workstation_ability where deleted=0 and t.ablity_code=ability_code and workstation_code=#{workstationCode}
+        ) and deleted=0
+    </select>
+    <select id="listByWorkstationCode" resultType="com.win.module.mes.controller.workstation.vo.WorkstationAbilityRespVO">
+        select t.ablity_code code,t.ablity_name name from basic_ability_info t where exists (
+            select 1 from strategy_mes_workstation_ability where deleted=0 and t.ablity_code=ability_code and workstation_code=#{workstationCode}
+        ) and deleted=0 limit #{pageStart},#{pageSize}
+    </select>
+</mapper>

win-module-mes/win-module-mes-biz/src/main/resources/mapper/workstation/WorkstationPostMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.win.module.mes.dal.mysql.workstation.WorkstationPostMapper">
+
+    <select id="count" resultType="java.lang.Long">
+        select count(1) from basic_device_info t where exists (
+            select 1 from strategy_mes_workstation_equipment where deleted=0 and t.device_code=equipment_code and workstation_code=#{workstationCode}
+        ) and deleted=0
+    </select>
+    <select id="listByWorkstationCode" resultType="com.win.module.mes.controller.workstation.vo.WorkstationEquipmentRespVO">
+        select t.device_code code,t.device_name name from basic_device_info t where exists (
+            select 1 from strategy_mes_workstation_equipment where deleted=0 and t.device_code=equipment_code and workstation_code=#{workstationCode}
+        ) and deleted=0 limit #{pageStart},#{pageSize}
+    </select>
+    <select id="checkCountByWorkstationCode" resultType="java.lang.Long">
+        select count(1) from basic_device_info t where exists(
+        select 1 from basic_workstation where deleted=0 and code=#{workstationCode} and t.workroom_code=workshop_code
+        <if test="productionLineCodeCheck">
+            and t.line_code=production_line_code
+        </if>
+        ) and deleted=0
+    </select>
+    <select id="checkListByWorkstationCode" resultType="com.win.module.mes.controller.workstation.vo.WorkstationEquipmentRespVO">
+        select t.device_code code,t.device_name name from basic_device_info t where exists(
+        select 1 from basic_workstation where deleted=0 and code=#{workstationCode} and t.workroom_code=workshop_code
+        <if test="productionLineCodeCheck">
+            and t.line_code=production_line_code
+        </if>
+        ) and deleted=0 limit #{pageStart},#{pageSize}
+    </select>
+</mapper>