Merge branch 'dev' into dev-wuhan-temp

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

@@ -831,7 +831,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.DESC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
 
         String numStr = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_NUM");
         int num = StringUtils.isEmpty(numStr) ? 50 : Integer.valueOf(numStr);
@@ -863,7 +863,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.DESC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
 
         String numStr = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_NUM");
         int num = StringUtils.isEmpty(numStr) ? 50 : Integer.valueOf(numStr);