设备停机修改

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -904,7 +904,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);
@@ -936,7 +936,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);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java

@@ -82,6 +82,16 @@ 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)) {
+                // 如果有停机结束时间，则不需要修改，否则需要
+                if (StringUtil.isEmpty(mesDowntimeRecordDao.getModifyDatetime())) {
+                    ConvertBean.serviceModelUpdate(mesDowntimeRecordDao, "MesDowntimeRecordJob");
+                    mesDowntimeRecordRDao.update(mesDowntimeRecordDao);
+                }
+            }
+
             //新增设备停机记录
             MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
             mesDowntimeRecord.setOrganizeCode(organizeCode);
@@ -97,11 +107,6 @@ public class MesFunctionEquDowntimeService extends BaseSwsService implements IFs
             mesDowntimeRecordRDao.insert(mesDowntimeRecord);
 
 
-            MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
-            if (!StringUtil.isEmpty(mesDowntimeRecordDao)) {
-                ConvertBean.serviceModelUpdate(mesDowntimeRecordDao, "MesDowntimeRecordJob");
-                mesDowntimeRecordRDao.update(mesDowntimeRecordDao);
-            }
             return true;
         } else {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode());