1、工位工序关联表字段修改

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

@@ -20,10 +20,6 @@ public class WorkstationProcessBaseVO {
     @NotNull(message = "工位code不能为空")
     private String workstationCode;
 
-    @Schema(description = "产品code", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "产品code不能为空")
-    private String productionCode;
-
     @Schema(description = "工序code", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "工序code不能为空")
     private String processCode;

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

@@ -3,10 +3,18 @@ package com.win.module.mes.controller.workstation.vo;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 @Schema(description = "管理后台 - 工位产品工序关联创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class WorkstationProcessCreateReqVO extends WorkstationProcessBaseVO {
-
+    @Schema(description = "工位code", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "工位code不能为空")
+    private String workstationCode;
+    @Schema(description = "工序codes", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "工序codes不能为空")
+    private String[] processCodes;
 }

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

@@ -20,9 +20,6 @@ public class WorkstationProcessExcelVO {
     @ExcelProperty("工位code")
     private String workstationCode;
 
-    @ExcelProperty("产品code")
-    private String productionCode;
-
     @ExcelProperty("工序code")
     private String processCode;
 

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

@@ -15,9 +15,6 @@ public class WorkstationProcessExportReqVO {
     @Schema(description = "工位code")
     private String workstationCode;
 
-    @Schema(description = "产品code")
-    private String productionCode;
-
     @Schema(description = "工序code")
     private String processCode;
 

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

@@ -17,9 +17,6 @@ public class WorkstationProcessPageReqVO extends PageParam {
     @Schema(description = "工位code")
     private String workstationCode;
 
-    @Schema(description = "产品code")
-    private String productionCode;
-
     @Schema(description = "工序code")
     private String processCode;
 

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

@@ -17,10 +17,6 @@ public class WorkstationProcessRelationReqVO {
     @NotNull(message = "工位code不能为空")
     private String workstationCode;
 
-    @Schema(description = "产品code", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "产品code不能为空")
-    private String productionCode;
-
     @Schema(description = "工序code", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "工序code不能为空")
     private String processCode;

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

@@ -6,6 +6,7 @@ import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.module.mes.controller.workstation.vo.*;
+import com.win.module.mes.dal.dataobject.workstation.WorkstationEquipmentDO;
 import com.win.module.mes.dal.dataobject.workstation.WorkstationProcessDO;
 import com.win.module.mes.dal.dataobject.workstation.MesTeamDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,7 +22,6 @@ public interface WorkstationProcessMapper extends BaseMapperX<WorkstationProcess
     default PageResult<WorkstationProcessDO> selectPage(WorkstationProcessPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WorkstationProcessDO>()
                 .eqIfPresent(WorkstationProcessDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(WorkstationProcessDO::getProductionCode, reqVO.getProductionCode())
                 .eqIfPresent(WorkstationProcessDO::getProcessCode, reqVO.getProcessCode())
                 .betweenIfPresent(WorkstationProcessDO::getCreateTime, reqVO.getCreateTime())
                 .betweenIfPresent(WorkstationProcessDO::getDeletionTime, reqVO.getDeletionTime())
@@ -35,7 +35,6 @@ public interface WorkstationProcessMapper extends BaseMapperX<WorkstationProcess
     default List<WorkstationProcessDO> selectList(WorkstationProcessExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<WorkstationProcessDO>()
                 .eqIfPresent(WorkstationProcessDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(WorkstationProcessDO::getProductionCode, reqVO.getProductionCode())
                 .eqIfPresent(WorkstationProcessDO::getProcessCode, reqVO.getProcessCode())
                 .betweenIfPresent(WorkstationProcessDO::getCreateTime, reqVO.getCreateTime())
                 .betweenIfPresent(WorkstationProcessDO::getDeletionTime, reqVO.getDeletionTime())
@@ -48,19 +47,22 @@ public interface WorkstationProcessMapper extends BaseMapperX<WorkstationProcess
     default WorkstationProcessDO selectByCode(WorkstationProcessExcelVO reqVO) {
         return selectOne(new LambdaQueryWrapperX<WorkstationProcessDO>()
                 .eqIfPresent(WorkstationProcessDO::getProcessCode, reqVO.getProcessCode())
-                .eqIfPresent(WorkstationProcessDO::getWorkstationCode, reqVO.getWorkstationCode())
-                .eqIfPresent(WorkstationProcessDO::getProductionCode, reqVO.getProductionCode()));
+                .eqIfPresent(WorkstationProcessDO::getWorkstationCode, reqVO.getWorkstationCode()));
     }
     default WorkstationProcessDO selectByCode(WorkstationProcessRelationReqVO reqVO) {
         return selectOne(new LambdaQueryWrapperX<WorkstationProcessDO>()
-                .eqIfPresent(WorkstationProcessDO::getProductionCode, reqVO.getProductionCode())
                 .eqIfPresent(WorkstationProcessDO::getWorkstationCode,reqVO.getWorkstationCode())
                 .eqIfPresent(WorkstationProcessDO::getProcessCode,reqVO.getProcessCode()));
     }
     Long count(String workstationCode);
     List<WorkstationProcessDO> listByWorkstationCode(String workstationCode);
 
-    Long checkCountByWorkstationCode(String workstationCode, boolean b);
+    Long checkCountByWorkstationCode(String workstationCode);
+
+    List<MesTeamDO> checkListByWorkstationCode(String workstationCode);
+    int deleteRelation(WorkstationProcessRelationReqVO workstationProcessRelationReqVO);
 
-    List<MesTeamDO> checkListByWorkstationCode(String workstationCode, boolean b);
+    default void createRelation(List<WorkstationProcessDO> workstationEquipmentDO){
+        insertBatch(workstationEquipmentDO);
+    }
 }

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

@@ -124,10 +124,10 @@ public class WorkstationProcessServiceImpl implements WorkstationProcessService
 
     @Override
     public PageResult<MesTeamDO> pageCheckListByWorkstationCode(TeamPageReqVO pageVO) {
-        Long count = workstationProcessMapper.checkCountByWorkstationCode(pageVO.getWorkstationCode(),false);
+        Long count = workstationProcessMapper.checkCountByWorkstationCode(pageVO.getWorkstationCode());
         PageResult<MesTeamDO> pageResult = new PageResult();
         if (count > 0){
-            pageResult.setList(workstationProcessMapper.checkListByWorkstationCode(pageVO.getWorkstationCode(),false));
+            pageResult.setList(workstationProcessMapper.checkListByWorkstationCode(pageVO.getWorkstationCode()));
             pageResult.setTotal(count);
         }
         return pageResult;