From e09f103259fa602382bb5ce2a03361a6397af46a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 15 十月 2026 11:49:15 +0800
Subject: [PATCH] feat(mes): 优化MES模块生产调度与数据管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 91c41ed..56746f2 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -147,7 +148,11 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
- oqcMapper.updateById(updateObj);
+ // 缂栬緫鏃跺厑璁告竻绌哄鎴凤紱瀹屾垚妫�楠岀瓑灞�閮ㄦ洿鏂颁粛淇濈暀鍘熷鎴枫��
+ updateObj.setClientId(null);
+ oqcMapper.update(updateObj, new LambdaUpdateWrapper<MesQcOqcDO>()
+ .eq(MesQcOqcDO::getId, updateReqVO.getId())
+ .set(MesQcOqcDO::getClientId, updateReqVO.getClientId()));
}
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
@@ -386,7 +391,11 @@
oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
- oqc.setOutDate(java.time.LocalDateTime.now());
+ MesWmProductSalesDO sales = productSalesService.getProductSales(salesId);
+ java.time.LocalDateTime businessDate = sales != null && sales.getSalesDate() != null
+ ? sales.getSalesDate() : java.time.LocalDateTime.now();
+ oqc.setOutDate(businessDate);
+ oqc.setInspectDate(businessDate);
oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
oqcMapper.insert(oqc);
@@ -485,7 +494,7 @@
reqVO.setName(row.getName().trim());
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
Long clientId = qcImportHelper.resolveClientId(row.getClientName());
- qcImportHelper.validateClientPermission(clientId, row.getClientName().trim());
+ qcImportHelper.validateClientPermission(clientId, StrUtil.trimToEmpty(row.getClientName()));
reqVO.setClientId(clientId);
reqVO.setBatchCode(StrUtil.trimToNull(row.getBatchCode()));
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
--
Gitblit v1.9.3