czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

耗材报损 

耗材记录统计bug
This commit is contained in:
wangw 2024-09-25 17:20:35 +08:00
parent 46beff3cd9
commit faa463e396
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoFlow.java
View File

@ -97,6 +97,12 @@ public class TbConsInfoFlow implements Serializable {
@Column(name = "`order_no`")
@ApiModelProperty(value = "订单编号")
private String orderNo;
@Column(name = "`cover_img`")
@ApiModelProperty(value = "图片")
private String coverImg;
@Column(name = "`remark`")
@ApiModelProperty(value = "备注")
private String remark;
@Transient
@TableField(exist = false)

3
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoFlowDto.java
View File

@ -51,6 +51,9 @@ public class TbConsInfoFlowDto implements Serializable {
private Integer orderId;
private String orderNo;
private String coverImg;
private String remark;
}

28
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
View File

@ -21,12 +21,12 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" pro.product_name AS name," +
// " d.spec_snap AS spec_snap," +
" pro.stock_number AS stock_number," +
" SUM( CASE WHEN d.sub_type = - 1 THEN d.stock_number ELSE 0 END ) AS sub_count_number," +
" SUM( CASE WHEN d.type IN ( '供应商入库', '盘点入库', '其他入库' ) THEN d.stock_number ELSE 0 END ) AS add_number," +
" SUM( CASE WHEN d.type IN ( '供应商出库', '盘点出库', '其他出库' ) THEN d.stock_number ELSE 0 END ) AS sub_number," +
" SUM( CASE WHEN d.type = '售出记录' THEN d.stock_number ELSE 0 END ) AS sale_number," +
" SUM( CASE WHEN d.type = '报损' THEN d.stock_number ELSE 0 END ) AS loss_number," +
" SUM( CASE WHEN d.type = '退单' THEN d.stock_number ELSE 0 END ) AS refund_number " +
" SUM( CASE WHEN d.sub_type = - 1 THEN ABS(d.stock_number) ELSE 0 END ) AS sub_count_number," +
" SUM( CASE WHEN d.type IN ( '供应商入库', '盘点入库', '其他入库' ) THEN ABS(d.stock_number) ELSE 0 END ) AS add_number," +
" 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," +
" SUM( CASE WHEN d.type = '退单' THEN ABS(d.stock_number) ELSE 0 END ) AS refund_number " +
"FROM" +
" tb_product_stock_detail d " +
" INNER JOIN tb_product pro ON d.product_id = pro.id " +
@ -59,13 +59,13 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
@Query("SELECT new cn.ysk.cashier.vo.TbProductStockCountVo( " +
" SUM( pro.stockNumber ) , " +
" SUM( CASE WHEN detail.subType = 1 THEN detail.stockNumber ELSE 0 END ) , " +
" SUM( CASE WHEN detail.subType = - 1 THEN detail.stockNumber ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type IN ( '供应商入库', '盘点入库', '其他入库' ) THEN detail.stockNumber ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type IN ( '供应商出库', '盘点出库', '其他出库' ) THEN detail.stockNumber ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type = '售出记录' THEN detail.stockNumber ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type = '报损' THEN detail.stockNumber ELSE 0 END ) ," +
" SUM( CASE WHEN detail.type = '退单' THEN detail.stockNumber ELSE 0 END ))" +
" SUM( CASE WHEN detail.subType = 1 THEN ABS(detail.stockNumber) ELSE 0 END ) , " +
" SUM( CASE WHEN detail.subType = - 1 THEN ABS(detail.stockNumber) ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type IN ( '供应商入库', '盘点入库', '其他入库' ) THEN ABS(detail.stockNumber) ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type IN ( '供应商出库', '盘点出库', '其他出库' ) THEN ABS(detail.stockNumber) ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type = '售出记录' THEN ABS(detail.stockNumber) ELSE 0 END ) , " +
" SUM( CASE WHEN detail.type = '报损' THEN ABS(detail.stockNumber) ELSE 0 END ) ," +
" SUM( CASE WHEN detail.type = '退单' THEN ABS(detail.stockNumber) ELSE 0 END ))" +
"FROM " +
" TbProductStockDetail detail " +
" INNER JOIN TbProduct pro ON detail.productId = pro.id " +
@ -151,7 +151,7 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
"FROM " +
" TbConsInfoFlow flow " +
" INNER JOIN TbConsInfo cons ON flow.consId = cons.id " +
" AND cons.shopId = : shopId " +
" AND cons.shopId = :shopId " +
" AND (:conTypeId IS NULL OR cons.conTypeId = :conTypeId ) " +
" AND (:conName IS NULL OR flow.conName LIKE %:conName%) " +
"WHERE " +