From c69478ef7d073e7260fa5cc2abe9ff72a34ec2e0 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 18 Oct 2024 15:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95job=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesDowntimeRecordServiceImpl.java     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
index ad9852d..155ea47 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
@@ -134,12 +134,6 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
             if (StringUtil.isEmpty(mesProductionRecord)) {
                 DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode);
                 DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime);
-                if(!StringUtil.isEmpty(reason)){
-                    DdlPreparedPack.getStringEqualPack(reason, "reasonCode", ddlPackBeanDowntime);
-                }
-                if(!StringUtil.isEmpty(type)){
-                    DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
-                }
                 DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime);
 
                 List<MesDowntimeRecord> mesDowntimeRecordDaoList = mesDowntimeRecordRDao.findByHqlTopWhere(ddlPackBeanDowntime, 1);
@@ -175,7 +169,7 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
 
                 }else {
                     // 如果上一次停机还未结束，则不需要再生成一条新的记录
-                    if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime())) {
+                    if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime()) && Objects.equals(mesDowntimeRecordDaoList.get(0).getReasonTypeCode(), "6"))  {
                         continue;
                     }
                     ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob");
@@ -185,12 +179,6 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
             } else {
                 DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode);
                 DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime);
-                if(!StringUtil.isEmpty(reason)){
-                    DdlPreparedPack.getStringEqualPack(reason, "reasonCode", ddlPackBeanDowntime);
-                }
-                if(!StringUtil.isEmpty(type)){
-                    DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
-                }
                 DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime);
                 MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
                 if (mesDowntimeRecordDao != null) {