From 0302d7055987a275822ddddda1d35110c16a9661 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 10:01:38 +0800
Subject: [PATCH] 质检校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 543ef0e..eb962d7 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
@@ -56,6 +56,13 @@
@Validated
public class MesQcIpqcServiceImpl implements MesQcIpqcService {
+ /**
+ * IPQC 淇濆瓨鏁版嵁鏍￠獙涓婁笅鏂�
+ *
+ * @param workstation 宸ヤ綅
+ * @param task 鐢熶骇浠诲姟锛堝彲閫夛紝鎸囧畾 taskId 鏃堕潪绌猴級
+ */
+ private record SaveDataContext(MesMdWorkstationDO workstation, MesProTaskDO task) {}
@Resource
private MesQcIpqcMapper ipqcMapper;
@@ -102,21 +109,23 @@
@Transactional(rollbackFor = Exception.class)
public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
// 1.1 鏍￠獙鏁版嵁
- MesMdWorkstationDO workstation = validateIpqcSaveData(createReqVO);
+ SaveDataContext ctx = validateIpqcSaveData(createReqVO);
// 1.2 鏍￠獙宸ュ崟瀛樺湪
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
- // 1.3 鏍规嵁浜у搧 + 妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶆ā鏉�
+ // 1.3 纭畾妫�楠岀墿鏂欙細鏈変换鍔℃椂鍙栦换鍔＄殑鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟鐨勪骇鍝�
+ Long itemId = (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
+ // 1.4 鏍规嵁鐗╂枡 + 妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶆ā鏉�
MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- workOrder.getProductId(), MesQcTypeEnum.IPQC.getType());
+ itemId, MesQcTypeEnum.IPQC.getType());
Long templateId = templateItem.getTemplateId();
- // 1.4 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
+ // 1.5 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
// 2. 鎻掑叆涓昏〃
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
- .setItemId(workOrder.getProductId())
- .setProcessId(getProcessId(workOrder.getProductId(), workstation.getProcessId()))
+ .setItemId(itemId)
+ .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
@@ -132,7 +141,7 @@
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateIpqcStatusPrepare(updateReqVO.getId());
// 1.2 鏍￠獙鏁版嵁
- MesMdWorkstationDO workstation = validateIpqcSaveData(updateReqVO);
+ SaveDataContext ctx = validateIpqcSaveData(updateReqVO);
// 2. 鏇存柊涓昏〃
MesQcIpqcDO existIpqc = validateIpqcExists(updateReqVO.getId());
@@ -141,11 +150,11 @@
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
updateObj.setWorkOrderId(null); // 涓嶅厑璁镐慨鏀瑰伐鍗�
- updateObj.setProcessId(getProcessId(existIpqc.getItemId(), workstation.getProcessId()));
+ updateObj.setProcessId(getProcessId(existIpqc.getItemId(), ctx.workstation().getProcessId()));
ipqcMapper.updateById(updateObj);
}
- private MesMdWorkstationDO validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
+ private SaveDataContext validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateIpqcCodeUnique(reqVO.getId(), reqVO.getCode());
// 鏍￠獙宸ヤ綅銆佹娴嬩汉鍛樺瓨鍦�
@@ -153,18 +162,21 @@
adminUserApi.validateUser(reqVO.getInspectorUserId());
// 鏍￠獙宸ュ崟瀛樺湪
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
- if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), workOrder.getProductId())) {
- throw exception(PRO_WORK_ORDER_PRODUCT_MISMATCH);
- }
if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
throw exception(PRO_WORKSTATION_PROCESS_MISMATCH);
}
// 鏍￠獙浠诲姟鍏崇郴锛堝鏋滄寚瀹氫簡浠诲姟锛�
+ MesProTaskDO task = null;
if (reqVO.getTaskId() != null) {
- MesProTaskDO task = taskService.validateTaskNotFinished(reqVO.getTaskId());
+ 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 workstation;
+ return new SaveDataContext(workstation, task);
}
private void validateTaskRelation(MesProTaskDO task, MesMdWorkstationDO workstation,
@@ -179,7 +191,8 @@
if (expectedProcessId != null && ObjUtil.notEqual(task.getProcessId(), expectedProcessId)) {
throw exception(PRO_TASK_ROUTE_PROCESS_MISMATCH);
}
- if (ObjUtil.notEqual(task.getItemId(), workOrder.getProductId())) {
+ // 鏍￠獙妫�楠岀墿鏂欎笌浠诲姟鐗╂枡涓�鑷达紙鏈変换鍔℃椂锛孖PQC 妫�楠岀殑鐗╂枡搴斾笌浠诲姟鍔犲伐鐨勭墿鏂欎竴鑷达級
+ if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), task.getItemId())) {
throw exception(PRO_TASK_ITEM_MISMATCH);
}
}
--
Gitblit v1.9.3