From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 98 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 48 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 0f21b7d..32eff6f 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
@@ -3,9 +3,12 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.framework.operatelog.core.util.OperateLogUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
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;
@@ -34,6 +37,7 @@
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -51,6 +55,7 @@
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 鍑鸿揣妫�楠屽崟锛圤QC锛� Service 瀹炵幇绫�
@@ -62,7 +67,13 @@
public class MesQcOqcServiceImpl implements MesQcOqcService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+ @Resource
private MesQcOqcMapper oqcMapper;
+
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@Resource
private MesQcTemplateItemService templateItemService;
@@ -103,39 +114,25 @@
// 1.2 鏍￠獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceLineId());
- // 1.3 鏍规嵁浜у搧 + OQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- createReqVO.getItemId(), MesQcTypeEnum.OQC.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();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 2. 鎻掑叆涓昏〃
MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class)
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
+ if (createReqVO.getSourceLineId() != null) {
+ oqc.setReelNo(resolveSalesReelNo(productSalesLineService
+ .validateProductSalesLineExists(createReqVO.getSourceLineId())));
+ }
oqcMapper.insert(oqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
return oqc.getId();
}
@Override
public void updateOqc(MesQcOqcSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateOqcStatusPrepare(updateReqVO.getId());
+ MesQcOqcDO existingOqc = validateOqcStatusPrepare(updateReqVO.getId());
// 1.2 鏍￠獙鏁版嵁
validateOqcSaveData(updateReqVO);
@@ -144,7 +141,12 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
- oqcMapper.updateById(updateObj);
+ if (existingOqc.getSourceLineId() != null) updateObj.setReelNo(null); // 鏉ユ簮鐩樺彿淇濇寔蹇収
+ // 缂栬緫鏃跺厑璁告竻绌哄鎴凤紱瀹屾垚妫�楠岀瓑灞�閮ㄦ洿鏂颁粛淇濈暀鍘熷鎴枫��
+ updateObj.setClientId(null);
+ oqcMapper.update(updateObj, new LambdaUpdateWrapper<MesQcOqcDO>()
+ .eq(MesQcOqcDO::getId, updateReqVO.getId())
+ .set(MesQcOqcDO::getClientId, updateReqVO.getClientId()));
}
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
@@ -159,18 +161,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishOqc(Long id) {
+ completionHelper.lockDocument("oqc", id);
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
MesQcOqcDO oqc = validateOqcStatusPrepare(id);
- // 1.2 鏍￠獙妫�娴嬬粨璁哄繀濉�
- if (oqc.getCheckResult() == null) {
- throw exception(QC_OQC_CHECK_RESULT_EMPTY);
- }
- // 1.3 鏍￠獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.OQC.getType());
+ int result = completionHelper.validateAndGetResult("oqc", id, oqc.getQualifiedQuantity(), oqc.getUnqualifiedQuantity(), oqc.getCheckQuantity());
+ oqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
MesQcOqcDO updateObj = new MesQcOqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
oqcMapper.updateById(updateObj);
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
@@ -304,9 +304,7 @@
@Override
public PageResult<MesQcOqcDO> getOqcPage(MesQcOqcPageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return oqcMapper.selectPage(pageReqVO, permittedClientIds);
+ return oqcMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -352,17 +350,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
- // 1. 鏍￠獙鐗╂枡鏄惁閰嶇疆浜� OQC 妫�楠屾ā鏉�
- MesQcTemplateItemDO templateItem;
- try {
- templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- line.getItemId(), MesQcTypeEnum.OQC.getType());
- } catch (Exception e) {
- // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
- String itemInfo = getItemInfo(line.getItemId());
- throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
- }
- Long templateId = templateItem.getTemplateId();
// 2. 鐢熸垚妫�楠屽崟缂栫爜
String code = "OQC" + System.currentTimeMillis();
@@ -371,7 +358,7 @@
MesQcOqcDO oqc = new MesQcOqcDO();
oqc.setCode(code);
oqc.setName(salesCode + "-鍑鸿揣妫�楠�");
- oqc.setTemplateId(templateId);
+
oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
oqc.setSourceDocId(salesId);
oqc.setSourceLineId(line.getId());
@@ -379,18 +366,27 @@
oqc.setClientId(clientId);
oqc.setItemId(line.getItemId());
oqc.setBatchCode(line.getBatchCode());
+ oqc.setReelNo(resolveSalesReelNo(line));
oqc.setOutQuantity(line.getQuantity());
oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
- oqc.setOutDate(java.time.LocalDateTime.now());
+ MesWmProductSalesDO sales = productSalesService.getProductSales(salesId);
+ java.time.LocalDateTime businessDate = sales != null && sales.getSalesDate() != null
+ ? sales.getSalesDate() : java.time.LocalDateTime.now();
+ oqc.setOutDate(businessDate);
+ oqc.setInspectDate(businessDate);
oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
oqcMapper.insert(oqc);
- // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
return oqc.getId();
+ }
+
+ private String resolveSalesReelNo(MesWmProductSalesLineDO line) {
+ if (line == null || line.getSaleOrderItemId() == null) return null;
+ var item = saleOrderApi.getSaleOrderItem(line.getSaleOrderItemId()).getCheckedData();
+ return item == null ? null : item.getReelNo();
}
/**
@@ -413,10 +409,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = MES_QC_OQC_TYPE, subType = MES_QC_OQC_IMPORT_SUB_TYPE, bizNo = "0",
+ success = MES_QC_OQC_IMPORT_SUCCESS)
public MesQcImportRespVO importOqcList(List<MesQcOqcImportExcelVO> 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();
@@ -440,6 +440,8 @@
respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
}
}
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateList(), null, respVO.getFailureList());
return respVO;
}
@@ -476,7 +478,7 @@
reqVO.setName(row.getName().trim());
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
Long clientId = qcImportHelper.resolveClientId(row.getClientName());
- qcImportHelper.validateClientPermission(clientId, row.getClientName().trim());
+ qcImportHelper.validateClientPermission(clientId, StrUtil.trimToEmpty(row.getClientName()));
reqVO.setClientId(clientId);
reqVO.setBatchCode(StrUtil.trimToNull(row.getBatchCode()));
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
--
Gitblit v1.9.3