From d9dc3fdeca6e48847b0a415606ee75794b3e2b2c Mon Sep 17 00:00:00 2001
From: leiqiaozhen <leiqiaozhen@semi-tech.com>
Date: Wed, 11 Dec 2024 13:59:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=A6=E5=8F=91=E5=85=A8=E6=A3=80/?=
 =?UTF-8?q?=E6=8A=BD=E6=A3=80)=EF=BC=9A=201.=E7=94=9F=E4=BA=A7=E6=89=B9?=
 =?UTF-8?q?=E4=B8=8E=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E5=90=8D=E6=94=B9=E4=B8=BA=20z=5Fqms=5Fprodu?=
 =?UTF-8?q?ction=5Flot=5Finspect=5Ftask=5Frelation=202.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZProductionLotInspectTaskRelation.java    |  5 ++---
 .../service/impl/QmsInspecJobServiceImpl.java | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/ZProductionLotInspectTaskRelation.java b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/ZProductionLotInspectTaskRelation.java
index 84069be..47a1eea 100644
--- a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/ZProductionLotInspectTaskRelation.java
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/ZProductionLotInspectTaskRelation.java
@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -20,14 +19,14 @@ import java.time.LocalDateTime;
  * @date 2024-12-10 14:06:33
  */
 @Data
-@TableName("z_production_lot_inspect_task_relation")
+@TableName("z_qms_production_lot_inspect_task_relation")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "生产批与检验任务关系表")
 public class ZProductionLotInspectTaskRelation extends Model<ZProductionLotInspectTaskRelation> {
 
     private static final long serialVersionUID = 1L;
 
-    public static final String KW_Z_PRODUCTION_LOT_INSPECT_TASK_RELATION_BO = "ZProductionLotInspectTaskRelationBO";
+    public static final String KW_Z_PRODUCTION_LOT_INSPECT_TASK_RELATION_BO = "ZQmsProductionLotInspectTaskRelationBO";
 
     /**
      * 主键
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
index 630019e..9a6c395 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
@@ -562,6 +562,8 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
         String operation = inspecJob.getOperation();
         // 获取 检验细类
         String qcSubCategories = inspecJob.getQcSubCategories();
+        // 非空校验
+        nonEmptyCheck(lotNo, operation, qcSubCategories);
         // 获取 触发点
         String triggerPoint = inspecJob.getTriggerPoint();
         // 获取用户
@@ -591,6 +593,24 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
             throw BusinessException.build("站点[" + site + "]，生产批号[" + lotNo + "]，工序[" + operation + "]，检验细类[" + qcSubCategories + "]在[生产批与检验任务关系表]已存在");
         }
     }
+
+    // 校验
+    private void nonEmptyCheck(String lotNo , String operation, String qcSubCategories) {
+        // 如果 生产批号lotNo 为空，则报错
+        if (StrUtil.isBlank(lotNo)) {
+            throw BusinessException.build("往[生产批与检验任务关系表]插入数据时，生产批号不能为空");
+        }
+
+        // 如果 工序operation 为空，则报错
+        if (StrUtil.isBlank(operation)) {
+            throw BusinessException.build("往[生产批与检验任务关系表]插入数据时，工序不能为空");
+        }
+
+        // 如果 检验细类qcSubCategories 为空，则报错
+        if (StrUtil.isBlank(qcSubCategories)) {
+            throw BusinessException.build("往[生产批与检验任务关系表]插入数据时，检验细类不能为空");
+        }
+    }
     private void toSpc(QmsInspecJob job) {
         String site = TenantContextHolder.getTenantId();
         String url = remoteParamService.getByKey("SPC_RESTFUL_URL", SecurityConstants.FROM_IN).getData();