From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java
index 6382ec2..c309810 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java
@@ -2,9 +2,7 @@
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
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.feedback.MesProFeedbackDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcSourceDocTypeEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
@@ -86,32 +84,10 @@
*/
private String sourceDocCode;
- // ========== 鐢熶骇鍏宠仈 ==========
-
/**
- * 鐢熶骇宸ュ崟 ID
- *
- * 鍏宠仈 {@link MesProWorkOrderDO#getId()}
+ * 鎵瑰彿
*/
- private Long workOrderId;
- /**
- * 鐢熶骇浠诲姟 ID
- *
- * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO#getId()}
- */
- private Long taskId;
- /**
- * 宸ヤ綅 ID
- *
- * 鍏宠仈 {@link MesMdWorkstationDO#getId()}
- */
- private Long workstationId;
- /**
- * 宸ュ簭 ID
- *
- * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO#getId()}
- */
- private Long processId;
+ private String batchCode;
// ========== 鐗╂枡 ==========
@@ -202,6 +178,33 @@
* 鏋氫妇 {@link MesQcStatusEnum}
*/
private Integer status;
+
+ // ========== 鎶ュ憡琛ㄥご涓庣瀛� ==========
+
+ /**
+ * 閲囨牱鍦扮偣
+ */
+ private String samplingLocation;
+ /**
+ * 璇佷功缂栧彿/鍚堟牸璇佸彿
+ */
+ private String certificateNo;
+ /**
+ * 鎵ц鏍囧噯锛堝 GB/T6027锛�
+ */
+ private String executeStandard;
+ /**
+ * 澶嶆牳浜虹敤鎴风紪鍙�
+ *
+ * 鍏宠仈 AdminUserDO 鐨� id
+ */
+ private Long auditUserId;
+ /**
+ * 瀹℃牳浜虹敤鎴风紪鍙�
+ *
+ * 鍏宠仈 AdminUserDO 鐨� id
+ */
+ private Long approveUserId;
/**
* 澶囨敞
*/
--
Gitblit v1.9.3