Merge branch 'uat-temp-xw-202501170000-44873' into dev

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;
     }