diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 0d74d7d..69e844a 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -940,7 +940,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             List<String> centerList = Arrays.asList(workCenterCodes.split(","));
             DdlPreparedPack.getInPack(centerList, "workCenterCode", ddlPackBean);
         }*/
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
 
         String numStr = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_NUM");
         int num = StringUtils.isEmpty(numStr) ? 50 : Integer.valueOf(numStr);
@@ -972,7 +972,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             List<String> centerList = Arrays.asList(workCenterCodes.split(","));
             DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean);
         }
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
 
         String numStr = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_NUM");
         int num = StringUtils.isEmpty(numStr) ? 50 : Integer.valueOf(numStr);
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java
index cd23149..8822731 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java
@@ -82,35 +82,31 @@ public class MesFunctionEquDowntimeService extends BaseSwsService implements IFs
             if (!StringUtil.isEmpty(type)) {
                 DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
             }
+            DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, ddlPackBeanDowntime);
             MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
-            if (StringUtil.isEmpty(mesDowntimeRecordDao)) {
-                //新增设备停机记录
-                MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
-                mesDowntimeRecord.setOrganizeCode(organizeCode);
-                mesDowntimeRecord.setEquipId(mesEquipment.getEquipId());
-                mesDowntimeRecord.setEquipmentCode(mesEquipment.getEquipmentCode());
-                mesDowntimeRecord.setAreaCode(reqBean.getAreaCode());
-                mesDowntimeRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
-                mesDowntimeRecord.setWorkCellCode(reqBean.getWorkCellCode());
-                mesDowntimeRecord.setReasonCode(StringUtil.isEmpty(reason) ? "" : reason);
-                mesDowntimeRecord.setReasonTypeCode(StringUtil.isEmpty(type) ? "" : type);
-                ConvertBean.serviceModelInitialize(mesDowntimeRecord, userInfo);
-
-                mesDowntimeRecordRDao.insert(mesDowntimeRecord);
-//                //将当前新增数据的create_date_time时间些到上一条记录的modify_date_time字段
-//                DdlPackBean ddlPackBeanOt = DdlPackBean.getDdlPackBean(organizeCode);
-//                DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanOt);
-//                ddlPackBeanOt.setWhereAppend(ddlPackBeanOt.getWhereAppend() + " order by createDatetime desc ");
-//                MesDowntimeRecord mesDowntimeRecordOt = mesDowntimeRecordRDao.getByProperty(ddlPackBeanOt);
-//                if (StringUtil.isEmpty(mesDowntimeRecordOt)) {
-//                    mesDowntimeRecordOt.setModifyDatetime(mesDowntimeRecord.getCreateDatetime());
-//                    mesDowntimeRecordOt.setModifyUser(userInfo);
-//                    mesDowntimeRecordRDao.update(mesDowntimeRecordOt);
-//                }
-            } else {
-                ConvertBean.serviceModelUpdate(mesDowntimeRecordDao, "MesDowntimeRecordJob");
-                mesDowntimeRecordRDao.update(mesDowntimeRecordDao);
+            if (!StringUtil.isEmpty(mesDowntimeRecordDao)) {
+                // 如果有停机结束时间，则不需要修改，否则需要
+                if (StringUtil.isEmpty(mesDowntimeRecordDao.getModifyDatetime())) {
+                    ConvertBean.serviceModelUpdate(mesDowntimeRecordDao, "MesDowntimeRecordJob");
+                    mesDowntimeRecordRDao.update(mesDowntimeRecordDao);
+                }
             }
+
+            //新增设备停机记录
+            MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
+            mesDowntimeRecord.setOrganizeCode(organizeCode);
+            mesDowntimeRecord.setEquipId(mesEquipment.getEquipId());
+            mesDowntimeRecord.setEquipmentCode(mesEquipment.getEquipmentCode());
+            mesDowntimeRecord.setAreaCode(reqBean.getAreaCode());
+            mesDowntimeRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
+            mesDowntimeRecord.setWorkCellCode(reqBean.getWorkCellCode());
+            mesDowntimeRecord.setReasonCode(StringUtil.isEmpty(reason) ? "" : reason);
+            mesDowntimeRecord.setReasonTypeCode(StringUtil.isEmpty(type) ? "" : type);
+            ConvertBean.serviceModelInitialize(mesDowntimeRecord, userInfo);
+            mesDowntimeRecord.setModifyDatetime(null);
+            mesDowntimeRecordRDao.insert(mesDowntimeRecord);
+
+
             return true;
         } else {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode());
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
index 254beb2..62849c4 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
@@ -247,10 +247,10 @@ public class MesPcnExtConstWords {
     public static final String LOCATION = "location";
     //库位序号
     public static final String LOCATION_NUMBER = "locationNumber";
-    //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties)
-    public static final String[] BASE_BEAN_FIELDS = {ID, IS_DELETED, IS_VALID, CREATE_DATE_TIME, CREATE_USER, MODIFY_DATE_TIME, MODIFY_USER, DESCRIPTION, REMARK, SYSTEM_SYNC_DATE_TIME, SYSTEM_SYNC_STATUS};
 
 
+    //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties)
+    public static final String[] BASE_BEAN_FIELDS = {ID, IS_DELETED, IS_VALID, CREATE_DATE_TIME, CREATE_USER, MODIFY_DATE_TIME, MODIFY_USER, DESCRIPTION, REMARK, SYSTEM_SYNC_DATE_TIME, SYSTEM_SYNC_STATUS};
     // 客制化条码长度:通用
     public static final Integer CUSTOMER_SN_LENGTH_GM = 58;
     // 日志类型