From c6a2b472cde9dff4d21b95637ee6d99a412c785c Mon Sep 17 00:00:00 2001
From: 高 <gao@gaodeMacBook-Pro.local>
Date: 星期六, 10 十月 2026 17:21:40 +0800
Subject: [PATCH] feat(mes,crm): 新增质检单批量导入、检测结果台账与开票导入
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 299 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 173 insertions(+), 126 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..98bded1 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,34 +3,31 @@
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.mdm.api.item.MdmItemApi;
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.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;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
-import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
-import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
-import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
-import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
-import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
+import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
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.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
@@ -46,7 +43,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;
@@ -62,16 +63,11 @@
@Slf4j
public class MesQcIpqcServiceImpl implements MesQcIpqcService {
- /**
- * IPQC 淇濆瓨鏁版嵁鏍￠獙涓婁笅鏂�
- *
- * @param workstation 宸ヤ綅
- * @param task 鐢熶骇浠诲姟锛堝彲閫夛紝鎸囧畾 taskId 鏃堕潪绌猴級
- */
- private record SaveDataContext(MesMdWorkstationDO workstation, MesProTaskDO task) {}
-
@Resource
private MesQcIpqcMapper ipqcMapper;
+
+ @Resource
+ private MesQcImportHelper qcImportHelper;
@Resource
private MesQcTemplateItemService templateItemService;
@@ -79,25 +75,7 @@
private MesQcIpqcLineService ipqcLineService;
@Resource
@Lazy
- private MesProWorkOrderService workOrderService;
- @Resource
- @Lazy
- private MesMdWorkstationService workstationService;
- @Resource
- @Lazy
- private MesMdItemService itemService;
- @Resource
- @Lazy
private MesQcDefectRecordService defectRecordService;
- @Resource
- @Lazy
- private MesProRouteProductService routeProductService;
- @Resource
- @Lazy
- private MesProRouteProcessService routeProcessService;
- @Resource
- @Lazy
- private MesProTaskService taskService;
@Resource
@Lazy
private MesProFeedbackService feedbackService;
@@ -113,20 +91,21 @@
private MesQcNcrService ncrService;
@Resource
+ private MdmItemApi mdmItemApi;
+
+ @Resource
private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
// 1.1 鏍￠獙鏁版嵁
- SaveDataContext ctx = validateIpqcSaveData(createReqVO);
- // 1.2 鏍￠獙宸ュ崟瀛樺湪
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
- // 1.3 纭畾妫�楠岀墿鏂欙細鏈変换鍔℃椂鍙栦换鍔＄殑鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟鐨勪骇鍝�
- Long itemId = (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
- // 1.4 鏍规嵁鐗╂枡 + IPQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
+ validateIpqcSaveData(createReqVO);
+ // 1.2 浜у搧鐗╂枡鐢卞墠绔寚瀹氾紙MDM 鐗╂枡锛夛紝鏍￠獙鍏跺瓨鍦�
+ Long itemId = createReqVO.getItemId();
+ // 1.3 鏍规嵁鐗╂枡 + IPQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- itemId, MesQcTypeEnum.IPQC.getType(), null, null);
+ itemId, MesQcTypeEnum.IPQC.getType());
if (CollUtil.isEmpty(templateItems)) {
throw exception(QC_NO_TEMPLATE);
}
@@ -147,7 +126,6 @@
// 2. 鎻掑叆涓昏〃
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
.setItemId(itemId)
- .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
@@ -163,60 +141,27 @@
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateIpqcStatusPrepare(updateReqVO.getId());
// 1.2 鏍￠獙鏁版嵁
- SaveDataContext ctx = validateIpqcSaveData(updateReqVO);
+ validateIpqcSaveData(updateReqVO);
// 2. 鏇存柊涓昏〃
- MesQcIpqcDO existIpqc = validateIpqcExists(updateReqVO.getId());
MesQcIpqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIpqcDO.class);
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
- updateObj.setWorkOrderId(null); // 涓嶅厑璁镐慨鏀瑰伐鍗�
- updateObj.setProcessId(getProcessId(existIpqc.getItemId(), ctx.workstation().getProcessId()));
ipqcMapper.updateById(updateObj);
}
- private SaveDataContext validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
+ private void validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateIpqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦�
- MesMdWorkstationDO workstation = workstationService.validateWorkstationExists(reqVO.getWorkstationId());
+ // 鏍￠獙鎵瑰彿闈炵┖锛圴O 灞傚凡鏍￠獙锛屾澶勫厹搴曞唴閮�/RPC 璋冪敤缁曡繃鏍￠獙鐨勬儏鍐碉級
+ if (StrUtil.isBlank(reqVO.getBatchCode())) {
+ throw exception(QC_IPQC_BATCH_CODE_REQUIRED);
+ }
+ // 鏍￠獙浜у搧鐗╂枡瀛樺湪锛堢墿鏂� ID 鏉ヨ嚜 MDM锛�
+ mdmItemApi.validateItemExists(reqVO.getItemId());
+ // 鏍￠獙妫�娴嬩汉鍛樺瓨鍦�
adminUserApi.validateUser(reqVO.getInspectorUserId());
- // 鏍￠獙宸ュ崟瀛樺湪
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
- if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
- throw exception(PRO_WORKSTATION_PROCESS_MISMATCH);
- }
- // 鏍￠獙浠诲姟鍏崇郴锛堝鏋滄寚瀹氫簡浠诲姟锛�
- MesProTaskDO task = null;
- if (reqVO.getTaskId() != null) {
- task = taskService.validateTaskNotFinished(reqVO.getTaskId());
- validateTaskRelation(task, workstation, workOrder, reqVO);
- } else {
- // 鏃犱换鍔℃椂锛宨temId 浠嶉渶涓庡伐鍗曚骇鍝佷竴鑷�
- if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), workOrder.getProductId())) {
- throw exception(PRO_WORK_ORDER_PRODUCT_MISMATCH);
- }
- }
- return new SaveDataContext(workstation, task);
- }
-
- private void validateTaskRelation(MesProTaskDO task, MesMdWorkstationDO workstation,
- MesProWorkOrderDO workOrder, MesQcIpqcSaveReqVO reqVO) {
- if (ObjUtil.notEqual(task.getWorkOrderId(), workOrder.getId())) {
- throw exception(PRO_TASK_WORK_ORDER_MISMATCH);
- }
- if (ObjUtil.notEqual(task.getWorkstationId(), workstation.getId())) {
- throw exception(PRO_TASK_WORKSTATION_MISMATCH);
- }
- Long expectedProcessId = reqVO.getProcessId() != null ? reqVO.getProcessId() : workstation.getProcessId();
- if (expectedProcessId != null && ObjUtil.notEqual(task.getProcessId(), expectedProcessId)) {
- throw exception(PRO_TASK_ROUTE_PROCESS_MISMATCH);
- }
- // 鏍￠獙妫�楠岀墿鏂欎笌浠诲姟鐗╂枡涓�鑷达紙鏈変换鍔℃椂锛孖PQC 妫�楠岀殑鐗╂枡搴斾笌浠诲姟鍔犲伐鐨勭墿鏂欎竴鑷达級
- if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), task.getItemId())) {
- throw exception(PRO_TASK_ITEM_MISMATCH);
- }
}
@Override
@@ -277,18 +222,6 @@
// 1. 纭畾 sourceDocType/sourceDocId
Long sourceDocId = ipqc.getSourceDocId();
Long sourceLineId = ipqc.getSourceLineId();
-
- // 濡傛灉 IPQC 鍗曟病鏈夎缃潵婧愶紝灏濊瘯閫氳繃 taskId 鏌ユ壘鍏宠仈鐨勫緟妫�楠屾姤宸�
- if (sourceDocId == null && ipqc.getTaskId() != null) {
- MesProFeedbackDO feedback = feedbackService.getFeedbackListByTaskId(ipqc.getTaskId()).stream()
- .filter(f -> MesProFeedbackStatusEnum.UNCHECK.getStatus().equals(f.getStatus()))
- .findFirst().orElse(null);
- if (feedback != null) {
- sourceDocId = feedback.getId();
- log.info("[writeBackSourceDoc] IPQC({}) 鏈缃潵婧愬崟鎹紝閫氳繃 taskId({}) 鎵惧埌寰呮楠屾姤宸�({})",
- ipqc.getId(), ipqc.getTaskId(), feedback.getId());
- }
- }
if (sourceDocId == null) {
log.warn("[writeBackSourceDoc] IPQC({}) 鏃犳硶纭畾鏉ユ簮鎶ュ伐锛岃烦杩囧洖鍐�", ipqc.getId());
@@ -377,33 +310,6 @@
throw exception(QC_IPQC_SOURCE_DOC_TYPE_UNKNOWN);
}
- /**
- * 鎺ㄥ宸ュ簭 ID
- *
- * <p>閫氳繃浜у搧 鈫� 宸ヨ壓璺嚎浜у搧 鈫� 宸ヨ壓璺嚎 鈫� 鏍￠獙宸ヤ綅宸ュ簭鏄惁鍦ㄨ璺嚎涓�
- * <p>濡傛灉宸ヤ綅鐨勫伐搴忓湪璺嚎涓紝鍒欒繑鍥炶 processId锛涘惁鍒欒繑鍥� null
- *
- * @param productId 浜у搧 ID锛堝伐鍗曚骇鍝侊級
- * @param workstationProcessId 宸ヤ綅鍏宠仈鐨勫伐搴� ID
- * @return 鎺ㄥ鍑虹殑宸ュ簭 ID锛屾棤娉曟帹瀵兼椂杩斿洖 null
- */
- private Long getProcessId(Long productId, Long workstationProcessId) {
- if (productId == null || workstationProcessId == null) {
- return null;
- }
- // 1. 浜у搧 鈫� 宸ヨ壓璺嚎
- MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
- if (routeProduct == null) {
- return null;
- }
- // 2. 鏍￠獙宸ヤ綅鐨勫伐搴忔槸鍚﹀湪璇ヨ矾绾夸腑
- if (routeProcessService.getRouteProcessByRouteIdAndProcessId(
- routeProduct.getRouteId(), workstationProcessId) == null) {
- return null;
- }
- return workstationProcessId;
- }
-
@Override
public MesQcIpqcDO getIpqc(Long id) {
return ipqcMapper.selectById(id);
@@ -456,4 +362,145 @@
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.getItemCode())
+ && StrUtil.isBlank(row.getBatchCode()) && 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.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
+ if (StrUtil.isBlank(row.getBatchCode())) {
+ throw new IllegalArgumentException("鎵瑰彿涓嶈兘涓虹┖锛氳濉啓妯℃澘涓琛岀殑銆屾壒鍙枫�嶅垪");
+ }
+ reqVO.setBatchCode(row.getBatchCode().trim());
+ 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.getItemId(),
+ reqVO.getBatchCode(), reqVO.getType(), reqVO.getInspectDate()));
+ if (duplicate != null) {
+ throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "杩囩▼妫�楠屽崟",
+ duplicate.getCode(), "璐ㄩ噺绠＄悊-杩囩▼妫�楠�");
+ }
+ // 6. 澶嶇敤鍒涘缓閫昏緫锛氭牎楠岀墿鏂�/浜哄憳銆佹寜鐗╂枡鍖归厤璐ㄦ鏂规銆佺敓鎴愭楠岃
+ try {
+ createIpqc(reqVO);
+ } catch (ServiceException ex) {
+ MesQcImportHelper.rethrowTemplateError(ex, row.getItemCode(), "杩囩▼妫�楠�(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.getItemCode()), StrUtil.trimToEmpty(row.getBatchCode()),
+ StrUtil.trimToEmpty(row.getType()), StrUtil.trimToEmpty(row.getInspectDate()));
+ }
+
+ private String buildImportKeyDesc(MesQcIpqcImportExcelVO row) {
+ return "鐗╂枡[" + MesQcImportHelper.describeImportValue(row.getItemCode())
+ + "]銆佹壒鍙穂" + MesQcImportHelper.describeImportValue(row.getBatchCode())
+ + "]銆佹楠岀被鍨媅" + MesQcImportHelper.describeImportValue(row.getType())
+ + "]銆佹娴嬫棩鏈焄" + MesQcImportHelper.describeImportValue(row.getInspectDate()) + "]";
+ }
+
}
--
Gitblit v1.9.3