From 2efc05d570d23d86b02b6fd8f73491b3d520bde0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 10:47:31 +0800
Subject: [PATCH] fix(mes-dv): 设备模块列表查询补充按创建时间降序排序
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
index b62ec2d..fc6a153 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -151,11 +151,18 @@
}
private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
+ // 绌哄瓧绗︿覆涔熼渶瑕佸啓鍏ワ紝浠ユ敮鎸佺紪杈戞椂娓呯┖鎵嬪～鍚嶇О銆�
+ if (reqVO.getVendorName() != null) {
+ reqVO.setVendorName(reqVO.getVendorName().trim());
+ }
// 鏍￠獙缂栧彿鍞竴
validateIqcCodeUnique(reqVO.getId(), reqVO.getCode());
// 鏍￠獙渚涘簲鍟嗗瓨鍦�
if (reqVO.getVendorId() != null) {
- srmSupplierApi.getSupplier(reqVO.getVendorId());
+ var supplier = srmSupplierApi.getSupplier(reqVO.getVendorId()).getCheckedData();
+ if (reqVO.getVendorName() == null && supplier != null) {
+ reqVO.setVendorName(supplier.getName());
+ }
}
// 鏍￠獙鐗╂枡瀛樺湪锛堜娇鐢� MDM 鐗╂枡锛�
if (reqVO.getItemId() != null) {
@@ -405,6 +412,12 @@
iqc.setSourceLineId(line.getId());
iqc.setSourceDocCode(noticeCode);
iqc.setVendorId(vendorId);
+ if (vendorId != null) {
+ var supplier = srmSupplierApi.getSupplier(vendorId).getCheckedData();
+ if (supplier != null) {
+ iqc.setVendorName(supplier.getName());
+ }
+ }
iqc.setItemId(line.getItemId());
iqc.setReceivedQuantity(line.getArrivalQuantity());
iqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
@@ -507,7 +520,7 @@
}
reqVO.setName(row.getName().trim());
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
- reqVO.setVendorId(qcImportHelper.resolveVendorId(row.getVendorName()));
+ reqVO.setVendorName(StrUtil.trimToEmpty(row.getVendorName()));
reqVO.setVendorBatch(StrUtil.trimToNull(row.getVendorBatch()));
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
// 3. 鏁伴噺锛氬悎鏍煎搧 + 涓嶅悎鏍煎搧 蹇呴』绛変簬鏈鎺ユ敹鏁伴噺锛堟帴鏀舵暟閲忕暀绌哄垯鑷姩鍚堣锛�
@@ -525,7 +538,7 @@
reqVO.setReceiveDate(qcImportHelper.parseRequiredDateTime(row.getReceiveDate(), "鏉ユ枡鏃ユ湡"));
reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
// 5. 鍘婚噸锛氬悓涓� 鐗╂枡 + 渚涘簲鍟� + 渚涘簲鍟嗘壒娆� + 鏉ユ枡鏃ユ湡 鐨勬潵鏂欐楠屽崟涓嶅彲閲嶅瀵煎叆
- MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorId(),
+ MesQcIqcDO duplicate = CollUtil.getFirst(iqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getVendorName(),
reqVO.getVendorBatch(), reqVO.getReceiveDate()));
if (duplicate != null) {
throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "鏉ユ枡妫�楠屽崟",
--
Gitblit v1.9.3