From ffca46b39d25439a06a27cafda2ec523a3fb67cf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:02 +0800
Subject: [PATCH] feat(mes): 增加盘号字段支持和优化报工质检流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index dd30de9..c0ce9a5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -8,6 +8,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
@@ -67,6 +68,9 @@
@Resource
private MesQcOqcMapper oqcMapper;
+
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@Resource
private MesQcTemplateItemService templateItemService;
@@ -129,6 +133,10 @@
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+ if (createReqVO.getSourceLineId() != null) {
+ oqc.setReelNo(resolveSalesReelNo(productSalesLineService
+ .validateProductSalesLineExists(createReqVO.getSourceLineId())));
+ }
oqcMapper.insert(oqc);
// 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
@@ -139,7 +147,7 @@
@Override
public void updateOqc(MesQcOqcSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateOqcStatusPrepare(updateReqVO.getId());
+ MesQcOqcDO existingOqc = validateOqcStatusPrepare(updateReqVO.getId());
// 1.2 鏍￠獙鏁版嵁
validateOqcSaveData(updateReqVO);
@@ -148,6 +156,7 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
+ if (existingOqc.getSourceLineId() != null) updateObj.setReelNo(null); // 鏉ユ簮鐩樺彿淇濇寔蹇収
// 缂栬緫鏃跺厑璁告竻绌哄鎴凤紱瀹屾垚妫�楠岀瓑灞�閮ㄦ洿鏂颁粛淇濈暀鍘熷鎴枫��
updateObj.setClientId(null);
oqcMapper.update(updateObj, new LambdaUpdateWrapper<MesQcOqcDO>()
@@ -385,6 +394,7 @@
oqc.setClientId(clientId);
oqc.setItemId(line.getItemId());
oqc.setBatchCode(line.getBatchCode());
+ oqc.setReelNo(resolveSalesReelNo(line));
oqc.setOutQuantity(line.getQuantity());
oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
@@ -403,6 +413,12 @@
return oqc.getId();
}
+ private String resolveSalesReelNo(MesWmProductSalesLineDO line) {
+ if (line == null || line.getSaleOrderItemId() == null) return null;
+ var item = saleOrderApi.getSaleOrderItem(line.getSaleOrderItemId()).getCheckedData();
+ return item == null ? null : item.getReelNo();
+ }
+
/**
* 鑾峰彇鐗╂枡淇℃伅锛堢紪鐮�+鍚嶇О锛�
*/
--
Gitblit v1.9.3