From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java | 176 +++++++---------------------------------------------------
1 files changed, 23 insertions(+), 153 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java b/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java
index 12f25bd..a5457fc 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java
@@ -1,8 +1,8 @@
package com.matrix.system.hive.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.matrix.core.pojo.EntityDTO;
import com.matrix.core.tools.DateUtil;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -11,7 +11,18 @@
* 库存出入库明细
* @author JYY
*/
+@Data
public class StoreInOutRecordVO {
+
+ /**
+ * 服务单id
+ */
+ private Long serviceId;
+
+ /**
+ * 订单id
+ */
+ private Long orderId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private Date createTime;
@@ -44,6 +55,16 @@
* 单据编号
*/
private String orderNo;
+
+ /**
+ * 原单据号
+ */
+ private String sourceOrderNo;
+ /**
+ * 客户姓名
+ */
+ private String vipName;
+
/**
* 单据类型
*/
@@ -84,158 +105,7 @@
private Long goodsSortId;
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
+ private Long id;
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public Double getGoodsPrice() {
- return goodsPrice;
- }
-
- public void setGoodsPrice(Double goodsPrice) {
- this.goodsPrice = goodsPrice;
- }
-
- public Double getTotalPrice() {
- return totalPrice;
- }
-
- public void setTotalPrice(Double totalPrice) {
- this.totalPrice = totalPrice;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getOrderType() {
- return orderType;
- }
-
- public void setOrderType(String orderType) {
- this.orderType = orderType;
- }
-
- public String getBatch() {
- return batch;
- }
-
- public void setBatch(String batch) {
- this.batch = batch;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Long getShopId() {
- return shopId;
- }
-
- public void setShopId(Long shopId) {
- this.shopId = shopId;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Date getBeginTime() {
- return beginTime;
- }
-
- public void setBeginTime(Date beginTime) {
- this.beginTime = beginTime;
- }
-
- public Long getGoodsSortId() {
- return goodsSortId;
- }
-
- public void setGoodsSortId(Long goodsSortId) {
- this.goodsSortId = goodsSortId;
- }
-
- public Long getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
- }
}
--
Gitblit v1.9.1