package cn.iocoder.yudao.module.mes.controller.admin.pro.feedback;
|
|
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.collection.ListUtil;
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackPageReqVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackRespVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
|
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
|
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
|
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
|
import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
|
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
|
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
|
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteService;
|
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
|
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
import jakarta.annotation.Resource;
|
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.validation.Valid;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.validation.annotation.Validated;
|
import org.springframework.web.bind.annotation.*;
|
|
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackTraceRespVO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
|
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
|
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
|
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeMapper;
|
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceLineMapper;
|
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper;
|
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
|
|
import java.io.IOException;
|
import java.util.*;
|
import java.util.stream.Stream;
|
|
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
|
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
|
|
|
@Tag(name = "管理后台 - MES 生产报工")
|
@RestController
|
@RequestMapping("/mes/pro/feedback")
|
@Validated
|
public class MesProFeedbackController {
|
|
@Resource
|
private MesProFeedbackService feedbackService;
|
@Resource
|
private MesMdWorkstationService workstationService;
|
@Resource
|
private MesProRouteService routeService;
|
@Resource
|
private MesProProcessService processService;
|
@Resource
|
private MesProWorkOrderService workOrderService;
|
@Resource
|
private MesMdItemService itemService;
|
@Resource
|
private MesMdUnitMeasureService unitMeasureService;
|
@Resource
|
private MesProRouteProcessService routeProcessService;
|
@Resource
|
private MesProTaskService taskService;
|
|
@Resource
|
private AdminUserApi adminUserApi;
|
|
@Resource
|
private MesWmProductProduceMapper productProduceMapper;
|
@Resource
|
private MesWmProductProduceLineMapper productProduceLineMapper;
|
@Resource
|
private MesWmItemConsumeMapper itemConsumeMapper;
|
@Resource
|
private MesWmItemConsumeLineMapper itemConsumeLineMapper;
|
@Resource
|
private MesQcIpqcMapper ipqcMapper;
|
|
@PostMapping("/create")
|
@Operation(summary = "创建生产报工")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
|
public CommonResult<Long> createFeedback(@Valid @RequestBody MesProFeedbackSaveReqVO createReqVO) {
|
return success(feedbackService.createFeedback(createReqVO));
|
}
|
|
@PutMapping("/update")
|
@Operation(summary = "更新生产报工")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
|
public CommonResult<Boolean> updateFeedback(@Valid @RequestBody MesProFeedbackSaveReqVO updateReqVO) {
|
feedbackService.updateFeedback(updateReqVO);
|
return success(true);
|
}
|
|
@DeleteMapping("/delete")
|
@Operation(summary = "删除生产报工")
|
@Parameter(name = "id", description = "编号", required = true)
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:delete')")
|
public CommonResult<Boolean> deleteFeedback(@RequestParam("id") Long id) {
|
feedbackService.deleteFeedback(id);
|
return success(true);
|
}
|
|
@GetMapping("/get")
|
@Operation(summary = "获得生产报工")
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
|
public CommonResult<MesProFeedbackRespVO> getFeedback(@RequestParam("id") Long id) {
|
MesProFeedbackDO feedback = feedbackService.getFeedback(id);
|
if (feedback == null) {
|
return success(null);
|
}
|
return success(buildFeedbackRespVOList(ListUtil.of(feedback)).get(0));
|
}
|
|
@GetMapping("/page")
|
@Operation(summary = "获得生产报工分页")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
|
public CommonResult<PageResult<MesProFeedbackRespVO>> getFeedbackPage(@Valid MesProFeedbackPageReqVO pageReqVO) {
|
PageResult<MesProFeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
|
return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
|
}
|
|
@GetMapping("/list-by-task")
|
@Operation(summary = "按任务获得报工历史列表")
|
@Parameter(name = "taskId", description = "任务编号", required = true, example = "1024")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
|
public CommonResult<List<MesProFeedbackRespVO>> getFeedbackListByTask(@RequestParam("taskId") Long taskId) {
|
List<MesProFeedbackDO> list = feedbackService.getFeedbackListByTaskId(taskId);
|
return success(buildFeedbackRespVOList(list));
|
}
|
|
@GetMapping("/export-excel")
|
@Operation(summary = "导出生产报工 Excel")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:export')")
|
@ApiAccessLog(operateType = EXPORT)
|
public void exportFeedbackExcel(@Valid MesProFeedbackPageReqVO pageReqVO,
|
HttpServletResponse response) throws IOException {
|
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
List<MesProFeedbackDO> list = feedbackService.getFeedbackPage(pageReqVO).getList();
|
List<MesProFeedbackRespVO> voList = buildFeedbackRespVOList(list);
|
ExcelUtils.write(response, "生产报工.xls", "数据", MesProFeedbackRespVO.class, voList);
|
}
|
|
@PutMapping("/submit")
|
@Operation(summary = "提交报工")
|
@Parameter(name = "id", description = "编号", required = true)
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
|
public CommonResult<Boolean> submitFeedback(@RequestParam("id") Long id) {
|
feedbackService.submitFeedback(id);
|
return success(true);
|
}
|
|
@PutMapping("/reject")
|
@Operation(summary = "驳回报工")
|
@Parameter(name = "id", description = "编号", required = true)
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
|
public CommonResult<Boolean> rejectFeedback(@RequestParam("id") Long id) {
|
feedbackService.rejectFeedback(id);
|
return success(true);
|
}
|
|
@PutMapping("/approve")
|
@Operation(summary = "审批报工")
|
@Parameter(name = "id", description = "编号", required = true)
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
|
public CommonResult<Boolean> approveFeedback(@RequestParam("id") Long id) {
|
return success(feedbackService.approveFeedback(id));
|
}
|
|
// ==================== 拼接 VO ====================
|
|
@GetMapping("/trace/{id}")
|
@Operation(summary = "获得报工追溯信息", description = "报工 + 产出/产出明细 + 消耗/消耗明细 + IPQC检验")
|
@Parameter(name = "id", description = "报工编号", required = true, example = "1024")
|
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
|
public CommonResult<MesProFeedbackTraceRespVO> getFeedbackTrace(@PathVariable("id") Long id) {
|
MesProFeedbackDO feedback = feedbackService.getFeedback(id);
|
if (feedback == null) {
|
return success(null);
|
}
|
MesProFeedbackTraceRespVO trace = new MesProFeedbackTraceRespVO();
|
// 1. 报工明细（复用展示拼接，带工单/任务/工序/物料/报工人等显示名）
|
trace.setFeedback(buildFeedbackRespVOList(ListUtil.of(feedback)).get(0));
|
// 2. 生产产出 + 产出明细行（关键工序才有）
|
trace.setProductProduce(productProduceMapper.selectByFeedbackId(id));
|
trace.setProductProduceLines(productProduceLineMapper.selectListByFeedbackId(id));
|
// 3. 物料消耗 + 消耗明细行（倒冲工序才有）
|
MesWmItemConsumeDO itemConsume = itemConsumeMapper.selectByFeedbackId(id);
|
trace.setItemConsume(itemConsume);
|
if (itemConsume != null) {
|
trace.setItemConsumeLines(itemConsumeLineMapper.selectListByConsumeId(itemConsume.getId()));
|
}
|
// 4. IPQC 过程检验单（关键+需检验工序才有）
|
trace.setIpqcList(ipqcMapper.selectListBySourceDoc(MesBizTypeConstants.PRO_FEEDBACK, id));
|
return success(trace);
|
}
|
|
private List<MesProFeedbackRespVO> buildFeedbackRespVOList(List<MesProFeedbackDO> list) {
|
if (CollUtil.isEmpty(list)) {
|
return Collections.emptyList();
|
}
|
// 1.1 任务（获取 taskCode）
|
Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
|
convertSet(list, MesProFeedbackDO::getTaskId));
|
// 1.2 物料（直接从 DO.itemId）、计量单位（从 item.unitMeasureId）
|
Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
|
convertSet(list, MesProFeedbackDO::getItemId));
|
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
|
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
|
// 1.3 工单
|
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
|
convertSet(list, MesProFeedbackDO::getWorkOrderId));
|
// 1.4 工作站
|
Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
|
convertSet(list, MesProFeedbackDO::getWorkstationId));
|
// 1.5 工艺路线
|
Set<Long> routeIds = convertSet(list, MesProFeedbackDO::getRouteId);
|
Map<Long, MesProRouteDO> routeMap = routeService.getRouteMap(routeIds);
|
// 1.6 工序
|
Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
|
new ArrayList<>(convertSet(list, MesProFeedbackDO::getProcessId)));
|
// 1.7 工序的 checkFlag：批量查询后直接构建 routeId -> processId -> checkFlag 的双层 Map
|
List<MesProRouteProcessDO> allRouteProcesses = routeProcessService.getRouteProcessListByRouteIds(routeIds);
|
Map<Long, Map<Long, Boolean>> routeProcessCheckFlagMap = new HashMap<>();
|
for (MesProRouteProcessDO rp : allRouteProcesses) {
|
routeProcessCheckFlagMap
|
.computeIfAbsent(rp.getRouteId(), k -> new HashMap<>())
|
.put(rp.getProcessId(), Boolean.TRUE.equals(rp.getCheckFlag()));
|
}
|
// 1.8 报工人/审核人
|
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
|
convertSetByFlatMap(list, feedback ->
|
Stream.of(feedback.getFeedbackUserId(), feedback.getApproveUserId())));
|
|
// 2. 拼接 VO
|
return BeanUtils.toBean(list, MesProFeedbackRespVO.class, vo -> {
|
// 工作站
|
findAndThen(workstationMap, vo.getWorkstationId(), ws ->
|
vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName()));
|
// 工艺路线
|
findAndThen(routeMap, vo.getRouteId(), route ->
|
vo.setRouteCode(route.getCode()));
|
// 工序
|
findAndThen(processMap, vo.getProcessId(), process ->
|
vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
|
// checkFlag
|
findAndThen(routeProcessCheckFlagMap, vo.getRouteId(), processCheckMap ->
|
findAndThen(processCheckMap, vo.getProcessId(), vo::setCheckFlag));
|
// 工单
|
findAndThen(workOrderMap, vo.getWorkOrderId(), wo ->
|
vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()));
|
// 任务
|
findAndThen(taskMap, vo.getTaskId(), task ->
|
vo.setTaskCode(task.getCode()));
|
// 物料 → 单位
|
findAndThen(itemMap, vo.getItemId(), item -> {
|
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification())
|
.setUnitMeasureId(item.getUnitMeasureId());
|
findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit ->
|
vo.setUnitMeasureName(unit.getName()));
|
});
|
// 报工人、审核人
|
findAndThen(userMap, vo.getFeedbackUserId(), user ->
|
vo.setFeedbackUserNickname(user.getNickname()));
|
findAndThen(userMap, vo.getApproveUserId(), user ->
|
vo.setApproveUserNickname(user.getNickname()));
|
});
|
}
|
|
}
|
