diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
index 2beb15d9..88e1f914 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
@@ -2,7 +2,6 @@ package com.nflg.wms.admin.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Sets;
@@ -39,7 +38,6 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.net.URL;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
@@ -151,26 +149,26 @@ public class NormalOrderController extends BaseController {
      */
     @PostMapping("exportPdfPerPage")
     public void exportPdfPerPage(HttpServletResponse response, @Valid @RequestBody @NotNull List<Long> ids) throws Exception {
-        List<DeliverNormalOrderVO> orders=new ArrayList<>();
-        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
-            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
-            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
-            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
-            orders.add(new DeliverNormalOrderVO()
-                    .setId(IdUtil.getSnowflakeNextId())
-                    .setMaterialNo(RandomUtil.randomNumbers(10))
-                    .setMaterialDesc(RandomUtil.randomString(10))
-                    .setBatchNum(batchNum)
-                    .setMinPackageNum(minPackageNum)
-                    .setSupplierCode(RandomUtil.randomString(10))
-                    .setSupplierName(RandomUtil.randomString(10))
-                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
-                    .setRowNo(RandomUtil.randomString(10))
-                            .setIndexNo(RandomUtil.randomString(10))
-                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
-            );
-        }
-//        List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
+//        List<DeliverNormalOrderVO> orders=new ArrayList<>();
+//        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
+//            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
+//            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
+//            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
+//            orders.add(new DeliverNormalOrderVO()
+//                    .setId(IdUtil.getSnowflakeNextId())
+//                    .setMaterialNo(RandomUtil.randomNumbers(10))
+//                    .setMaterialDesc(RandomUtil.randomString(10))
+//                    .setBatchNum(batchNum)
+//                    .setMinPackageNum(minPackageNum)
+//                    .setSupplierCode(RandomUtil.randomString(10))
+//                    .setSupplierName(RandomUtil.randomString(10))
+//                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
+//                    .setRowNo(RandomUtil.randomString(10))
+//                            .setIndexNo(RandomUtil.randomString(10))
+//                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
+//            );
+//        }
+        List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据");
         exportPdfPerPage(convert(orders),response);
     }
@@ -181,26 +179,26 @@ public class NormalOrderController extends BaseController {
      */
     @PostMapping("exportPdfOnePage")
     public void exportPdfOnePage(HttpServletResponse response, @Valid @RequestBody @NotNull List<Long> ids) throws Exception {
-        List<DeliverNormalOrderVO> orders=new ArrayList<>();
-        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
-            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
-            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
-            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
-            orders.add(new DeliverNormalOrderVO()
-                    .setId(IdUtil.getSnowflakeNextId())
-                    .setMaterialNo(RandomUtil.randomNumbers(10))
-                    .setMaterialDesc(RandomUtil.randomString(10))
-                    .setBatchNum(batchNum)
-                    .setMinPackageNum(minPackageNum)
-                    .setSupplierCode(RandomUtil.randomString(10))
-                    .setSupplierName(RandomUtil.randomString(10))
-                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
-                    .setRowNo(RandomUtil.randomString(10))
-                    .setIndexNo(RandomUtil.randomString(10))
-                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
-            );
-        }
-//        List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
+//        List<DeliverNormalOrderVO> orders=new ArrayList<>();
+//        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
+//            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
+//            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
+//            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
+//            orders.add(new DeliverNormalOrderVO()
+//                    .setId(IdUtil.getSnowflakeNextId())
+//                    .setMaterialNo(RandomUtil.randomNumbers(10))
+//                    .setMaterialDesc(RandomUtil.randomString(10))
+//                    .setBatchNum(batchNum)
+//                    .setMinPackageNum(minPackageNum)
+//                    .setSupplierCode(RandomUtil.randomString(10))
+//                    .setSupplierName(RandomUtil.randomString(10))
+//                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
+//                    .setRowNo(RandomUtil.randomString(10))
+//                    .setIndexNo(RandomUtil.randomString(10))
+//                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
+//            );
+//        }
+        List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据");
         exportPdfInAll(convert(orders),response);
     }
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
index 2b34f5f3..7af389fa 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.*;
+import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestTemplate;
@@ -31,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 
 import static cn.dev33.satoken.SaManager.log;
 
+@Component
 public class NormalPGIControllerService {
 
     @Resource
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderItemService.java
index 459ea933..dcd8d802 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderItemService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderItemService.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.repository.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.nflg.wms.common.pojo.vo.SRMOrderItemVO;
 import com.nflg.wms.repository.entity.WmsSrmOrderItem;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface IWmsSrmOrderItemService extends IService<WmsSrmOrderItem> {
 
     List<WmsSrmOrderItem> getByDeliverOrderId(@Valid @NotNull Long id);
+
+    SRMOrderItemVO getOrderItem(Long orderId);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java
index 5570b8dd..bea12a3a 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java
@@ -2,7 +2,9 @@ package com.nflg.wms.repository.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO;
 import com.nflg.wms.common.pojo.qo.SearchDeliverOrderQO;
+import com.nflg.wms.common.pojo.vo.SrmOrderVO;
 import com.nflg.wms.repository.entity.WmsSrmOrder;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -18,4 +20,6 @@ import jakarta.validation.constraints.NotNull;
 public interface IWmsSrmOrderService extends IService<WmsSrmOrder> {
 
     IPage<WmsSrmOrder> search(@Valid @NotNull SearchDeliverOrderQO request);
+
+    IPage<SrmOrderVO> search(@Valid SRMOrderSearchQO request);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderItemServiceImpl.java
index f31801da..a4bbf684 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderItemServiceImpl.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.repository.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.wms.common.pojo.vo.SRMOrderItemVO;
 import com.nflg.wms.repository.entity.WmsSrmOrderItem;
 import com.nflg.wms.repository.mapper.WmsSrmOrderItemMapper;
 import com.nflg.wms.repository.service.IWmsSrmOrderItemService;
@@ -23,4 +24,9 @@ public class WmsSrmOrderItemServiceImpl extends ServiceImpl<WmsSrmOrderItemMappe
     public List<WmsSrmOrderItem> getByDeliverOrderId(Long id) {
         return lambdaQuery().eq(WmsSrmOrderItem::getOrderId, id).list();
     }
+
+    @Override
+    public SRMOrderItemVO getOrderItem(Long orderId) {
+        return baseMapper.getOrderItem(orderId);
+    }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
index 6a7401c5..ea9a9332 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
@@ -4,7 +4,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO;
 import com.nflg.wms.common.pojo.qo.SearchDeliverOrderQO;
+import com.nflg.wms.common.pojo.vo.SrmOrderVO;
 import com.nflg.wms.repository.entity.WmsSrmOrder;
 import com.nflg.wms.repository.mapper.WmsSrmOrderMapper;
 import com.nflg.wms.repository.service.IWmsSrmOrderService;
@@ -31,4 +33,9 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl<WmsSrmOrderMapper, WmsSr
                 .le(Objects.nonNull(request.getEndDate()), WmsSrmOrder::getCreateTime, request.getEndDate())
                 .page(new Page<>(request.getPage(),request.getPageSize()));
     }
+
+    @Override
+    public IPage<SrmOrderVO> search(SRMOrderSearchQO request) {
+        return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
+    }
 }