From 1ab2b329a40decba8ff7eefbeb158ff259aceb6d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 七月 2026 15:23:34 +0800
Subject: [PATCH] 追溯+分类接口
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index 20fbfb9..6f394e9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -41,6 +41,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
import java.io.IOException;
import java.math.BigDecimal;
@@ -74,6 +77,8 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private MesProRouteProcessService routeProcessService;
+ @Resource
+ private MesProFeedbackService feedbackService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -116,6 +121,14 @@
@PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getTaskPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getTaskPage(pageReqVO);
+ return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/pending-feedback-page")
+ @Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
+ public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
}
@@ -232,9 +245,29 @@
.put(rp.getProcessId(), Boolean.TRUE.equals(rp.getCheckFlag()));
}
}
+ // 鎶ュ伐鍦ㄩ�旈噺锛氭寜浠诲姟鑱氬悎 feedbackQuantity锛堣崏绋�/瀹℃壒涓�/寰呮楠� = 鍦ㄩ�旓紱宸插畬鎴� = 宸插鎵癸級
+ List<MesProFeedbackDO> taskFeedbacks = feedbackService.getFeedbackListByTaskIds(
+ convertSet(list, MesProTaskDO::getId));
+ Map<Long, BigDecimal> inTransitMap = new HashMap<>();
+ for (MesProFeedbackDO fb : taskFeedbacks) {
+ BigDecimal fbQty = fb.getFeedbackQuantity() == null ? BigDecimal.ZERO : fb.getFeedbackQuantity();
+ if (!ObjUtil.equal(fb.getStatus(), MesProFeedbackStatusEnum.FINISHED.getStatus())) {
+ inTransitMap.merge(fb.getTaskId(), fbQty, BigDecimal::add);
+ }
+ }
// 鎷兼帴 VO
return convertList(list, task -> {
MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
+ // 寰呮姤宸ユ暟閲� = 鎺掍骇鏁伴噺 - 宸茬敓浜ф暟閲忥紱鎶ュ伐瀹屾垚鐜� = 宸茬敓浜� / 鎺掍骇 脳 100
+ BigDecimal quantity = task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity();
+ BigDecimal produced = task.getProducedQuantity() == null ? BigDecimal.ZERO : task.getProducedQuantity();
+ vo.setPendingQuantity(quantity.subtract(produced));
+ vo.setFeedbackRate(quantity.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO
+ : produced.multiply(new BigDecimal("100")).divide(quantity, 2, RoundingMode.HALF_UP));
+ // 鍦ㄩ�旀姤宸ラ噺锛堣崏绋�/瀹℃壒涓�/寰呮楠岋級+ 鍙姤宸ユ暟閲� = 鎺掍骇 - 宸茬敓浜� - 鍦ㄩ��
+ BigDecimal inTransit = inTransitMap.getOrDefault(task.getId(), BigDecimal.ZERO);
+ vo.setInTransitQuantity(inTransit);
+ vo.setReportableQuantity(quantity.subtract(produced).subtract(inTransit).max(BigDecimal.ZERO));
findAndThen(workOrderMap, task.getWorkOrderId(), wo ->
vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setRequestDate(wo.getRequestDate()));
findAndThen(workstationMap, task.getWorkstationId(), ws ->
--
Gitblit v1.9.3