xwh增加dto

kmall-admin/src/main/java/com/kmall/admin/dto/BranchDetailDto.java

@@ -0,0 +1,95 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+
+/**
+ * 分店信息dto
+ */
+public class BranchDetailDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    // id
+    private Integer id;
+    // 商户编号
+    private String merchSn;
+    // 商户名称
+    private String merchName;
+    // 门店名称
+    private String storeName;
+    // 门店编号
+    private String storeNumber;
+    // 门店地址
+    private String storeAddress;
+
+    @Override
+    public String toString() {
+        return "BranchDetailDto{" +
+                "id=" + id +
+                ", merchSn='" + merchSn + '\'' +
+                ", merchName='" + merchName + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", storeNumber='" + storeNumber + '\'' +
+                ", storeAddress='" + storeAddress + '\'' +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getMerchSn() {
+        return merchSn;
+    }
+
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchName() {
+        return merchName;
+    }
+
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreNumber() {
+        return storeNumber;
+    }
+
+    public void setStoreNumber(String storeNumber) {
+        this.storeNumber = storeNumber;
+    }
+
+    public String getStoreAddress() {
+        return storeAddress;
+    }
+
+    public void setStoreAddress(String storeAddress) {
+        this.storeAddress = storeAddress;
+    }
+
+    public BranchDetailDto() {
+    }
+
+    public BranchDetailDto(Integer id, String merchSn, String merchName, String storeName, String storeNumber, String storeAddress) {
+        this.id = id;
+        this.merchSn = merchSn;
+        this.merchName = merchName;
+        this.storeName = storeName;
+        this.storeNumber = storeNumber;
+        this.storeAddress = storeAddress;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsPanoramaDto.java

@@ -255,4 +255,6 @@ public class GoodsPanoramaDto implements Serializable {
         this.goodsSn = goodsSn;
         this.brand = brand;
     }
+
+
 }

kmall-admin/src/main/java/com/kmall/admin/dto/InventoryDetailDto.java

@@ -0,0 +1,182 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 进销存明细dto（商品全景）
+ */
+public class InventoryDetailDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    // id
+    private Integer id;
+    // 单据号
+    private String documentNo;
+    // 日期
+    private Date inventoryDate;
+    // 方式
+    private String inventoryModel;
+    // 数量（+）
+    private Integer numberAdd;
+    // 数量（-）
+    private Integer numberSub;
+    // 期末库存
+    private Integer endingInventory;
+    // 应存数量
+    private Integer shouldNumber;
+    // 成本价
+    private Double costPrice;
+    // 售价
+    private Double salePrice;
+    // 金额进价（-）
+    private Double moneyBidAdd;
+    // 金额进价（-）
+    private Double moneyBidSub;
+    // 期末金额（进价）
+    private Double endingPrice;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDocumentNo() {
+        return documentNo;
+    }
+
+    public void setDocumentNo(String documentNo) {
+        this.documentNo = documentNo;
+    }
+
+    public Date getInventoryDate() {
+        return inventoryDate;
+    }
+
+    public void setInventoryDate(Date inventoryDate) {
+        this.inventoryDate = inventoryDate;
+    }
+
+    public String getInventoryModel() {
+        return inventoryModel;
+    }
+
+    public void setInventoryModel(String inventoryModel) {
+        this.inventoryModel = inventoryModel;
+    }
+
+    public Integer getNumberAdd() {
+        return numberAdd;
+    }
+
+    public void setNumberAdd(Integer numberAdd) {
+        this.numberAdd = numberAdd;
+    }
+
+    public Integer getNumberSub() {
+        return numberSub;
+    }
+
+    public void setNumberSub(Integer numberSub) {
+        this.numberSub = numberSub;
+    }
+
+    public Integer getEndingInventory() {
+        return endingInventory;
+    }
+
+    public void setEndingInventory(Integer endingInventory) {
+        this.endingInventory = endingInventory;
+    }
+
+    public Integer getShouldNumber() {
+        return shouldNumber;
+    }
+
+    public void setShouldNumber(Integer shouldNumber) {
+        this.shouldNumber = shouldNumber;
+    }
+
+    public Double getCostPrice() {
+        return costPrice;
+    }
+
+    public void setCostPrice(Double costPrice) {
+        this.costPrice = costPrice;
+    }
+
+    public Double getSalePrice() {
+        return salePrice;
+    }
+
+    public void setSalePrice(Double salePrice) {
+        this.salePrice = salePrice;
+    }
+
+    public Double getMoneyBidAdd() {
+        return moneyBidAdd;
+    }
+
+    public void setMoneyBidAdd(Double moneyBidAdd) {
+        this.moneyBidAdd = moneyBidAdd;
+    }
+
+    public Double getMoneyBidSub() {
+        return moneyBidSub;
+    }
+
+    public void setMoneyBidSub(Double moneyBidSub) {
+        this.moneyBidSub = moneyBidSub;
+    }
+
+    public Double getEndingPrice() {
+        return endingPrice;
+    }
+
+    public void setEndingPrice(Double endingPrice) {
+        this.endingPrice = endingPrice;
+    }
+
+    public InventoryDetailDto() {
+    }
+
+    public InventoryDetailDto(Integer id, String documentNo, Date inventoryDate, String inventoryModel, Integer numberAdd, Integer numberSub, Integer endingInventory, Integer shouldNumber, Double costPrice, Double salePrice, Double moneyBidAdd, Double moneyBidSub, Double endingPrice) {
+        this.id = id;
+        this.documentNo = documentNo;
+        this.inventoryDate = inventoryDate;
+        this.inventoryModel = inventoryModel;
+        this.numberAdd = numberAdd;
+        this.numberSub = numberSub;
+        this.endingInventory = endingInventory;
+        this.shouldNumber = shouldNumber;
+        this.costPrice = costPrice;
+        this.salePrice = salePrice;
+        this.moneyBidAdd = moneyBidAdd;
+        this.moneyBidSub = moneyBidSub;
+        this.endingPrice = endingPrice;
+    }
+
+    @Override
+    public String toString() {
+        return "InventoryDetailDto{" +
+                "id=" + id +
+                ", documentNo='" + documentNo + '\'' +
+                ", inventoryDate=" + inventoryDate +
+                ", inventoryModel='" + inventoryModel + '\'' +
+                ", numberAdd=" + numberAdd +
+                ", numberSub=" + numberSub +
+                ", endingInventory=" + endingInventory +
+                ", shouldNumber=" + shouldNumber +
+                ", costPrice=" + costPrice +
+                ", salePrice=" + salePrice +
+                ", moneyBidAdd=" + moneyBidAdd +
+                ", moneyBidSub=" + moneyBidSub +
+                ", endingPrice=" + endingPrice +
+                '}';
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dto/StoreDetailDto.java

@@ -0,0 +1,9 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+
+/**
+ * 库存信息dto
+ */
+public class StoreDetailDto implements Serializable {
+}