diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
index a94df38..ff9666e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java
@@ -355,8 +355,8 @@ public class OrderDetailController {
         if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) {
             filterErpOrderRequest.setOrderId("1");
         }
-        filterErpOrderRequest.setPage(1);
-        filterErpOrderRequest.setLimit(100);
+        filterErpOrderRequest.setPage(null);
+        filterErpOrderRequest.setLimit(null);
         List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
 
         OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
index e80eaba..48c470a 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
@@ -94,8 +94,12 @@ public class StockOrderDetailController {
         }
 
         StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk());
+        stockOrderDetailFilterRequest.setPage(null);
+        stockOrderDetailFilterRequest.setLimit(null);
         List<StockOrderDetailEntity> stockOrderDetailEntityList
                 = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
+
+
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
 
         if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index 19efa93..4295d13 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -315,6 +315,7 @@
 
         </where>
         group by io_codes.id
+        order by io_codes.id
     </select>
 
     <select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">