From 29237e8dd94c4d3cdfb0eb48bca0de7dc68d768e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 11:27:55 +0800
Subject: [PATCH] feat(mes): 出货检验单客户改为选填，未关联客户的单据不受客户数据权限限制
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 201 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 191 insertions(+), 10 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 30bf336..d48d74e 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
@@ -2,12 +2,21 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+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;
+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;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
@@ -17,6 +26,7 @@
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
@@ -26,6 +36,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -35,7 +46,11 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -55,6 +70,8 @@
@Resource
private MesQcTemplateItemService templateItemService;
+ @Resource
+ private MesQcTemplateService templateService;
@Resource
private MesQcOqcLineService oqcLineService;
@Resource
@@ -81,6 +98,9 @@
@Lazy
private MesQcNcrService ncrService;
+ @Resource
+ private MesQcImportHelper qcImportHelper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOqc(MesQcOqcSaveReqVO createReqVO) {
@@ -92,19 +112,28 @@
// 1.3 鏍规嵁浜у搧 + OQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
createReqVO.getItemId(), MesQcTypeEnum.OQC.getType(), null, null);
+ Long templateId;
if (CollUtil.isEmpty(templateItems)) {
- throw exception(QC_NO_TEMPLATE);
- }
- MesQcTemplateItemDO templateItem = templateItems.get(0);
- if (createReqVO.getTemplateId() != null) {
- templateItem = templateItems.stream()
- .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
- .findFirst().orElse(null);
- if (templateItem == null) {
- throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
+ // 浜у搧鐗╂枡鏈粦瀹氬嚭璐ф楠屾柟妗堬細鏄惧紡鎸囧畾鐨勬柟妗堟敼涓烘牎楠屾柟妗堟湰韬紙瀛樺湪銆佸凡鍚敤銆佹娴嬬绫诲惈鍑鸿揣妫�楠岋級
+ if (createReqVO.getTemplateId() == null) {
+ throw new ServiceException(QC_NO_TEMPLATE.getCode(), buildNoTemplateMessage(createReqVO.getItemId()));
}
+ templateId = validateTemplateUsable(createReqVO.getTemplateId());
+ } else {
+ MesQcTemplateItemDO templateItem = templateItems.get(0);
+ if (createReqVO.getTemplateId() != null) {
+ templateItem = templateItems.stream()
+ .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
+ .findFirst().orElse(null);
+ if (templateItem == null) { // 鎸囧畾浜嗘柟妗堜絾涓嶅湪璇ョ墿鏂欏凡缁戝畾鐨勫尮閰嶅垪琛ㄤ腑锛屾嫆缁�
+ throw new ServiceException(QC_NO_TEMPLATE.getCode(), StrUtil.format(
+ "鎵�閫夎川妫�鏂规涓嶅湪浜у搧鐗╂枡[{}]宸茬粦瀹氱殑鍑鸿揣妫�楠屾柟妗堣寖鍥村唴锛氳閲嶆柊閫夋嫨璐ㄦ鏂规锛�"
+ + "鎴栧厛鍦ㄣ�愯川閲忕鐞�-璐ㄦ鏂规銆戜腑涓鸿鐗╂枡缁戝畾鎵�閫夋柟妗堝悗閲嶈瘯銆�",
+ describeItem(createReqVO.getItemId())));
+ }
+ }
+ templateId = templateItem.getTemplateId();
}
- Long templateId = templateItem.getTemplateId();
// 2. 鎻掑叆涓昏〃
MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class)
@@ -131,6 +160,43 @@
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
oqcMapper.updateById(updateObj);
+ }
+
+ /**
+ * 鏍￠獙璐ㄦ鏂规鏈韩鍙敤锛氬瓨鍦ㄣ�佸凡鍚敤銆佹娴嬬绫诲寘鍚嚭璐ф楠岋紝杩斿洖鏂规缂栧彿
+ */
+ private Long validateTemplateUsable(Long templateId) {
+ MesQcTemplateDO template = templateService.getTemplate(templateId);
+ if (template == null) {
+ throw new ServiceException(QC_TEMPLATE_NOT_EXISTS.getCode(), StrUtil.format(
+ "鎵�閫夎川妫�鏂规涓嶅瓨鍦紙ID={}锛夛紝鍙兘宸茶鍒犻櫎锛岃鍒锋柊鍚庨噸鏂伴�夋嫨璐ㄦ鏂规", templateId));
+ }
+ if (!CommonStatusEnum.isEnable(template.getStatus())) {
+ throw exception(QC_OQC_TEMPLATE_IS_DISABLE, template.getName());
+ }
+ if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.OQC.getType())) {
+ throw exception(QC_OQC_TEMPLATE_TYPE_NOT_MATCH, template.getName());
+ }
+ return template.getId();
+ }
+
+ /**
+ * 鏋勫缓銆屾棤鍙敤璐ㄦ鏂规銆嶇殑鎻愮ず锛氱粰鍑虹墿鏂欏悕绉颁笌涓嬩竴姝ュ姩浣�
+ */
+ private String buildNoTemplateMessage(Long itemId) {
+ return StrUtil.format("浜у搧鐗╂枡[{}]鏈粦瀹氥�屽嚭璐ф楠屻�嶈川妫�鏂规锛屼笖鏈�夋嫨璐ㄦ鏂规锛氳鍏堥�夋嫨璐ㄦ鏂规鍚庨噸璇曪紝"
+ + "鎴栧湪銆愯川閲忕鐞�-璐ㄦ鏂规銆戜腑涓鸿鐗╂枡缁戝畾妫�娴嬬绫诲寘鍚嚭璐ф楠岀殑鏂规銆�", describeItem(itemId));
+ }
+
+ /**
+ * 鎻忚堪鐗╂枡锛岀敤浜庡紓甯告彁绀猴細浼樺厛缁欏嚭銆岀紪鐮� 鍚嶇О銆嶏紝鏌ヤ笉鍒版椂鍥為��涓虹墿鏂欑紪鍙�
+ */
+ private String describeItem(Long itemId) {
+ if (itemId == null) {
+ return "鏈�夋嫨";
+ }
+ MdmItemRespDTO item = mdmItemApi.getItem(itemId).getCheckedData();
+ return item != null ? item.getCode() + " " + item.getName() : "鐗╂枡缂栧彿 ID=" + itemId;
}
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
@@ -397,4 +463,119 @@
return "鐗╂枡ID:" + itemId;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesQcImportRespVO importOqcList(List<MesQcOqcImportExcelVO> importList) {
+ MesQcImportRespVO respVO = MesQcImportRespVO.builder()
+ .createList(new ArrayList<>()).failureList(new LinkedHashMap<>()).build();
+ if (CollUtil.isEmpty(importList)) {
+ return respVO;
+ }
+ qcImportHelper.startImport();
+ Map<String, Integer> firstRowNoByKey = new HashMap<>();
+ for (int i = 0; i < importList.size(); i++) {
+ MesQcOqcImportExcelVO row = importList.get(i);
+ if (isImportRowEmpty(row)) {
+ continue; // 璺宠繃绌鸿
+ }
+ String label = StrUtil.isNotBlank(row.getCode()) ? "妫�楠屽崟缂栧彿 " + row.getCode().trim()
+ : "绗� " + (i + 2) + " 琛�";
+ String importKey = buildImportKey(row);
+ try {
+ Integer firstRowNo = firstRowNoByKey.get(importKey);
+ if (firstRowNo != null) {
+ throw MesQcImportHelper.duplicateRowException(firstRowNo, buildImportKeyDesc(row));
+ }
+ respVO.getCreateList().add(createOqcByImport(row));
+ firstRowNoByKey.putIfAbsent(importKey, i + 2);
+ } catch (Exception ex) {
+ respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
+ }
+ }
+ return respVO;
+ }
+
+ private boolean isImportRowEmpty(MesQcOqcImportExcelVO row) {
+ return row == null || (StrUtil.isBlank(row.getCode()) && StrUtil.isBlank(row.getName())
+ && StrUtil.isBlank(row.getItemCode()) && StrUtil.isBlank(row.getClientName())
+ && StrUtil.isBlank(row.getBatchCode()) && StrUtil.isBlank(row.getTemplateName())
+ && row.getOutQuantity() == null && row.getCheckQuantity() == null
+ && row.getQualifiedQuantity() == null && row.getUnqualifiedQuantity() == null
+ && StrUtil.isBlank(row.getCheckResult()) && StrUtil.isBlank(row.getInspectorName())
+ && StrUtil.isBlank(row.getInspectDate()) && StrUtil.isBlank(row.getOutDate())
+ && StrUtil.isBlank(row.getRemark()));
+ }
+
+ /**
+ * 渚濇嵁瀵煎叆琛屽垱寤轰竴寮犲嚭璐ф楠屽崟锛氱姸鎬佷负銆屽緟妫�楠屻�嶏紝妫�楠岃鐢辫川妫�鏂规鑷姩鐢熸垚
+ *
+ * @return 妫�楠屽崟缂栧彿
+ */
+ private String createOqcByImport(MesQcOqcImportExcelVO row) {
+ MesQcOqcSaveReqVO reqVO = new MesQcOqcSaveReqVO();
+ // 1. 妫�楠屽崟缂栧彿锛氬～鍐欏垯浣跨敤锛岀暀绌鸿嚜鍔ㄧ敓鎴�
+ String code = StrUtil.isNotBlank(row.getCode()) ? row.getCode().trim()
+ : qcImportHelper.generateCode(MesMdAutoCodeRuleCodeEnum.QC_OQC_CODE.getCode());
+ if (oqcMapper.selectByCode(code) != null) {
+ throw new IllegalArgumentException("妫�楠屽崟缂栧彿宸插瓨鍦細" + code
+ + "銆傝淇敼妯℃澘涓殑銆屾楠屽崟缂栧彿銆嶏紝鎴栧厛鍦ㄧ郴缁熶腑鍒犻櫎璇ョ紪鍙风殑妫�楠屽崟鍚庨噸鏂板鍏�");
+ }
+ reqVO.setCode(code);
+ // 2. 鍚嶇О銆佺墿鏂欍�佸鎴枫�佹壒娆°�佽川妫�鏂规
+ if (StrUtil.isBlank(row.getName())) {
+ throw new IllegalArgumentException("妫�楠屽崟鍚嶇О涓嶈兘涓虹┖锛氳濉啓妯℃澘涓琛岀殑銆屾楠屽崟鍚嶇О銆嶅垪");
+ }
+ reqVO.setName(row.getName().trim());
+ reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
+ Long clientId = qcImportHelper.resolveClientId(row.getClientName());
+ qcImportHelper.validateClientPermission(clientId, StrUtil.trimToNull(row.getClientName()));
+ reqVO.setClientId(clientId);
+ reqVO.setBatchCode(StrUtil.trimToNull(row.getBatchCode()));
+ reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
+ // 3. 鏁伴噺锛氬悎鏍煎搧 + 涓嶅悎鏍煎搧 蹇呴』绛変簬妫�娴嬫暟閲忥紙妫�娴嬫暟閲忕暀绌哄垯鑷姩鍚堣锛�
+ reqVO.setOutQuantity(qcImportHelper.resolveQuantity(row.getOutQuantity(), "鏈鍑鸿揣鏁伴噺", true));
+ BigDecimal qualified = qcImportHelper.resolveQuantity(row.getQualifiedQuantity(), "鍚堟牸鍝佹暟閲�", true);
+ BigDecimal unqualified = qcImportHelper.resolveQuantity(row.getUnqualifiedQuantity(), "涓嶅悎鏍煎搧鏁伴噺", true);
+ reqVO.setQualifiedQuantity(qualified);
+ reqVO.setUnqualifiedQuantity(unqualified);
+ reqVO.setCheckQuantity(qcImportHelper.resolveCheckQuantity(
+ row.getCheckQuantity(), qualified, unqualified, "妫�娴嬫暟閲�"));
+ // 4. 妫�楠屼俊鎭�
+ reqVO.setCheckResult(qcImportHelper.resolveDictValue(row.getCheckResult(),
+ DictTypeConstants.MES_QC_CHECK_RESULT, "妫�娴嬬粨鏋�", false));
+ reqVO.setInspectorUserId(qcImportHelper.resolveInspectorUserId(row.getInspectorName()));
+ reqVO.setInspectDate(qcImportHelper.parseRequiredDateTime(row.getInspectDate(), "妫�娴嬫棩鏈�"));
+ reqVO.setOutDate(qcImportHelper.parseRequiredDateTime(row.getOutDate(), "鍑鸿揣鏃ユ湡"));
+ reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
+ // 5. 鍘婚噸锛氬悓涓� 鐗╂枡 + 瀹㈡埛 + 鎵规鍙� + 鍑鸿揣鏃ユ湡 鐨勫嚭璐ф楠屽崟涓嶅彲閲嶅瀵煎叆
+ MesQcOqcDO duplicate = CollUtil.getFirst(oqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getClientId(),
+ reqVO.getBatchCode(), reqVO.getOutDate()));
+ if (duplicate != null) {
+ throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "鍑鸿揣妫�楠屽崟",
+ duplicate.getCode(), "璐ㄩ噺绠＄悊-鍑鸿揣妫�楠�");
+ }
+ // 6. 澶嶇敤鍒涘缓閫昏緫锛氭牎楠岀墿鏂�/浜哄憳銆佹寜鐗╂枡鍖归厤璐ㄦ鏂规銆佺敓鎴愭楠岃
+ try {
+ createOqc(reqVO);
+ } catch (ServiceException ex) {
+ MesQcImportHelper.rethrowTemplateError(ex, row.getItemCode(), "鍑鸿揣妫�楠�(OQC)");
+ }
+ return code;
+ }
+
+ /**
+ * 瀵煎叆鍘婚噸閿細鍚屼竴 鐗╂枡 + 瀹㈡埛 + 鎵规鍙� + 鍑鸿揣鏃ユ湡 瑙嗕负鍚屼竴鎵瑰嚭璐ф楠屾暟鎹�
+ */
+ private String buildImportKey(MesQcOqcImportExcelVO row) {
+ return String.join("|", StrUtil.trimToEmpty(row.getItemCode()), StrUtil.trimToEmpty(row.getClientName()),
+ StrUtil.trimToEmpty(row.getBatchCode()), StrUtil.trimToEmpty(row.getOutDate()));
+ }
+
+ private String buildImportKeyDesc(MesQcOqcImportExcelVO row) {
+ return "鐗╂枡[" + MesQcImportHelper.describeImportValue(row.getItemCode())
+ + "]銆佸鎴穂" + MesQcImportHelper.describeImportValue(row.getClientName())
+ + "]銆佹壒娆″彿[" + MesQcImportHelper.describeImportValue(row.getBatchCode())
+ + "]銆佸嚭璐ф棩鏈焄" + MesQcImportHelper.describeImportValue(row.getOutDate()) + "]";
+ }
+
}
--
Gitblit v1.9.3