✨ feat(mes): 添加工单、工作站、任务和客户信息字段

YunaiV
1 parent 0b8834cd
Showing 7 changed files with 110 additions and 14 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateDetailServiceImpl.java
yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -5,12 +5,18 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
 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.vendor.MesMdVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
 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.vendor.MesMdVendorService;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
 import cn.iocoder.yudao.module.mes.service.qc.pendinginspect.MesQcPendingInspectService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,6 +48,12 @@ public class MesQcPendingInspectController {
     private MesMdUnitMeasureService unitMeasureService;
     @Resource
     private MesMdVendorService vendorService;
+    @Resource
+    private MesMdClientService clientService;
+    @Resource
+    private MesMdWorkstationService workstationService;
+    @Resource
+    private MesProTaskService taskService;
     @GetMapping("/page")
     @Operation(summary = "获得待检任务分页")
@@ -49,7 +61,7 @@ public class MesQcPendingInspectController {
     public CommonResult<PageResult<MesQcPendingInspectRespVO>> getPendingInspectPage(
             @Valid MesQcPendingInspectPageReqVO pageReqVO) {
         PageResult<MesQcPendingInspectRespVO> pageResult = pendingInspectService.getPendingInspectPage(pageReqVO);
-        // 拼接 VO：物料、供应商、计量单位
+        // 拼接 VO：物料、供应商、客户、工作站、任务等
         buildPendingInspectRespVOList(pageResult.getList());
         return success(pageResult);
     }
@@ -66,9 +78,18 @@ public class MesQcPendingInspectController {
         // 批量查询计量单位（通过物料的 unitMeasureId）
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
-        // 批量查询供应商
+        // 批量查询供应商（IQC 场景）
         Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
                 convertSet(list, MesQcPendingInspectRespVO::getVendorId));
+        // 批量查询客户（OQC/RQC 场景）
+        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+                convertSet(list, MesQcPendingInspectRespVO::getClientId));
+        // 批量查询工作站（IPQC/RQC 场景）
+        Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
+                convertSet(list, MesQcPendingInspectRespVO::getWorkstationId));
+        // 批量查询任务（IPQC 场景）
+        Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
+                convertSet(list, MesQcPendingInspectRespVO::getTaskId));
         // 拼装
         list.forEach(vo -> {
             findAndThen(itemMap, vo.getItemId(), item -> {
@@ -76,8 +97,11 @@ public class MesQcPendingInspectController {
                 findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unit -> vo.setUnitName(unit.getName()));
             });
-            findAndThen(vendorMap, vo.getVendorId(),
-                    vendor -> vo.setVendorName(vendor.getName()));
+            findAndThen(vendorMap, vo.getVendorId(), vendor -> vo.setVendorName(vendor.getName()));
+            findAndThen(clientMap, vo.getClientId(), client -> vo.setClientName(client.getName()));
+            findAndThen(workstationMap, vo.getWorkstationId(),
+                    workstation -> vo.setWorkstationName(workstation.getName()));
+            findAndThen(taskMap, vo.getTaskId(), task -> vo.setTaskCode(task.getCode()));
         });
     }
@@ -55,9 +55,34 @@ public class MesQcPendingInspectRespVO {
     @Schema(description = "供应商名称", example = "供应商A")
     private String vendorName;
+    // ========== 工单/工作站/任务（IPQC/RQC 场景） ==========
+
+    @Schema(description = "生产工单 ID", example = "10")
+    private Long workOrderId;
+
+    @Schema(description = "工作站 ID", example = "20")
+    private Long workstationId;
+
+    @Schema(description = "工作站名称", example = "工作站A")
+    private String workstationName;
+
+    @Schema(description = "生产任务 ID", example = "30")
+    private Long taskId;
+
+    @Schema(description = "生产任务编码", example = "TASK2025001")
+    private String taskCode;
+
+    // ========== 客户（OQC/RQC 场景） ==========
+
+    @Schema(description = "客户 ID", example = "40")
+    private Long clientId;
+
+    @Schema(description = "客户名称", example = "客户A")
+    private String clientName;
+
     // ========== 时间 ==========
     @Schema(description = "记录时间")
     private LocalDateTime recordTime;
 -}
+}
 \ No newline at end of file
@@ -282,7 +282,7 @@ public interface ErrorCodeConstants {
     ErrorCode QC_IQC_CODE_DUPLICATE = new ErrorCode(1_040_603_001, "来料检验单编号已存在");
     ErrorCode QC_IQC_NOT_PREPARE = new ErrorCode(1_040_603_002, "只有草稿状态的检验单才可操作");
     ErrorCode QC_IQC_QUANTITY_MISMATCH = new ErrorCode(1_040_603_004, "合格品与不合格品数量之和须等于检测数量");
-    ErrorCode QC_IQC_NO_TEMPLATE = new ErrorCode(1_040_603_005, "当前产品未配置 IQC 检测模板");
+    ErrorCode QC_NO_TEMPLATE = new ErrorCode(1_040_603_005, "当前产品未配置检测模板");
     ErrorCode QC_IQC_SOURCE_DOC_PARAMS_MISSING = new ErrorCode(1_040_603_006, "来源单据类型非空时，来源单据 ID 和来源单据行 ID 不能为空");
     ErrorCode QC_IQC_CHECK_RESULT_EMPTY = new ErrorCode(1_040_603_007, "完成检验单前，检测结果必须填写");
     // ========== MES 质量管理-来料检验行（1-040-603-100） ==========
@@ -163,6 +163,9 @@ public class MesProTaskServiceImpl implements MesProTaskService {
     @Override
     public List<MesProTaskDO> getTaskList(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
         return taskMapper.selectByIds(ids);
     }
@@ -163,7 +163,7 @@ public class MesQcTemplateDetailServiceImpl implements MesQcTemplateDetailServic
         // 1. 查出 itemId 关联的所有 templateId
         List<MesQcTemplateItemDO> templateItems = templateItemMapper.selectListByItemId(itemId);
         if (CollUtil.isEmpty(templateItems)) {
-            throw exception(QC_IQC_NO_TEMPLATE);
+            throw exception(QC_NO_TEMPLATE);
         }
         // 2. 筛选 types 包含 qcType 的模板
         List<MesQcTemplateDO> templates = templateMapper.selectByIds(
@@ -171,7 +171,7 @@ public class MesQcTemplateDetailServiceImpl implements MesQcTemplateDetailServic
         MesQcTemplateDO matchedTemplate = findFirst(templates,
                 t -> CollUtil.contains(t.getTypes(), qcType));
         if (matchedTemplate == null) {
-            throw exception(QC_IQC_NO_TEMPLATE);
+            throw exception(QC_NO_TEMPLATE);
         }
         // 3. 返回对应的 templateItem
         return findFirst(templateItems,
@@ -9,6 +9,7 @@
         3. 生产报工（IPQC）：状态=待检验(3)
         4. 销售出库单（OQC）：行的 oqc_check=1 且 oqc_id IS NULL
         5. 生产退料单（RQC）：状态=待检验(5)，行的 qc_flag=1 且 quality_status=0（待检）
+        6. 销售退货单（RQC）：状态=待执行(10)，行的 quality_status=0（待检）
     -->
     <select id="selectQcPendingPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO">
         SELECT * FROM (
@@ -22,7 +23,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
                 l.item_id AS itemId,
                 l.arrival_quantity AS quantity,
-                n.vendor_id AS vendorId
+                n.vendor_id AS vendorId,
+                NULL AS workOrderId,
+                NULL AS workstationId,
+                NULL AS taskId,
+                NULL AS clientId
             FROM mes_wm_arrival_notice n
                 JOIN mes_wm_arrival_notice_line l ON n.id = l.notice_id
             WHERE n.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum@PENDING_QC.status}
@@ -43,7 +48,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
                 rl.item_id AS itemId,
                 rl.quantity AS quantity,
-                r.vendor_id AS vendorId
+                r.vendor_id AS vendorId,
+                NULL AS workOrderId,
+                NULL AS workstationId,
+                NULL AS taskId,
+                NULL AS clientId
             FROM mes_wm_outsource_receipt r
                 JOIN mes_wm_outsource_receipt_line rl ON r.id = rl.receipt_id
             WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceReceiptStatusEnum@CONFIRMED.status}
@@ -64,7 +73,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
                 f.item_id AS itemId,
                 f.uncheck_quantity AS quantity,
-                NULL AS vendorId
+                NULL AS vendorId,
+                f.work_order_id AS workOrderId,
+                f.workstation_id AS workstationId,
+                f.task_id AS taskId,
+                NULL AS clientId
             FROM mes_pro_feedback f
             WHERE f.status = ${@cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum@UNCHECK.status}
               AND f.deleted = 0
@@ -81,7 +94,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
                 sl.item_id AS itemId,
                 sl.quantity AS quantity,
-                NULL AS vendorId
+                NULL AS vendorId,
+                NULL AS workOrderId,
+                NULL AS workstationId,
+                NULL AS taskId,
+                s.client_id AS clientId
             FROM mes_wm_product_sales s
                 JOIN mes_wm_product_sales_line sl ON s.id = sl.sales_id
             WHERE sl.oqc_check = 1
@@ -101,7 +118,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
                 ril.item_id AS itemId,
                 ril.quantity AS quantity,
-                NULL AS vendorId
+                NULL AS vendorId,
+                ri.work_order_id AS workOrderId,
+                ri.workstation_id AS workstationId,
+                NULL AS taskId,
+                NULL AS clientId
             FROM mes_wm_return_issue ri
                 JOIN mes_wm_return_issue_line ril ON ri.id = ril.issue_id
             WHERE ri.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum@CONFIRMED.status}
@@ -109,6 +130,30 @@
               AND ril.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
               AND ri.deleted = 0
               AND ril.deleted = 0
+
+            UNION ALL
+
+            <!-- 6. RQC 来源：销售退货单（待执行(APPROVING)，行的 quality_status=0） -->
+            SELECT
+                r.id AS sourceDocId,
+                ${@cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants@WM_RETURN_SALES} AS sourceDocType,
+                r.code AS sourceDocCode,
+                rl.id AS sourceLineId,
+                r.return_date AS recordTime,
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
+                rl.item_id AS itemId,
+                rl.quantity AS quantity,
+                NULL AS vendorId,
+                NULL AS workOrderId,
+                NULL AS workstationId,
+                NULL AS taskId,
+                r.client_id AS clientId
+            FROM mes_wm_return_sales r
+                JOIN mes_wm_return_sales_line rl ON r.id = rl.return_id
+            WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum@APPROVING.status}
+              AND rl.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
+              AND r.deleted = 0
+              AND rl.deleted = 0
         ) t
         <where>
             <if test="sourceDocCode != null and sourceDocCode != ''">
@@ -350,7 +350,6 @@ CREATE TABLE IF NOT EXISTS &quot;mes_qc_rqc&quot; (
     "template_id" bigint NOT NULL,
     "source_doc_id" bigint DEFAULT NULL,
     "source_doc_type" int DEFAULT NULL,
-    "source_doc_code" varchar(64) DEFAULT NULL,
     "source_line_id" bigint DEFAULT NULL,
     "type" int DEFAULT NULL,
     "item_id" bigint NOT NULL,