From 33e04796f1858a51c75a4b81070b62429c8a9c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Tue, 18 Jun 2024 22:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/step/MesMouldRecordGenerateStepService.java           | 1 +
 .../serviceimpl/step/MesProductResultErrorHandleStepService.java      | 4 ++--
 .../serviceimpl/step/MesProductionReocrdGenerateStepService.java      | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java
index 66debf6..776acbb 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java
@@ -98,6 +98,7 @@ public class MesMouldRecordGenerateStepService extends BaseStepService {
 
 
             MesProdMouldRecord mesProductionRecord = getMesProdMouldRecord(mesCellEquipContext, mouldNo, mesMouldMappingCfg);
+
             ConvertBean.serviceModelInitialize(mesProductionRecord, reqBean.getUserInfo());
             mesProdMouldRecords.add(mesProductionRecord);
         }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java
index 94f961f..13078f9 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java
@@ -73,7 +73,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
         // 获取加工结果
         String result = mesProductionDispatchContextStepService.getProductResultContext(reqBean);
         // 如果是报废或者可疑，需要编辑条码状态为不合格、并且nc判定需要新增一条记录
-        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getValue(), result)) {
+        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getCode(), result)) {
             return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "加工结果合格,无需记录异常");
         }
         // 获取条码列表
@@ -111,7 +111,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
             partInspection.setPartNo(mesProduceSn.getPartNo());
             partInspection.setPartName(mesProduceSn.getPartName());
             partInspection.setDefectTypeCode(mesDefectType.getDefectTypeCode());
-            partInspection.setInspectionDate(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMATTER));
+            partInspection.setInspectionDate(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MS_PATTERN));
             partInspection.setLotNo(mesProduceSn.getLotNo());
             if (!Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), result)) {
                 partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java
index 91911c8..d886e03 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java
@@ -126,11 +126,10 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService {
         mesProductionRecord.setProcessCode(mesProduceSn.getProcessCode());
         mesProductionRecord.setReportPartNo(mesProduceSn.getPartNo());
         mesProductionRecord.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
-        mesProductionRecord.setShiftCode(mesProduceSn.getShiftCode());
-        mesProductionRecord.setShiftGroup(mesProduceSn.getShiftGroup());
         mesProductionRecord.setWorkOrderNo(mesProduceSn.getWorkOrderNo());
         mesProductionRecord.setWorkCellCode(mesProduceSn.getWorkCellCode());
         mesProductionRecord.setWorkCenterCode(mesProduceSn.getWorkCenterCode());
+
         return mesProductionRecord;
     }