库存记录 存入 统计 列表 详情列表

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java

@@ -0,0 +1,23 @@
+package cn.ysk.cashier.dto.product;
+
+import cn.ysk.cashier.dto.BaseQueryDto;
+import lombok.Data;
+
+/**
+* @website https://eladmin.vip
+* @author lyf
+* @date 2024-01-19
+**/
+@Data
+public class TbProductStockCountQueryCriteria extends BaseQueryDto {
+
+    private String productId;
+
+    private String productName;
+
+    private String categoryId;
+
+    private Integer page = 0;
+
+    private Integer size = 10;
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockDetailQueryCriteria.java

@@ -1,18 +1,3 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.dto.product;
 
 import lombok.Data;
@@ -29,36 +14,33 @@ import org.apache.commons.lang3.StringUtils;
 public class TbProductStockDetailQueryCriteria{
 
     /** 精确 */
-    @Query
-    private String skuId;
+//    @Query
+//    private String skuId;
 
     /** 精确 */
     @Query
     private String productId;
-
+    @Query
+    private String shopId;
     /** 精确 */
-    @Query
-    private String productName;
+//    @Query
+//    private String productName;
 
-    @Query
-    private String type;
+    private String column;
+
+    @Query(type = Query.Type.IN)
+    private List<String> type;
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Long> createdAt;
-    @Query
-    private Long createTime;
-    @Query
-    private Long endTime;
+//    @Query
+//    private Long createTime;
+//    @Query
+//    private Long endTime;
 
     private Integer page;
 
     private Integer size;
 
     private String sort = "id,desc";
-
-    public void setType(String type) {
-        if(StringUtils.isNotBlank(type)){
-            this.type = type;
-        }
-    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockListDto.java

@@ -0,0 +1,27 @@
+package cn.ysk.cashier.dto.product;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.math.BigDecimal;
+
+@Data
+@Entity
+public class TbProductStockListDto {
+    @Id
+    private String productId;
+    private String productName;
+//    private String specSnap;
+    @Transient
+    private BigDecimal countNumber;
+    private BigDecimal stockNumber;
+    private BigDecimal subCountNumber;
+    private BigDecimal addNumber;
+    private BigDecimal subNumber;
+    private BigDecimal saleNumber;
+    private BigDecimal lossNumber;
+    private BigDecimal refundNumber;
+
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/rabbit/StockRecordMsg.java

@@ -10,4 +10,5 @@ public class StockRecordMsg {
     private String type;
     private Integer subType;
     private Integer number;
+    private String remark;
 }