diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java index 8c1f9f8c..2819bf5f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java @@ -57,4 +57,17 @@ public class MesBoardController extends BaseController { } return success(iMesBoradService.getProductionLineInfo(mesBoard)); } + + /**工单详情**/ + @PostMapping("/getPorOrderList") + public AjaxResult getPorOrderList(@RequestBody BoardDTO mesBoard) { + if (StringUtils.isBlank(mesBoard.getFactoryCode())) { + return error("[factoryCode] 不能为空"); + } + if (StringUtils.isBlank(mesBoard.getEquCode())) { + return error("[equCode] 不能为空"); + } + return success(iMesBoradService.getPorOrderList(mesBoard)); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index e904a1aa..f435ad48 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -3,6 +3,7 @@ package com.op.mes.mapper; import com.op.common.core.domain.BaseFileData; import com.op.mes.domain.MesBoard; import com.op.mes.domain.MesReportWork; +import com.op.mes.domain.ProOrderWorkorder; import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; @@ -10,6 +11,7 @@ import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; +import com.op.system.api.domain.quality.QcCheckTaskDTO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -83,4 +85,10 @@ public interface MesMapper { BoardDTO getWorkOrder(BoardDTO boardDTO); @MapKey("productDate") Map getProduction15DaysAct(BoardDTO boardDTO); + + QcCheckTaskDTO getTaskInfo(BoardDTO boardDTO); + + List getCheckList(BoardDTO boardDTO); + + List getPorOrderList(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java index 686841f8..d0dcf839 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java @@ -1,6 +1,7 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.ProOrderWorkorder; import com.op.system.api.domain.dto.BoardDTO; import java.util.List; @@ -13,4 +14,6 @@ public interface IMesBoradService { public BoardDTO getProduction15Days(BoardDTO mesBoard); public Map getProductionLineInfo(BoardDTO mesBoard); + + public List getPorOrderList(BoardDTO mesBoard); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java index 498247d8..522d109b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java @@ -1,15 +1,19 @@ package com.op.mes.service.impl; import com.alibaba.fastjson2.JSONObject; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.MesReportWork; +import com.op.mes.domain.ProOrderWorkorder; import com.op.mes.mapper.MesMapper; import com.op.mes.service.IMesBoradService; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; +import com.op.system.api.domain.quality.QcCheckTaskDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -103,11 +107,40 @@ public class MesBoradServiceImpl implements IMesBoradService { BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO); dtoMap.put("workOrder",workOrder); + QcCheckTaskDTO taskDTO = mesMapper.getTaskInfo(boardDTO); + BoardDTO task2 = new BoardDTO(); + if(taskDTO.getQuality() != null){ + task2.setTaskNum(taskDTO.getQuality().toString()); + }else{ + task2.setTaskNum("0"); + } + dtoMap.put("taskNum",task2);//巡检次数 + + BoardDTO task3 = new BoardDTO(); + if(taskDTO.getSampleQuality() != null){ + task3.setTaskSampleNum(taskDTO.getSampleQuality().toString()); + }else{ + task3.setTaskSampleNum("0"); + } + dtoMap.put("taskSampleNum",task3);//巡检抽样数量 + BoardDTO task4 = new BoardDTO(); + List checkList = mesMapper.getCheckList(boardDTO); + if(!CollectionUtils.isEmpty(checkList)){ + task4.setCheckList(checkList); + } + dtoMap.put("piedata",task4);//巡检结果 return dtoMap; } + @Override + public List getPorOrderList(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); + List dtos = mesMapper.getPorOrderList(boardDTO); + return dtos; + } + //获取当前日期前几天 private List getDays(int dayNum){ List days = new ArrayList<>(); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 0eb56621..c71f287e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -330,5 +330,43 @@ and CONVERT ( DATE, pow.product_date ) = CONVERT ( DATE, GETDATE( ) ) and pow.parent_order = '0' and pow.del_flag='0' + + +