Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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

@@ -272,7 +272,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringSmallerPack(bean.getStartTimeEnd(), "planStartTime", packBean);
         DdlPreparedPack.getStringBiggerPack(bean.getEndTimeStart(), "planEndTime", packBean);
         DdlPreparedPack.getStringSmallerPack(bean.getEndTimeEnd(), "planEndTime", packBean);
-        packBean.setOrderByStr(" order by createDatetime desc,workOrderSeq desc ");
+        packBean.setOrderByStr(" order by createDatetime desc,workOrderSeq asc,workOrderNo asc ");
     }
 
     @Override