库存列表 导入导出

库存记录
更新供应商 最后一次进货时间

eladmin-system/src/main/java/cn/ysk/cashier/vo/ProductStockOperateVO.java

@@ -45,4 +45,21 @@ public class ProductStockOperateVO {
     private String purveyorName;
 
     private String status;
+
+    public void setType() {
+        switch (this.type) {
+            case "purchase":
+                this.type = "其他入库";
+                break;
+            case "other-out":
+                this.type = "其他出库";
+                break;
+            case "reject":
+                this.type = "供应商退货";
+                break;
+            case "purveyor":
+                this.type = "供应商入库";
+                break;
+        }
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/vo/StockVo.java

@@ -0,0 +1,69 @@
+package cn.ysk.cashier.vo;
+import lombok.Data;
+
+
+@Data
+public class StockVo {
+    private Integer id;
+    private Integer proId;
+    private String img;
+    private String name;
+    private String unitName;
+    private String type;
+    private String specSnap;
+    private Object isStock;
+    private Object number;
+
+    public StockVo(Integer id,String name,String unitName,String specSnap, Object number) {
+        this.id = id;
+        this.unitName = unitName;
+        this.specSnap = specSnap;
+        this.name = name;
+        this.number = number;
+    }
+
+    public StockVo(Integer id, Integer proId,String img,String name,String unitName, String type, String specSnap, Object isStock, Object number) {
+        this.id = id;
+        this.proId = proId;
+        this.img = img;
+        this.name = name;
+        this.unitName = unitName;
+        setType(type);
+        this.specSnap = specSnap;
+        this.isStock = isStock;
+        this.number = number;
+    }
+
+    public void setType(String type) {
+        switch (type) {
+            case "normal":
+                this.type = "单规格";
+                break;
+            case "sku":
+                this.type = "多规格";
+                break;
+            case "weight":
+                this.type = "称重商品";
+                break;
+            case "currentPrice":
+                this.type = "套餐商品/团购卷";
+                break;
+            case "group":
+                this.type = "时价商品";
+                break;
+            default:
+                this.type = type;
+                break;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "\"name\":\"" + name + "\""+
+                "\"unitName\":\"" + unitName +"\""+
+                "\"specSnap\":\"" + specSnap + "\"" +
+                "\"number\":\"" + number + "\"" +
+                "}";
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java

@@ -7,6 +7,7 @@ public class TbOrderSalesCountByDayVo {
     private String productName;
     private String productSkuName;
     private String cateName;
+    private String unitName;
     private Long salesNum;
     private Long refNum;
     private BigDecimal salesAmount;
@@ -77,15 +78,24 @@ public class TbOrderSalesCountByDayVo {
         this.refAmount = refAmount;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public TbOrderSalesCountByDayVo(Long salesNum, Long refNum) {
         this.salesNum = salesNum;
         this.refNum = refNum;
     }
 
-    public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName, Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) {
+    public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName,String unitName, Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) {
         this.productName = productName;
         this.productSkuName = productSkuName;
         this.cateName = cateName;
+        this.unitName = unitName;
         this.salesNum = salesNum;
         this.refNum = refNum;
         this.salesAmount = salesAmount;