From fbc80648adf176fed54046c3aa52173b20e5d12e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:57:32 +0800
Subject: [PATCH] 宁夏万通需求：商机状态组改为非必填；过程检验单生产订单、工位改为非必填
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 115 insertions(+), 40 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 748207d..775ef27 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
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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;
@@ -16,6 +17,7 @@
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.item.MesMdItemDO;
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;
@@ -23,6 +25,7 @@
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.MesQcTemplateDO;
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.qc.MesQcDefectLevelEnum;
@@ -40,6 +43,7 @@
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
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.service.qc.template.MesQcTemplateService;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
@@ -76,16 +80,19 @@
/**
* IPQC 淇濆瓨鏁版嵁鏍￠獙涓婁笅鏂�
*
- * @param workstation 宸ヤ綅
+ * @param workstation 宸ヤ綅锛堝彲閫夛紝鏈寚瀹� workstationId 鏃朵负绌猴級
* @param task 鐢熶骇浠诲姟锛堝彲閫夛紝鎸囧畾 taskId 鏃堕潪绌猴級
+ * @param workOrder 鐢熶骇宸ュ崟锛堝彲閫夛紝鏈寚瀹� workOrderId 鏃朵负绌猴級
*/
- private record SaveDataContext(MesMdWorkstationDO workstation, MesProTaskDO task) {}
+ private record SaveDataContext(MesMdWorkstationDO workstation, MesProTaskDO task, MesProWorkOrderDO workOrder) {}
@Resource
private MesQcIpqcMapper ipqcMapper;
@Resource
private MesQcTemplateItemService templateItemService;
+ @Resource
+ private MesQcTemplateService templateService;
@Resource
private MesQcIpqcLineService ipqcLineService;
@Resource
@@ -132,36 +139,21 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
- // 1.1 鏍￠獙鏁版嵁
+ // 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 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- 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.5 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
+ // 1.2 纭畾妫�楠岀墿鏂欙細鏈変换鍔℃椂鍙栦换鍔＄殑鐗╂枡锛屾湁宸ュ崟鏃跺彇宸ュ崟鐨勪骇鍝侊紝閮芥病鏈夋椂鍙栬姹傛寚瀹氱殑浜у搧鐗╂枡
+ Long itemId = resolveItemId(createReqVO, ctx);
+ // 1.3 纭畾璐ㄦ鏂规锛氭樉寮忔寚瀹氭椂鏍￠獙鏂规鏈韩鍙敤锛屾湭鎸囧畾鏃舵寜浜у搧鐗╂枡宸茬粦瀹氭柟妗堝厹搴�
+ Long templateId = resolveTemplateId(itemId, createReqVO.getTemplateId());
+ // 1.4 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
// 2. 鎻掑叆涓昏〃
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
.setItemId(itemId)
- .setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
+ .setProcessId(getProcessId(itemId,
+ ctx.workstation() != null ? ctx.workstation().getProcessId() : null))
.setTemplateId(templateId)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
@@ -186,19 +178,23 @@
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
updateObj.setWorkOrderId(null); // 涓嶅厑璁镐慨鏀瑰伐鍗�
- updateObj.setProcessId(getProcessId(existIpqc.getItemId(), ctx.workstation().getProcessId()));
+ updateObj.setProcessId(getProcessId(existIpqc.getItemId(),
+ ctx.workstation() != null ? ctx.workstation().getProcessId() : 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;
adminUserApi.validateUser(reqVO.getInspectorUserId());
- // 鏍￠獙宸ュ崟瀛樺湪
- MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
- if (reqVO.getProcessId() != null && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
+ // 鏍￠獙宸ュ崟瀛樺湪涓斿凡纭锛堢敓浜ц鍗曢潪蹇呭～锛屾湭閫夋嫨鏃惰烦杩囷級
+ MesProWorkOrderDO workOrder = reqVO.getWorkOrderId() != null
+ ? workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId()) : null;
+ if (workstation != null && reqVO.getProcessId() != null
+ && ObjUtil.notEqual(workstation.getProcessId(), reqVO.getProcessId())) {
throw exception(PRO_WORKSTATION_PROCESS_MISMATCH);
}
// 鏍￠獙浠诲姟鍏崇郴锛堝鏋滄寚瀹氫簡浠诲姟锛�
@@ -206,24 +202,103 @@
if (reqVO.getTaskId() != null) {
task = taskService.validateTaskNotFinished(reqVO.getTaskId());
validateTaskRelation(task, workstation, workOrder, reqVO);
- } else {
+ } else if (workOrder != null && reqVO.getItemId() != null
+ && ObjUtil.notEqual(reqVO.getItemId(), workOrder.getProductId())) {
// 鏃犱换鍔℃椂锛宨temId 浠嶉渶涓庡伐鍗曚骇鍝佷竴鑷�
- if (reqVO.getItemId() != null && ObjUtil.notEqual(reqVO.getItemId(), workOrder.getProductId())) {
- throw exception(PRO_WORK_ORDER_PRODUCT_MISMATCH);
- }
+ throw exception(PRO_WORK_ORDER_PRODUCT_MISMATCH);
}
- return new SaveDataContext(workstation, task);
+ return new SaveDataContext(workstation, task, workOrder);
+ }
+
+ /**
+ * 纭畾妫�楠岀墿鏂欙細浠诲姟浼樺厛锛屽叾娆″伐鍗曚骇鍝侊紝閮芥病鏈夋椂鍙栬姹傛寚瀹氱殑浜у搧鐗╂枡锛堥兘鏈寚瀹氬垯涓虹┖锛�
+ */
+ private Long resolveItemId(MesQcIpqcSaveReqVO reqVO, SaveDataContext ctx) {
+ if (ctx.task() != null) {
+ return ctx.task().getItemId();
+ }
+ if (ctx.workOrder() != null) {
+ return ctx.workOrder().getProductId();
+ }
+ return reqVO.getItemId();
+ }
+
+ /**
+ * 纭畾璐ㄦ鏂规
+ *
+ * <p>浜у搧鐗╂枡宸茬粦瀹� IPQC 鏂规鏃舵部鐢ㄥ師閫昏緫锛氭湭鏄惧紡鎸囧畾鍙栫粦瀹氬垪琛ㄩ涓紝鏄惧紡鎸囧畾鍒欏繀椤诲懡涓粦瀹氬垪琛紱
+ * <p>浜у搧鐗╂枡鏈尮閰嶅埌浠讳綍鏂规锛堟湭閫夌敓浜ц鍗�/鐢熶骇浠诲姟/浜у搧鐗╂枡锛夋椂锛屾樉寮忔寚瀹氱殑鏂规鏀逛负鏍￠獙鏂规鏈韩锛�
+ * 瀛樺湪銆佸凡鍚敤銆佹娴嬬绫诲寘鍚繃绋嬫楠岋紝涓嶅啀瑕佹眰涓庝骇鍝佺墿鏂欑粦瀹氥��
+ */
+ private Long resolveTemplateId(Long itemId, Long explicitTemplateId) {
+ List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
+ itemId, MesQcTypeEnum.IPQC.getType(), null, null);
+ if (CollUtil.isNotEmpty(templateItems)) {
+ if (explicitTemplateId == null) {
+ return templateItems.get(0).getTemplateId();
+ }
+ return templateItems.stream()
+ .filter(available -> Objects.equals(available.getTemplateId(), explicitTemplateId))
+ .findFirst()
+ .orElseThrow(() -> exception(QC_NO_TEMPLATE)) // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
+ .getTemplateId();
+ }
+ // 浜у搧鐗╂枡鏈尮閰嶅埌浠讳綍 IPQC 鏂规
+ if (explicitTemplateId != null) {
+ return validateTemplateUsable(explicitTemplateId);
+ }
+ throw new ServiceException(QC_IPQC_NO_TEMPLATE.getCode(), buildNoTemplateMessage(itemId));
+ }
+
+ /**
+ * 鏍￠獙璐ㄦ鏂规鏈韩鍙敤锛氬瓨鍦ㄣ�佸凡鍚敤銆佹娴嬬绫诲寘鍚繃绋嬫楠岋紝杩斿洖鏂规缂栧彿
+ */
+ private Long validateTemplateUsable(Long templateId) {
+ MesQcTemplateDO template = templateService.getTemplate(templateId);
+ if (template == null) {
+ throw new ServiceException(QC_TEMPLATE_NOT_EXISTS.getCode(), StrUtil.format(
+ "鎵�閫夎川妫�鏂规涓嶅瓨鍦紙ID={}锛夛紝鍙兘宸茶鍒犻櫎锛岃鍒锋柊鍚庨噸鏂伴�夋嫨璐ㄦ鏂规", templateId));
+ }
+ if (!CommonStatusEnum.isEnable(template.getStatus())) {
+ throw exception(QC_IPQC_TEMPLATE_IS_DISABLE, template.getName());
+ }
+ if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.IPQC.getType())) {
+ throw exception(QC_IPQC_TEMPLATE_TYPE_NOT_MATCH, template.getName());
+ }
+ return template.getId();
+ }
+
+ /**
+ * 鏋勫缓銆屾棤鍙敤璐ㄦ鏂规銆嶇殑鎻愮ず锛氬尯鍒嗐�屾湁浜у搧鐗╂枡浣嗘湭缁戝畾鏂规銆嶄笌銆屾湭閫夊伐鍗�/浠诲姟/鐗╂枡銆�
+ */
+ private String buildNoTemplateMessage(Long itemId) {
+ if (itemId == null) {
+ return "鏈�夋嫨鐢熶骇璁㈠崟/鐢熶骇浠诲姟/浜у搧鐗╂枡锛屾棤娉曡嚜鍔ㄥ尮閰嶈川妫�鏂规锛�"
+ + "璇风洿鎺ラ�夋嫨銆岃川妫�鏂规銆嶅悗閲嶈瘯锛屾垨鍏堥�夋嫨鐢熶骇璁㈠崟/鐢熶骇浠诲姟浠ヨ嚜鍔ㄥ甫鍑鸿浜у搧宸茬粦瀹氱殑鏂规銆�";
+ }
+ return StrUtil.format("浜у搧鐗╂枡[{}]鏈粦瀹氥�岃繃绋嬫楠屻�嶈川妫�鏂规锛氳鍦ㄣ�愯川閲忕鐞�-璐ㄦ鏂规銆戜腑涓鸿鐗╂枡"
+ + "閰嶇疆妫�娴嬬绫诲寘鍚繃绋嬫楠岀殑鏂规锛屾垨鍦ㄦ湰鍗曟墜鍔ㄩ�夋嫨璐ㄦ鏂规銆�", describeItem(itemId));
+ }
+
+ /**
+ * 鎻忚堪浜у搧鐗╂枡锛岀敤浜庡紓甯告彁绀猴細浼樺厛缁欏嚭銆岀紪鐮� 鍚嶇О銆嶏紝鏌ヤ笉鍒版椂鍥為��涓虹墿鏂欑紪鍙�
+ */
+ private String describeItem(Long itemId) {
+ MesMdItemDO item = itemService.getItem(itemId);
+ return item != null ? item.getCode() + " " + item.getName() : "鐗╂枡缂栧彿 ID=" + itemId;
}
private void validateTaskRelation(MesProTaskDO task, MesMdWorkstationDO workstation,
MesProWorkOrderDO workOrder, MesQcIpqcSaveReqVO reqVO) {
- if (ObjUtil.notEqual(task.getWorkOrderId(), workOrder.getId())) {
+ // 鐢熶骇璁㈠崟銆佸伐浣嶅潎闈炲繀濉紝鏈�夋嫨鏃惰烦杩囧搴旀瘮瀵�
+ if (workOrder != null && 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);
}
@@ -528,7 +603,7 @@
+ "銆傝淇敼妯℃澘涓殑銆屾楠屽崟缂栧彿銆嶏紝鎴栧厛鍦ㄧ郴缁熶腑鍒犻櫎璇ョ紪鍙风殑妫�楠屽崟鍚庨噸鏂板鍏�");
}
reqVO.setCode(code);
- // 2. 鍚嶇О銆佹楠岀被鍨嬨�佸伐鍗曘�佸伐浣嶃�佽川妫�鏂规
+ // 2. 鍚嶇О銆佹楠岀被鍨嬨�佸伐鍗曘�佸伐浣嶃�佽川妫�鏂规锛堢敓浜у伐鍗曞彿銆佸伐浣嶅悕绉扮暀绌哄嵆涓嶅叧鑱旓紝涓嶅啀鎷︽埅锛�
if (StrUtil.isBlank(row.getName())) {
throw new IllegalArgumentException("妫�楠屽崟鍚嶇О涓嶈兘涓虹┖锛氳濉啓妯℃澘涓琛岀殑銆屾楠屽崟鍚嶇О銆嶅垪");
}
--
Gitblit v1.9.3