1、修改工位关联设备相关代码

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

@@ -15,7 +15,7 @@ public class EquipmentRelationReqVO {
     private String workstationCode;
     @Schema(description = "设备code")
     @NotNull(message = "设备不能为空")
-    private String[] equipmentCode;
+    private String equipmentCode;
     @Schema(description = "设备code数组")
     @NotNull(message = "设备不能为空")
     private String[] equipmentCodes;

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

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.module.mes.controller.workstation.vo.TeamExportReqVO;
 import com.win.module.mes.controller.workstation.vo.TeamPageReqVO;
+import com.win.module.mes.controller.workstation.vo.TeamRelationReqVO;
 import com.win.module.mes.dal.dataobject.workstation.MesTeamDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,6 +1,8 @@
 package com.win.module.mes.dal.mysql.workstation;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -47,4 +49,9 @@ public interface MesWorkstationMapper extends BaseMapperX<MesWorkstationDO> {
         return selectOne(new LambdaQueryWrapperX<MesWorkstationDO>()
                 .eqIfPresent(MesWorkstationDO::getCode, code));
     }
+
+    default Object deleteRelation(TeamRelationReqVO teamRelationReqVO){
+        UpdateChainWrapper<MesWorkstationDO> update = new UpdateChainWrapper<>(MesWorkstationDO.class);
+        return update.set("team_code",teamRelationReqVO.getTeamCodes()[0]).update();
+    }
 }

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

@@ -76,7 +76,7 @@ public interface ProductionProcessService {
     * @param updatePart 是否支持更新
     * @return 导入结果
     */
-    public List<ProductionProcessExcelVO>  importProductionProcessList(List<ProductionProcessExcelVO> datas, Integer mode, boolean updatePart);
+    List<ProductionProcessExcelVO>  importProductionProcessList(List<ProductionProcessExcelVO> datas, Integer mode, boolean updatePart);
 
     PageResult<ProductionProcessDO> pageListByWorkstationCode(ProductionProcessPageReqVO pageVO);
 

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

@@ -5,6 +5,7 @@ import com.win.module.mes.controller.workstation.vo.*;
 import com.win.module.mes.convert.team.TeamConvert;
 import com.win.module.mes.dal.dataobject.workstation.MesTeamDO;
 import com.win.module.mes.dal.mysql.workstation.MesTeamMapper;
+import com.win.module.mes.dal.mysql.workstation.MesWorkstationMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -29,6 +30,8 @@ public class TeamServiceImpl implements TeamService {
 
     @Resource
     private MesTeamMapper mesTeamMapper;
+    @Resource
+    private MesWorkstationMapper mesWorkstationMapper;
     @Override
     public Long createTeam(TeamCreateReqVO createReqVO) {
         // 插入
@@ -135,6 +138,6 @@ public class TeamServiceImpl implements TeamService {
 
     @Override
     public Object deleteRelation(TeamRelationReqVO teamRelationReqVO) {
-        return null;
+        return mesWorkstationMapper.deleteRelation(teamRelationReqVO);
     }
 }

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

@@ -75,5 +75,5 @@ public interface WorkstationOrderHistoryService {
     * @param updatePart 是否支持更新
     * @return 导入结果
     */
-    public List<WorkstationOrderHistoryExcelVO>  importWorkstationOrderHistoryList(List<WorkstationOrderHistoryExcelVO> datas, Integer mode, boolean updatePart);
+    List<WorkstationOrderHistoryExcelVO>  importWorkstationOrderHistoryList(List<WorkstationOrderHistoryExcelVO> datas, Integer mode, boolean updatePart);
 }

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

@@ -75,5 +75,5 @@ public interface WorkstationOrderService {
     * @param updatePart 是否支持更新
     * @return 导入结果
     */
-    public List<WorkstationOrderExcelVO>  importWorkstationOrderList(List<WorkstationOrderExcelVO> datas, Integer mode, boolean updatePart);
+    List<WorkstationOrderExcelVO>  importWorkstationOrderList(List<WorkstationOrderExcelVO> datas, Integer mode, boolean updatePart);
 }