From 70abb276bcbdd32253b553fe48d433927fc45e12 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 12 Oct 2024 14:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AE=B0=E5=BD=95=E5=95=86=E5=93=81?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/product/TbProductStockListDto.java | 1 - .../order/StockCountRepository.java | 49 ++++++++--------- .../product/ProductStockCountRepository.java | 4 +- .../TbProductStockDetailServiceImpl.java | 52 +++++++++---------- 4 files changed, 52 insertions(+), 54 deletions(-) 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 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 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 stockCountDTOS = stockCountRepository.countStockById(orderId); log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS); - stockCountDTOS.forEach(s -> { - //客座费不统计 - if (s.getProId() > 0) { - if (s.getStockCount() > 0) { - TbProductStockDetail productStockDetail = new TbProductStockDetail(); - productStockDetail.setCreatedAt(System.currentTimeMillis()); - productStockDetail.setUpdatedAt(System.currentTimeMillis()); - productStockDetail.setShopId(s.getShopId()); - productStockDetail.setProductId(s.getProId().toString()); - productStockDetail.setProductName(s.getProName()); - productStockDetail.setOrderId(orderId.toString()); -// productStockDetail.setSkuId(s.getSkuId().toString()); - productStockDetail.setIsStock(s.getIsStock());//是否开启库存 - productStockDetail.setLeftNumber(s.getStockNumber() + s.getStockCount());//原库存 - productStockDetail.setSpecSnap(s.getSpecSnap()); - productStockDetail.setUnitName(s.getUnitName()); - productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount())); - productStockDetail.setSourcePath("NORMAL"); - productStockDetail.setType("售出记录"); - productStockDetail.setRemark("售出记录:" + orderId); - productStockDetail.setSubType(-1); - tbProductStockDetailRepository.save(productStockDetail); - } - skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount()); - } - }); +// stockCountDTOS.forEach(s -> { +// //客座费不统计 +// if (s.getProId() > 0) { +// if (s.getStockCount() > 0) { +// TbProductStockDetail productStockDetail = new TbProductStockDetail(); +// productStockDetail.setCreatedAt(System.currentTimeMillis()); +// productStockDetail.setUpdatedAt(System.currentTimeMillis()); +// productStockDetail.setShopId(s.getShopId()); +// productStockDetail.setProductId(s.getProId().toString()); +// productStockDetail.setProductName(s.getProName()); +// productStockDetail.setOrderId(orderId.toString()); +//// productStockDetail.setSkuId(s.getSkuId().toString()); +// productStockDetail.setIsStock(s.getIsStock());//是否开启库存 +// productStockDetail.setLeftNumber(s.getStockNumber() + s.getStockCount());//原库存 +// productStockDetail.setSpecSnap(s.getSpecSnap()); +// productStockDetail.setUnitName(s.getUnitName()); +// productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount())); +// productStockDetail.setSourcePath("NORMAL"); +// productStockDetail.setType("售出记录"); +// productStockDetail.setRemark("售出记录:" + orderId); +// productStockDetail.setSubType(-1); +// tbProductStockDetailRepository.save(productStockDetail); +// } +// skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount()); +// } +// }); } }