Merge remote-tracking branch 'origin/dev' into dev-wuhan

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

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