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/imports/MesQcImportHelper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/imports/MesQcImportHelper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/imports/MesQcImportHelper.java
index bfb5b63..c73f087 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/imports/MesQcImportHelper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/imports/MesQcImportHelper.java
@@ -219,11 +219,11 @@
}
/**
- * 瑙ｆ瀽鐢熶骇宸ュ崟缂栧彿锛屽熀浜庡伐鍗曞彿
+ * 瑙ｆ瀽鐢熶骇宸ュ崟缂栧彿锛屽熀浜庡伐鍗曞彿锛堥�夊～锛氬伐鍗曞彿鐣欑┖鏃惰繑鍥� null锛岃〃绀鸿琛屼笉鍏宠仈鐢熶骇宸ュ崟锛�
*/
public Long resolveWorkOrderId(String workOrderCode) {
if (StrUtil.isBlank(workOrderCode)) {
- throw new IllegalArgumentException("鐢熶骇宸ュ崟鍙蜂笉鑳戒负绌猴細璇峰～鍐欐ā鏉夸腑璇ヨ鐨勩�岀敓浜у伐鍗曞彿銆嶅垪");
+ return null;
}
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(workOrderCode.trim());
if (workOrder == null) {
@@ -234,11 +234,11 @@
}
/**
- * 瑙ｆ瀽宸ヤ綅缂栧彿锛屽熀浜庡伐浣嶅悕绉�
+ * 瑙ｆ瀽宸ヤ綅缂栧彿锛屽熀浜庡伐浣嶅悕绉帮紙閫夊～锛氬伐浣嶅悕绉扮暀绌烘椂杩斿洖 null锛岃〃绀鸿琛屼笉鍏宠仈宸ヤ綅锛�
*/
public Long resolveWorkstationId(String workstationName) {
if (StrUtil.isBlank(workstationName)) {
- throw new IllegalArgumentException("宸ヤ綅鍚嶇О涓嶈兘涓虹┖锛氳濉啓妯℃澘涓琛岀殑銆屽伐浣嶅悕绉般�嶅垪");
+ return null;
}
MesMdWorkstationDO workstation = workstationService.getWorkstationByName(workstationName.trim());
if (workstation == null) {
--
Gitblit v1.9.3