From 2acd70ca6ab67a3b00718633bc5d57827eeffe35 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 17 Jan 2025 10:50:21 +0800
Subject: [PATCH] =?UTF-8?q?44873=20PCN-=E6=89=B9=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=B7=A5=E5=8D=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F=E5=9F=BA=E4=BA=8E=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=2044883=20MES:PCN-=E6=89=B9=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=EF=BC=8C=E5=86=99=E5=85=A5=E6=8A=A5=E5=B7=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=AA=E5=86=99=E5=85=A5bom=5Fcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 13e0cbc..c1bd322 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -172,7 +172,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
 
 
         DdlPackBean packBean = getDdlPackBean(workOrder);
-
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"workOrderSeq","createDatetime"}, packBean);
         pager = PagerHelper.getPager(pager, workOrderRepository.findByHqlWhereCount(packBean));
 
         List<MesWorkOrder> resultList = workOrderRepository.findByHqlWherePage(packBean, pager);
@@ -1361,6 +1361,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);
         newMesProductOffLine.setBomTotalSize(bomTotalSize);
+        newMesProductOffLine.setBomCode(mesBom.getBomCode());
         ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser());
         return newMesProductOffLine;
     }