展示组件

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);
         }

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());

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;
     }