From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 324 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 268 insertions(+), 56 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..592dcd0 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,20 @@
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.framework.operatelog.core.util.OperateLogUtils;
+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;
@@ -37,6 +45,7 @@
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -46,11 +55,16 @@
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;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.mes.enums.LogRecordConstants.*;
/**
* MES 杩囩▼妫�楠屽崟锛圛PQC锛� Service 瀹炵幇绫�
@@ -61,6 +75,9 @@
@Validated
@Slf4j
public class MesQcIpqcServiceImpl implements MesQcIpqcService {
+
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
/**
* IPQC 淇濆瓨鏁版嵁鏍￠獙涓婁笅鏂�
@@ -115,6 +132,13 @@
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private MesQcImportHelper qcImportHelper;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateProcessService templateProcessService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService autoCodeRecordService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
@@ -122,40 +146,75 @@
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 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- itemId, MesQcTypeEnum.IPQC.getType(), null, null);
- 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); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
- }
- }
- Long templateId = templateItem.getTemplateId();
+ // 1.3 纭畾妫�楠岀墿鏂欙細鎵嬪伐閫夋嫨浼樺厛锛涘惁鍒欐湁浠诲姟鏃跺彇浠诲姟鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟浜у搧
+ Long itemId = createReqVO.getItemId() != null ? createReqVO.getItemId()
+ : (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 1.5 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 2. 鎻掑叆涓昏〃
+ // 2. 鎻掑叆涓昏〃锛堟湭鎸囧畾璐ㄦ鏂规鏃讹紝鎸夊伐搴忛粯璁ょ粦瀹氳В鏋愶級
+ Long processId = createReqVO.getProcessId() != null ? createReqVO.getProcessId()
+ : getProcessId(itemId, ctx.workstation() != null ? ctx.workstation().getProcessId() : null);
+ Long templateId = createReqVO.getTemplateId() != null ? createReqVO.getTemplateId()
+ : templateProcessService.resolveTemplateId(processId, MesQcTypeEnum.IPQC.getType());
+ String reelNo = StrUtil.isNotBlank(createReqVO.getReelNo()) ? createReqVO.getReelNo()
+ : workOrder.getReelNo();
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
.setItemId(itemId)
- .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
+ .setReelNo(reelNo)
+ .setProcessId(processId)
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
ipqcMapper.insert(ipqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId);
+ // 3. 鎸夎川妫�鏂规鐢熸垚妫�娴嬫寚鏍囪锛屽墠绔洿鎺ュ甫鍑洪渶瑕佸～鍐欑殑瀛楁
+ if (templateId != null) {
+ ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId);
+ }
return ipqc.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createInspectionForFeedback(MesProFeedbackDO feedback) {
+ // 宸插瓨鍦ㄥ叧鑱旀楠屽崟鏃剁洿鎺ュ鐢紝閬垮厤閲嶅鐢熸垚
+ List<MesQcIpqcDO> existingList = ipqcMapper.selectListBySourceDoc(
+ MesBizTypeConstants.PRO_FEEDBACK, feedback.getId());
+ if (CollUtil.isNotEmpty(existingList)) {
+ return existingList.get(0).getId();
+ }
+ MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
+ if (workOrder == null) {
+ throw exception(PRO_WORK_ORDER_NOT_EXISTS);
+ }
+ BigDecimal quantity = ObjectUtil.defaultIfNull(feedback.getFeedbackQuantity(), BigDecimal.ZERO);
+ MesQcIpqcSaveReqVO reqVO = new MesQcIpqcSaveReqVO();
+ reqVO.setCode(autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.QC_IPQC_CODE.getCode()));
+ reqVO.setName(StrUtil.format("鎶ュ伐鍗昜{}]杩囩▼妫�楠�", feedback.getCode()));
+ reqVO.setType(MesQcTypeEnum.IPQC.getType());
+ reqVO.setSourceDocType(MesBizTypeConstants.PRO_FEEDBACK);
+ reqVO.setSourceDocId(feedback.getId());
+ reqVO.setWorkOrderId(feedback.getWorkOrderId());
+ reqVO.setTaskId(feedback.getTaskId());
+ reqVO.setWorkstationId(feedback.getWorkstationId());
+ reqVO.setProcessId(feedback.getProcessId());
+ // 鎶ュ伐鍗曞凡鏄庣‘宸ュ簭锛岀洿鎺ユ寜銆屽伐搴� + 杩囩▼妫�楠屻�嶈В鏋愰粯璁よ川妫�鏂规锛岄伩鍏嶅伐浣嶇己澶辨椂鐢熸垚绌烘楠屽崟
+ reqVO.setTemplateId(templateProcessService.resolveTemplateId(
+ feedback.getProcessId(), MesQcTypeEnum.IPQC.getType()));
+ reqVO.setItemId(feedback.getItemId());
+ // 榛樿妫�娴嬫暟閲忓彇鎶ュ伐鏁伴噺锛岄粯璁や负鍏ㄩ儴鍚堟牸锛岃川妫�濉啓鏃跺啀璋冩暣涓嶅悎鏍兼暟閲�
+ reqVO.setCheckQuantity(quantity);
+ reqVO.setQualifiedQuantity(quantity);
+ reqVO.setUnqualifiedQuantity(BigDecimal.ZERO);
+ reqVO.setLaborScrapQuantity(BigDecimal.ZERO);
+ reqVO.setMaterialScrapQuantity(BigDecimal.ZERO);
+ reqVO.setOtherScrapQuantity(BigDecimal.ZERO);
+ reqVO.setInspectDate(java.time.LocalDateTime.now());
+ reqVO.setInspectorUserId(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ reqVO.setRemark(StrUtil.format("鎶ュ伐鎻愪氦鑷姩鐢熸垚锛屽伐搴� ID={}", feedback.getProcessId()));
+ return createIpqc(reqVO);
}
@Override
@@ -172,31 +231,42 @@
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
updateObj.setWorkOrderId(null); // 涓嶅厑璁镐慨鏀瑰伐鍗�
- updateObj.setProcessId(getProcessId(existIpqc.getItemId(), ctx.workstation().getProcessId()));
+ updateObj.setProcessId(updateReqVO.getProcessId() != null ? updateReqVO.getProcessId()
+ : getProcessId(existIpqc.getItemId(), ctx.workstation() != null ? ctx.workstation().getProcessId() : null));
+ if (StrUtil.isBlank(updateReqVO.getReelNo())) {
+ updateObj.setReelNo(null); // 鏈～鍐欑洏鍙锋椂淇濈暀鍘熷��
+ }
ipqcMapper.updateById(updateObj);
}
private SaveDataContext validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateIpqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦�
- MesMdWorkstationDO workstation = workstationService.validateWorkstationExists(reqVO.getWorkstationId());
+ // 鏍￠獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦紙鎵嬪伐鎸囧畾宸ュ簭鏃跺伐浣嶅彲涓嶅～锛�
+ MesMdWorkstationDO workstation = reqVO.getWorkstationId() != null
+ ? workstationService.validateWorkstationExists(reqVO.getWorkstationId()) : null;
+ if (workstation == null && reqVO.getProcessId() == null) {
+ throw exception(QC_IPQC_PROCESS_REQUIRED);
+ }
adminUserApi.validateUser(reqVO.getInspectorUserId());
// 鏍￠獙宸ュ崟瀛樺湪
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
- if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(reqVO.getWorkOrderId());
+ if (!Objects.equals(workOrder.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.CONFIRMED.getStatus())
+ && !Objects.equals(workOrder.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.FINISHED.getStatus())) {
+ throw exception(QC_IPQC_WORK_ORDER_STATUS_INVALID);
+ }
+ if (workstation != null && 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);
+ task = taskService.validateTaskExists(reqVO.getTaskId());
+ if (Objects.equals(task.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.CANCELED.getStatus())) {
+ throw exception(PRO_TASK_ALREADY_FINISHED);
}
+ validateTaskRelation(task, workstation, workOrder, reqVO);
}
return new SaveDataContext(workstation, task);
}
@@ -206,10 +276,11 @@
if (ObjUtil.notEqual(task.getWorkOrderId(), workOrder.getId())) {
throw exception(PRO_TASK_WORK_ORDER_MISMATCH);
}
- if (ObjUtil.notEqual(task.getWorkstationId(), workstation.getId())) {
+ if (workstation != null && ObjUtil.notEqual(task.getWorkstationId(), workstation.getId())) {
throw exception(PRO_TASK_WORKSTATION_MISMATCH);
}
- Long expectedProcessId = reqVO.getProcessId() != null ? reqVO.getProcessId() : workstation.getProcessId();
+ Long expectedProcessId = reqVO.getProcessId() != null ? reqVO.getProcessId()
+ : workstation != null ? workstation.getProcessId() : null;
if (expectedProcessId != null && ObjUtil.notEqual(task.getProcessId(), expectedProcessId)) {
throw exception(PRO_TASK_ROUTE_PROCESS_MISMATCH);
}
@@ -222,18 +293,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishIpqc(Long id) {
+ completionHelper.lockDocument("ipqc", id);
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id);
- // 1.2 鏍￠獙妫�娴嬬粨璁哄繀濉�
- if (ipqc.getCheckResult() == null) {
- throw exception(QC_IPQC_CHECK_RESULT_EMPTY);
- }
- // 1.3 鏍￠獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IPQC.getType());
+ int result = completionHelper.validateAndGetResult("ipqc", id, ipqc.getQualifiedQuantity(), ipqc.getUnqualifiedQuantity(), ipqc.getCheckQuantity());
+ ipqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
ipqcMapper.updateById(new MesQcIpqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()));
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result));
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
generateNcrIfNeeded(ipqc);
@@ -278,20 +347,19 @@
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) {
+ // 鐙珛妫�楠屼笉鎺ㄦ祴鍏宠仈鎶ュ伐锛氬悓涓�浠诲姟鍙兘鏈夊娆℃姤宸ュ拰涓嶅悓鐩樺彿銆�
+ if (ipqc.getSourceDocType() == null && sourceDocId == null && sourceLineId == null) {
log.warn("[writeBackSourceDoc] IPQC({}) 鏃犳硶纭畾鏉ユ簮鎶ュ伐锛岃烦杩囧洖鍐�", ipqc.getId());
+ return;
+ }
+ if (!Objects.equals(ipqc.getSourceDocType(), MesBizTypeConstants.PRO_FEEDBACK)
+ || sourceDocId == null) {
+ throw new IllegalArgumentException("杩囩▼妫�楠岀殑鎶ュ伐鏉ユ簮涓嶅畬鏁�");
+ }
+ // 鎶ュ伐瀹℃壒鍓嶇殑杩囩▼妫�楠岋紙鐢辨姤宸ユ彁浜よ嚜鍔ㄧ敓鎴愶級锛氬彧璁板綍妫�楠岀粨鏋滀緵瀹℃壒鍋氳川閲忓伐璧勮皟鏁达紝
+ // 姝ゆ椂灏氭湭鐢熸垚浜у嚭琛岋紝涓嶅仛浜у嚭琛屾媶鍒嗕笌鎶ュ伐鐘舵�佸洖鍐�
+ if (sourceLineId == null) {
+ log.info("[writeBackSourceDoc] IPQC({}) 鏃犱骇鍑鸿锛堟姤宸ュ鎵瑰墠妫�楠岋級锛岃烦杩囧洖鍐�", ipqc.getId());
return;
}
@@ -456,4 +524,148 @@
ipqcMapper.updateById(updateIpqc);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = MES_QC_IPQC_TYPE, subType = MES_QC_IPQC_IMPORT_SUB_TYPE, bizNo = "0",
+ success = MES_QC_IPQC_IMPORT_SUCCESS)
+ public MesQcImportRespVO importIpqcList(List<MesQcIpqcImportExcelVO> importList) {
+ MesQcImportRespVO respVO = MesQcImportRespVO.builder()
+ .createList(new ArrayList<>()).failureList(new LinkedHashMap<>()).build();
+ if (CollUtil.isEmpty(importList)) {
+ // 绌烘枃浠朵篃瑕佺粰鏃ュ織鏂囨鍏滃簳锛岄伩鍏� {{#importSummary}} 鍙栦笉鍒板��
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), null, respVO.getFailureList());
+ 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));
+ }
+ }
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), null, respVO.getFailureList());
+ 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