diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockListDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockListDto.java
index b916402f..ef5b72b0 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockListDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockListDto.java
@@ -23,7 +23,6 @@ public class TbProductStockListDto {
     private BigDecimal saleNumber;
     private BigDecimal lossNumber;
     private BigDecimal refundNumber;
-
     private BigDecimal stockInNumber;
     private BigDecimal stockOutNumber;
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
index dc40d460..09bea236 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
@@ -33,31 +33,28 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
             "info.product_id ",nativeQuery = true)
     List<StockCountDTO> countStock( @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    @Query(value = "SELECT\n" +
-            "info.shop_id AS shop_id,\n" +
-            "info.product_id AS pro_id,\n" +
-            "info.product_name AS pro_name,\n" +
-            "info.product_sku_id AS sku_id,\n" +
-            "pro.is_stock,\n" +
-            "info.product_sku_name AS sku_name,\n" +
-            "unit.NAME AS unit_name,\n" +
-            "SUM( CASE WHEN orders.order_type != 'return' THEN info.num ELSE 0 END ) - SUM( CASE WHEN orders.order_type = 'return' THEN info.num ELSE 0 END ) AS stock_count,\n" +
-            "CASE\n" +
-            "\n" +
-            "WHEN pro.is_distribute = 0 THEN\n" +
-            "sku.stock_number ELSE pro.stock_number \n" +
-            "END AS stock_number, ifnull(sku.spec_snap, '') spec_snap\n" +
-            "FROM\n" +
-            "tb_order_detail info\n" +
-            "LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" +
-            "LEFT JOIN tb_product pro ON info.product_id = pro.id\n" +
-            "LEFT JOIN tb_product_sku sku ON info.product_sku_id = sku.id\n" +
-            "LEFT JOIN tb_shop_unit unit ON unit.id = pro.unit_id \n" +
-            "WHERE\n" +
-            "orders.id = :orderId \n" +
-            "AND ( info.STATUS = 'closed' OR info.STATUS = 'refund' ) \n" +
-            "GROUP BY\n" +
-            "info.product_id,\n" +
-            "info.product_sku_id;",nativeQuery = true)
+    @Query(value = "SELECT " +
+            "info.shop_id AS shop_id," +
+            "info.product_id AS pro_id," +
+            "info.product_name AS pro_name," +
+            "info.product_sku_id AS sku_id," +
+            "pro.is_stock," +
+            "info.product_sku_name AS sku_name," +
+            "unit.NAME AS unit_name," +
+            "SUM( CASE WHEN orders.order_type != 'return' THEN info.num ELSE 0 END ) - SUM( CASE WHEN orders.order_type = 'return' THEN info.num ELSE 0 END ) AS stock_count," +
+            " pro.stock_number AS stock_number, " +
+            " ifnull(sku.spec_snap, '') spec_snap " +
+            " FROM " +
+            " tb_order_detail info" +
+            " LEFT JOIN tb_order_info orders ON orders.id = info.order_id" +
+            " LEFT JOIN tb_product pro ON info.product_id = pro.id" +
+            " LEFT JOIN tb_product_sku sku ON info.product_sku_id = sku.id" +
+            " LEFT JOIN tb_shop_unit unit ON unit.id = pro.unit_id " +
+            " WHERE" +
+            " orders.id = :orderId " +
+            " AND ( info.STATUS = 'closed' OR info.STATUS = 'refund' ) " +
+            " GROUP BY " +
+            " info.product_id," +
+            " info.product_sku_id;",nativeQuery = true)
     List<StockCountDTO> countStockById(Integer orderId);
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
index b064b51b..39c4e010 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
@@ -14,7 +14,7 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
 
     @Query(value = "SELECT" +
             " d.product_id as id," +
-            " pro.product_name AS name," +
+            " pro.name AS name," +
 //            " d.spec_snap AS spec_snap," +
             " pro.stock_number AS stock_number," +
             " SUM( CASE WHEN d.sub_type = - 1 THEN ABS(d.stock_number) ELSE 0 END ) AS sub_count_number," +
@@ -22,6 +22,8 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
             " SUM( CASE WHEN d.type IN ( '供应商出库', '盘点出库', '其他出库' ) THEN ABS(d.stock_number) ELSE 0 END ) AS sub_number," +
             " SUM( CASE WHEN d.type = '售出记录' THEN ABS(d.stock_number) ELSE 0 END ) AS sale_number," +
             " SUM( CASE WHEN d.type = '报损' THEN ABS(d.stock_number) ELSE 0 END ) AS loss_number," +
+            " null AS stock_in_number," +
+            " null AS stock_out_number," +
             " SUM( CASE WHEN d.type = '退单' THEN ABS(d.stock_number) ELSE 0 END ) AS refund_number " +
             "FROM" +
             " tb_product_stock_detail d " +