From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 86 insertions(+), 19 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 35454eb..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
@@ -134,6 +134,10 @@
@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)
@@ -142,23 +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.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)
- .setReelNo(workOrder.getReelNo())
- .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
- .setTemplateId(null)
+ .setReelNo(reelNo)
+ .setProcessId(processId)
+ .setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
ipqcMapper.insert(ipqc);
+ // 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
@@ -175,15 +231,23 @@
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.validateWorkOrderExists(reqVO.getWorkOrderId());
@@ -191,7 +255,8 @@
&& !Objects.equals(workOrder.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.FINISHED.getStatus())) {
throw exception(QC_IPQC_WORK_ORDER_STATUS_INVALID);
}
- if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
+ if (workstation != null && reqVO.getProcessId() != null
+ && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
throw exception(PRO_WORKSTATION_PROCESS_MISMATCH);
}
// 鏍￠獙浠诲姟鍏崇郴锛堝鏋滄寚瀹氫簡浠诲姟锛�
@@ -202,11 +267,6 @@
throw exception(PRO_TASK_ALREADY_FINISHED);
}
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);
}
@@ -216,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);
}
@@ -292,8 +353,14 @@
return;
}
if (!Objects.equals(ipqc.getSourceDocType(), MesBizTypeConstants.PRO_FEEDBACK)
- || sourceDocId == null || sourceLineId == null) {
- throw new IllegalArgumentException("杩囩▼妫�楠岀殑鎶ュ伐鏉ユ簮鎴栦骇鍑鸿涓嶅畬鏁�");
+ || sourceDocId == null) {
+ throw new IllegalArgumentException("杩囩▼妫�楠岀殑鎶ュ伐鏉ユ簮涓嶅畬鏁�");
+ }
+ // 鎶ュ伐瀹℃壒鍓嶇殑杩囩▼妫�楠岋紙鐢辨姤宸ユ彁浜よ嚜鍔ㄧ敓鎴愶級锛氬彧璁板綍妫�楠岀粨鏋滀緵瀹℃壒鍋氳川閲忓伐璧勮皟鏁达紝
+ // 姝ゆ椂灏氭湭鐢熸垚浜у嚭琛岋紝涓嶅仛浜у嚭琛屾媶鍒嗕笌鎶ュ伐鐘舵�佸洖鍐�
+ if (sourceLineId == null) {
+ log.info("[writeBackSourceDoc] IPQC({}) 鏃犱骇鍑鸿锛堟姤宸ュ鎵瑰墠妫�楠岋級锛岃烦杩囧洖鍐�", ipqc.getId());
+ return;
}
// 2. 鍥炲啓鎶ュ伐
--
Gitblit v1.9.3