From 572503cacec85cbe87954dad7864705b4c8a482f Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Tue, 11 Jun 2024 11:25:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?41238=20=E7=89=A9=E6=96=99bom=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=A1=E6=95=B0=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
index f29f5b2..bd6b7ed 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
+++ b/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);

From 6b99baa3c77f429f145edc7b6a3566d71e4be9c7 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Tue, 11 Jun 2024 11:56:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?41232=20MES-PC=EF=BC=9A=E8=BD=A6=E7=B3=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java
index 021d634..df99319 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java
+++ b/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);
     }
 
 }