From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
index 66740af..c08b644 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityService.java
@@ -14,19 +14,46 @@
 
     java.util.Map<String, Object> resolveScan(String code);
     java.util.Map<String, Object> resolveScan(String code, String scanType);
+    java.util.Map<String, Object> resolveScan(String code, String scanType, Integer qcLine);
     java.util.Map<String, Object> submitGroup(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityGroupSubmitReqVO reqVO);
     void retest(Long id, cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO reqVO);
     void retestBatch(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRetestReqVO reqVO);
     java.util.Map<String, Object> resolveRetestScope(String code, String scanType);
+    java.util.Map<String, Object> resolveRetestScope(String code, String scanType, Integer qcLine);
     java.util.Map<String, Object> retestScope(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityScopeRetestReqVO reqVO);
     void processApprove(Long id, boolean approved, String opinion);
     void companyApprove(Long id, boolean approved, String opinion);
     void processApproveBatch(List<Long> ids, boolean approved, String opinion);
     void companyApproveBatch(List<Long> ids, boolean approved, String opinion);
 
+    /** 瑙f瀽缁忛攢鍟嗛��璐у崟鐨勫緟璐ㄦ淇℃伅 */
+    java.util.Map<String, Object> resolveReturnQuality(Long returnSalesId);
+    /** 鎻愪氦缁忛攢鍟嗛��璐ц川妫� */
+    Long submitReturnQuality(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedReturnQualitySubmitReqVO reqVO);
+    /** 缁忛攢鍟嗛��璐ц川妫�閿�鍞儴棰嗗瀹℃壒 */
+    void returnApprove(Long id, boolean approved, String opinion);
+    /** 绠$悊鍛樺湪娴佺▼瀹氫箟鍙戝竷鍚庯紝瀵瑰皻鏈敓鎴� BPM 瀹炰緥鐨勮褰曢噸璇曞彂璧峰鎵广�� */
+    void retryBpmProcess(Long id);
+
+    /** BPM 鍥炶皟锛氭湰绾块瀵煎鎵瑰畬鎴� */
+    void handleLineProcessResult(String processInstanceId, Integer qcLine, String batchCode, boolean approved, String reason);
+    /** BPM 鍥炶皟锛氬叕鍙歌川妫�瀹℃壒瀹屾垚锛坆usinessKey 涓虹敓浜ф壒娆″彿锛屽巻鍙叉暟鎹彲鑳戒负琚嬬爜锛� */
+    void handleCompanyProcessResult(String processInstanceId, String businessKey, boolean approved, String reason);
+    /** BPM 鍥炶皟锛氱粡閿�鍟嗛��璐ч攢鍞儴瀹℃壒瀹屾垚 */
+    void handleReturnProcessResult(String processInstanceId, Long returnSalesId, boolean approved, String reason);
+
     PageResult<MesQcSeedQualityDO> getQualityPage(MesQcSeedQualityPageReqVO reqVO);
 
     /**
+     * 鎸夌敓浜ф壒娆″垎缁勫垎椤垫煡璇㈣川妫�璁板綍姹囨�伙紝鏈粦瀹氭壒娆$殑璁板綍褰掑叆绌烘壒娆$粍銆�
+     *
+     * @param reqVO 鏌ヨ鏉′欢锛堜笌鏄庣粏鍒嗛〉涓�鑷达級
+     * @return 鎵规鍒嗙粍鍒嗛〉缁撴灉
+     */
+    PageResult<cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRespVO>
+            getQualityBatchPage(MesQcSeedQualityPageReqVO reqVO);
+
+    /**
      * 鏍规嵁鎵规鍙锋煡璇㈣川妫�璁板綍锛堟寜妫�楠屾椂闂村�掑簭锛屽彇鏈�鏂帮級锛岀敤浜庡叕寮�婧簮銆�
      * 绉嶅瓙璐ㄦ琛ㄦ湭鍒濆鍖栨椂杩斿洖绌哄垪琛紙瀹归敊锛屼笉褰卞搷杩芥函锛夈��
      *

--
Gitblit v1.9.3