From f3906aac6b43c6027ab1e87417d3123749e92bc4 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 11 Nov 2024 09:35:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?=
 =?UTF-8?q?=E8=AE=B0=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  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 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 155ea47..29704d4 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
@@ -172,9 +172,20 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
                     if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime()) && Objects.equals(mesDowntimeRecordDaoList.get(0).getReasonTypeCode(), "6"))  {
                         continue;
                     }
-                    ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob");
-                    mesDowntimeRecordDaoList.get(0).setSystemSyncStatus(2);
-                    mesDowntimeRecordRDao.update(mesDowntimeRecordDaoList.get(0));
+                    MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
+                    mesDowntimeRecord.setOrganizeCode(organizeCode);
+                    mesDowntimeRecord.setEquipId(mesEquipment.getEquipId());
+                    mesDowntimeRecord.setEquipmentCode(mesEquipment.getEquipmentCode());
+                    mesDowntimeRecord.setAreaCode(mesDowntimeRecordDaoList.get(0).getAreaCode());
+                    mesDowntimeRecord.setWorkCenterCode(mesDowntimeRecordDaoList.get(0).getWorkCenterCode());
+                    mesDowntimeRecord.setWorkCellCode(mesDowntimeRecordDaoList.get(0).getWorkCellCode());
+                    mesDowntimeRecord.setReasonCode(StringUtil.isEmpty(reason)?"21":reason);
+                    mesDowntimeRecord.setReasonTypeCode(StringUtil.isEmpty(type)?"6":type);
+                    ConvertBean.serviceModelInitialize(mesDowntimeRecord, "MesDowntimeRecordJob");
+                    mesDowntimeRecord.setSystemSyncStatus(2);
+                    mesDowntimeRecord.setModifyDatetime(null);
+
+                    mesDowntimeRecordRDao.insert(mesDowntimeRecord);
                 }
             } else {
                 DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode);

From 7fd55a504f0843af2e8e7236dd5e40cdb79253f9 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 12 Nov 2024 16:30:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B9=9F=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/ext/mes/apiservice/controller/base/BaseMesController.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
index f4d3129..6dd97b8 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java
@@ -449,6 +449,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
             for (T bean : beanList) {
                 ConvertBean.serviceModelInitialize(bean, userName);
                 bean.setOrganizeCode(organizeCode);
+                bean.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
             }
             baseService.insertBatch(beanList);