From 19d2f79f77c78cba99e653abd45e06420d3679fd Mon Sep 17 00:00:00 2001
From: YiLiLin <Yili_Lin@fw-mes.com>
Date: Mon, 24 Jul 2023 14:23:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=A6=81=E5=9B=A0&?=
 =?UTF-8?q?=E9=A0=BB=E7=8E=87=E7=89=A9=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs: #
---
 .../com/foreverwin/iep/qms/constant/Factor.java  | 12 ++++++++++++
 .../com/foreverwin/iep/qms/constant/Freq.java    | 16 ++++++++++++++++
 .../service/impl/QmsInspecJobServiceImpl.java    | 10 ++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 qms-api/src/main/java/com/foreverwin/iep/qms/constant/Factor.java
 create mode 100644 qms-api/src/main/java/com/foreverwin/iep/qms/constant/Freq.java

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Factor.java b/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Factor.java
new file mode 100644
index 0000000..947f158
--- /dev/null
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Factor.java
@@ -0,0 +1,12 @@
+package com.foreverwin.iep.qms.constant;
+
+public class Factor {
+
+    public static final String OPERATION = "Operation";
+    public static final String PRODUCT = "Product";
+    public static final String QC_USER = "QCUser";
+    public static final String VENDOR = "Vendor";
+    public static final String SHIFT = "Shift";
+    public static final String EQUIPMENT = "Equipment";
+    public static final String INSTRUMENT = "Instrument";
+}
diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Freq.java b/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Freq.java
new file mode 100644
index 0000000..dbea781
--- /dev/null
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/constant/Freq.java
@@ -0,0 +1,16 @@
+package com.foreverwin.iep.qms.constant;
+
+public class Freq {
+
+    public static final String CHK_FIRST_SFC = "CHK_FIRST_SFC"; // 工单第一个生产的生产批
+    public static final String CHK_DAILY_FIRST_SFC = "CHK_DAILY_FIRST_SFC"; // 每日第一个生产的生产批
+    public static final String CHK_CHANGE_PRODUCT = "CHK_CHANGE_PRODUCT"; // 更换产品后第一个生产的生产批
+    public static final String CHK_CHANGE_MOULD = "CHK_CHANGE_MOULD"; // 设备换工具后第一个生产的生产批
+    public static final String CHK_MAINTEN_FIRST_SFC = "CHK_MAINTEN_FIRST_SFC"; // 设备维修后第一个生产的生产批
+    public static final String CHK_STOP_AFTER_SFC = "CHK_STOP_AFTER_SFC"; // 设备停机N小时以上, 生产的第一个生产批
+    public static final String CHK_INTERVAL_HOUR = "CHK_INTERVAL_HOUR"; // 生产单一产品每N小时
+    public static final String CHK_SEVERAL_SFC = "CHK_SEVERAL_SFC"; // 每N个生产批
+    public static final String CHK_INTERVAL_HOUR2 = "CHK_INTERVAL_HOUR2"; // 机台生产每N小时
+    public static final String CHK_DAILY_FIXED_TIME = "CHK_DAILY_FIXED_TIME"; // 每日固定N点
+    public static final String MANUAL = "MANUAL"; // 手动
+}
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 f5d5c24..0920266 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
@@ -23,6 +23,8 @@ import com.foreverwin.iep.production.dto.NextNumberRetrieveRequest;
 import com.foreverwin.iep.production.entity.NextNumber;
 import com.foreverwin.iep.production.feign.RemoteNextNumberService;
 import com.foreverwin.iep.production.feign.RemoteRouterService;
+import com.foreverwin.iep.qms.constant.Factor;
+import com.foreverwin.iep.qms.constant.Freq;
 import com.foreverwin.iep.qms.domain.InspecJob;
 import com.foreverwin.iep.qms.domain.Item;
 import com.foreverwin.iep.qms.domain.Resource;
@@ -136,7 +138,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
 
         if (ObjectUtil.isNull(qmsInspecJob)) {
             if (StrUtil.isBlank(qcFreq)) {
-                qcFreq = "MANUAL";
+                qcFreq = Freq.MANUAL;
             }
 
             qmsInspecJob = new QmsInspecJob();
@@ -188,13 +190,13 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
                 qmsInspecFactor.setFactorBo(qcItemFactor.getFactorBo());
 
                 switch (HandleBoProcessor.trimHandle(qcItemFactor.getFactorBo())) {
-                    case "Operation":
+                    case Factor.OPERATION:
                         qmsInspecFactor.setValue(operation);
                         break;
-                    case "Product":
+                    case Factor.PRODUCT:
                         qmsInspecFactor.setValue(item);
                         break;
-                    case "Equipment":
+                    case Factor.EQUIPMENT:
                         qmsInspecFactor.setValue(resrce);
                         break;
                 }