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

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

@@ -68,7 +68,7 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
-        packBean.setOrderByStr(bom.getOrderByParam()) ;
+        packBean.setOrderByStr(" order by createDatetime desc ") ;
         pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
 
         List<MesBom> bomList = baseRDao.findByHqlWherePage(packBean, pager);

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

@@ -63,7 +63,7 @@ public class MesCarSeriesLoosePartService extends BaseMesService<MesCarSeriesLoo
         DdlPreparedPack.getStringEqualPack(bean.getCustCode(),"custCode",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCarSeriesCode(),"carSeriesCode",packBean);
         DdlPreparedPack.getNumEqualPack(bean.getLoosePartType(),"loosePartType",packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getCustPartNo(),"custPartNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustPartNo(),"custPartNo",packBean);
     }
 
 }