Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
牛叉闪闪
2024-07-25 15:02:43 +08:00

View File

@@ -40,19 +40,18 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
"pro.is_stock,\n" + "pro.is_stock,\n" +
"info.product_sku_name AS sku_name,\n" + "info.product_sku_name AS sku_name,\n" +
"unit.NAME AS unit_name,\n" + "unit.NAME AS unit_name,\n" +
" SUM(CASE WHEN orders.order_type != 'return' THEN info.num ELSE 0 END) \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" +
" - SUM(CASE WHEN orders.order_type = 'return' THEN info.num ELSE 0 END) AS stock_count, \n" + "CASE\n" +
" CASE WHEN pro.is_distribute = '0' THEN sku.stock_number ELSE pro.stock_number END AS stock_number \n" + "\n" +
"WHEN pro.is_distribute = 0 THEN\n" +
"sku.stock_number ELSE pro.stock_number \n" +
"END AS stock_number\n" +
"FROM\n" + "FROM\n" +
" tb_order_info orders \n" + "tb_order_detail info\n" +
"LEFT JOIN \n" + "LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" +
" tb_order_detail info ON orders.id = info.order_id \n" + "LEFT JOIN tb_product pro ON info.product_id = pro.id\n" +
"LEFT JOIN \n" + "LEFT JOIN tb_product_sku sku ON info.product_sku_id = sku.id\n" +
" tb_product pro ON info.product_id = pro.id \n" + "LEFT JOIN tb_shop_unit unit ON unit.id = pro.unit_id \n" +
"LEFT JOIN \n" +
" (SELECT product_id, SUM(stock_number) AS stock_number FROM tb_product_sku GROUP BY product_id) sku ON info.product_id = sku.product_id \n" +
"LEFT JOIN \n" +
" tb_shop_unit unit ON unit.id = pro.unit_id \n" +
"WHERE\n" + "WHERE\n" +
"orders.id = :orderId \n" + "orders.id = :orderId \n" +
"AND ( info.STATUS = 'closed' OR info.STATUS = 'refund' ) \n" + "AND ( info.STATUS = 'closed' OR info.STATUS = 'refund' ) \n" +
@@ -63,6 +62,6 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
"info.product_name,\n" + "info.product_name,\n" +
"pro.is_stock,\n" + "pro.is_stock,\n" +
"info.product_sku_name,\n" + "info.product_sku_name,\n" +
" unit.NAME",nativeQuery = true) "unit.NAME;",nativeQuery = true)
List<StockCountDTO> countStockById(Integer orderId); List<StockCountDTO> countStockById(Integer orderId);
} }