From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 152 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
index 6abef96..748207d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -3,12 +3,19 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO;
+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.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
@@ -46,7 +53,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;
@@ -114,6 +125,9 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private MesQcImportHelper qcImportHelper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -456,4 +470,142 @@
ipqcMapper.updateById(updateIpqc);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MesQcImportRespVO importIpqcList(List<MesQcIpqcImportExcelVO> 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++) {
+ MesQcIpqcImportExcelVO 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(createIpqcByImport(row));
+ firstRowNoByKey.putIfAbsent(importKey, i + 2);
+ } catch (Exception ex) {
+ respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
+ }
+ }
+ return respVO;
+ }
+
+ private boolean isImportRowEmpty(MesQcIpqcImportExcelVO row) {
+ return row == null || (StrUtil.isBlank(row.getCode()) && StrUtil.isBlank(row.getName())
+ && StrUtil.isBlank(row.getType()) && StrUtil.isBlank(row.getWorkOrderCode())
+ && StrUtil.isBlank(row.getWorkstationName()) && StrUtil.isBlank(row.getTemplateName())
+ && row.getCheckQuantity() == null && row.getQualifiedQuantity() == null
+ && row.getUnqualifiedQuantity() == null && row.getLaborScrapQuantity() == null
+ && row.getMaterialScrapQuantity() == null && row.getOtherScrapQuantity() == null
+ && StrUtil.isBlank(row.getCheckResult()) && StrUtil.isBlank(row.getInspectorName())
+ && StrUtil.isBlank(row.getInspectDate()) && StrUtil.isBlank(row.getRemark()));
+ }
+
+ /**
+ * 渚濇嵁瀵煎叆琛屽垱寤轰竴寮犺繃绋嬫楠屽崟锛氱墿鏂欑敱宸ュ崟鎺ㄥ锛岀姸鎬佷负銆屽緟妫�楠屻�嶏紝妫�楠岃鐢辫川妫�鏂规鑷姩鐢熸垚
+ *
+ * @return 妫�楠屽崟缂栧彿
+ */
+ private String createIpqcByImport(MesQcIpqcImportExcelVO row) {
+ MesQcIpqcSaveReqVO reqVO = new MesQcIpqcSaveReqVO();
+ // 1. 妫�楠屽崟缂栧彿锛氬～鍐欏垯浣跨敤锛岀暀绌鸿嚜鍔ㄧ敓鎴�
+ String code = StrUtil.isNotBlank(row.getCode()) ? row.getCode().trim()
+ : qcImportHelper.generateCode(MesMdAutoCodeRuleCodeEnum.QC_IPQC_CODE.getCode());
+ if (ipqcMapper.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.setType(qcImportHelper.resolveDictValue(row.getType(),
+ DictTypeConstants.MES_IPQC_TYPE, "妫�楠岀被鍨�", true));
+ reqVO.setWorkOrderId(qcImportHelper.resolveWorkOrderId(row.getWorkOrderCode()));
+ reqVO.setWorkstationId(qcImportHelper.resolveWorkstationId(row.getWorkstationName()));
+ reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
+ // 3. 鏁伴噺锛氬悎鏍煎搧 + 涓嶅悎鏍煎搧 蹇呴』绛変簬妫�娴嬫暟閲忥紙妫�娴嬫暟閲忕暀绌哄垯鑷姩鍚堣锛夛紱宸ュ簾/鏂欏簾/鍏朵粬搴熺暀绌烘寜 0
+ 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, "妫�娴嬫暟閲�"));
+ BigDecimal laborScrap = qcImportHelper.resolveQuantity(row.getLaborScrapQuantity(), "宸ュ簾鏁伴噺", false);
+ BigDecimal materialScrap = qcImportHelper.resolveQuantity(row.getMaterialScrapQuantity(), "鏂欏簾鏁伴噺", false);
+ BigDecimal otherScrap = qcImportHelper.resolveQuantity(row.getOtherScrapQuantity(), "鍏朵粬搴熷搧鏁伴噺", false);
+ laborScrap = laborScrap != null ? laborScrap : BigDecimal.ZERO;
+ materialScrap = materialScrap != null ? materialScrap : BigDecimal.ZERO;
+ otherScrap = otherScrap != null ? otherScrap : BigDecimal.ZERO;
+ validateScrapQuantity(unqualified, laborScrap, materialScrap, otherScrap);
+ reqVO.setLaborScrapQuantity(laborScrap);
+ reqVO.setMaterialScrapQuantity(materialScrap);
+ reqVO.setOtherScrapQuantity(otherScrap);
+ // 4. 妫�楠屼俊鎭�
+ reqVO.setCheckResult(qcImportHelper.resolveDictValue(row.getCheckResult(),
+ DictTypeConstants.MES_QC_CHECK_RESULT, "妫�娴嬬粨鏋�", false));
+ reqVO.setInspectorUserId(qcImportHelper.resolveInspectorUserId(row.getInspectorName()));
+ reqVO.setInspectDate(qcImportHelper.parseDateTime(row.getInspectDate(), "妫�娴嬫棩鏈�"));
+ reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
+ // 5. 鍘婚噸锛氬悓涓� 鐢熶骇宸ュ崟 + 妫�楠岀被鍨� + 宸ヤ綅 + 妫�娴嬫棩鏈� 鐨勮繃绋嬫楠屽崟涓嶅彲閲嶅瀵煎叆
+ MesQcIpqcDO duplicate = CollUtil.getFirst(ipqcMapper.selectListByImportKey(reqVO.getWorkOrderId(),
+ reqVO.getType(), reqVO.getWorkstationId(), reqVO.getInspectDate()));
+ if (duplicate != null) {
+ throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "杩囩▼妫�楠屽崟",
+ duplicate.getCode(), "璐ㄩ噺绠＄悊-杩囩▼妫�楠�");
+ }
+ // 6. 澶嶇敤鍒涘缓閫昏緫锛氭牎楠屽伐鍗�/宸ヤ綅/浜哄憳銆佹寜鐗╂枡鍖归厤璐ㄦ鏂规銆佺敓鎴愭楠岃
+ try {
+ createIpqc(reqVO);
+ } catch (ServiceException ex) {
+ MesQcImportHelper.rethrowTemplateError(ex, row.getWorkOrderCode(), "杩囩▼妫�楠�(IPQC)");
+ }
+ return code;
+ }
+
+ /**
+ * 鏍￠獙 宸ュ簾 + 鏂欏簾 + 鍏朵粬搴熷搧 涓嶈秴杩囦笉鍚堟牸鍝佹暟閲�
+ */
+ private void validateScrapQuantity(BigDecimal unqualified, BigDecimal laborScrap,
+ BigDecimal materialScrap, BigDecimal otherScrap) {
+ BigDecimal scrapSum = laborScrap.add(materialScrap).add(otherScrap);
+ if (scrapSum.compareTo(unqualified) <= 0) {
+ return;
+ }
+ throw new IllegalArgumentException("宸ュ簾銆佹枡搴熴�佸叾浠栧簾鍝佹暟閲忎箣鍜屼笉鑳借秴杩囦笉鍚堟牸鍝佹暟閲忥細涓嶅悎鏍煎搧鏁伴噺涓� "
+ + unqualified.stripTrailingZeros().toPlainString() + "锛岃�� 宸ュ簾 " + laborScrap.stripTrailingZeros().toPlainString()
+ + " + 鏂欏簾 " + materialScrap.stripTrailingZeros().toPlainString() + " + 鍏朵粬搴熷搧 "
+ + otherScrap.stripTrailingZeros().toPlainString() + " = " + scrapSum.stripTrailingZeros().toPlainString()
+ + "銆傝淇敼妯℃澘涓殑搴熷搧鏁伴噺鎴栦笉鍚堟牸鍝佹暟閲忓悗閲嶆柊瀵煎叆");
+ }
+
+ /**
+ * 瀵煎叆鍘婚噸閿細鍚屼竴 鐢熶骇宸ュ崟 + 妫�楠岀被鍨� + 宸ヤ綅 + 妫�娴嬫棩鏈� 瑙嗕负鍚屼竴鎵硅繃绋嬫楠屾暟鎹�
+ */
+ private String buildImportKey(MesQcIpqcImportExcelVO row) {
+ return String.join("|", StrUtil.trimToEmpty(row.getWorkOrderCode()), StrUtil.trimToEmpty(row.getType()),
+ StrUtil.trimToEmpty(row.getWorkstationName()), StrUtil.trimToEmpty(row.getInspectDate()));
+ }
+
+ private String buildImportKeyDesc(MesQcIpqcImportExcelVO row) {
+ return "鐢熶骇宸ュ崟[" + MesQcImportHelper.describeImportValue(row.getWorkOrderCode())
+ + "]銆佹楠岀被鍨媅" + MesQcImportHelper.describeImportValue(row.getType())
+ + "]銆佸伐浣峓" + MesQcImportHelper.describeImportValue(row.getWorkstationName())
+ + "]銆佹娴嬫棩鏈焄" + MesQcImportHelper.describeImportValue(row.getInspectDate()) + "]";
+ }
+
}
--
Gitblit v1.9.3