From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java |  250 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 226 insertions(+), 24 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java b/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
old mode 100644
new mode 100755
index cece0dc..8a57b3e
--- a/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
@@ -15,22 +15,22 @@
  * add by wuxw 2019/4/24
  **/
 public class ResourceStoreDto extends PageDto implements Serializable {
-
+    //鐗╁搧鍚嶇О(鐢ㄦ潵鍋氭ā绯婃煡璇�)
     private String resName;
+    //鐗╁搧鍚嶇О(鐢ㄦ潵鍋氱簿纭煡璇�)
+    private String name;
     private String price;
     private String resCode;
     private String description;
     private String storeId;
     private String stock;
+    private String bId;
     private String resId;
     //10000 閲囪喘 20000鍑哄簱
     private String resOrderType;
-    //鐗╁搧绫诲瀷
-    private String goodsType;
-    //鐗╁搧绫诲瀷鍚嶇О
-    private String goodsTypeName;
     //鍗曚綅
     private String unitCode;
+    private String unitCodeName;
     //澶囨敞
     private String remark;
     //瀵瑰鍞环鏈�浣庝环鏍�
@@ -41,11 +41,38 @@
     private String outPrice;
     //鎵嬫満绔槸鍚︽樉绀�(N鍚� Y鏄�)
     private String showMobile;
+    private String shId;
+    private String warningStock;
+    private String shType;
+    private String shObjId;
+    private String[] shObjIds;
+    private String averagePrice;
     private List<String> fileUrls;
     private Date createTime;
-
+    private String rstId;
+    private String rstName;
     private String statusCd = "0";
-
+    private String shName;
+    //瑙勬牸id
+    private String rssId;
+    //瑙勬牸鍚嶇О
+    private String rssName;
+    //鐗╁搧鎬讳环
+    private String totalPrice;
+    //鏈�灏忚閲忓崟浣�
+    private String miniUnitCode;
+    private String miniUnitCodeName;
+    //鏈�灏忚閲忓崟浣嶆暟閲�
+    private String miniUnitStock;
+    //鏈�灏忚閲忔�绘暟
+    private String miniStock;
+    private String parentRstId;
+    private String parentRstName;
+    //浠撳簱鏄惁瀵瑰寮�鏀� true鏄� false鍚�
+    private String isShow;
+    //鏄惁鏄浐瀹氱墿鍝�
+    private String isFixed;
+    private String isFixedName;
 
     public String getResName() {
         return resName;
@@ -103,7 +130,6 @@
         this.resId = resId;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -126,14 +152,6 @@
 
     public void setResOrderType(String resOrderType) {
         this.resOrderType = resOrderType;
-    }
-
-    public String getGoodsType() {
-        return goodsType;
-    }
-
-    public void setGoodsType(String goodsType) {
-        this.goodsType = goodsType;
     }
 
     public String getUnitCode() {
@@ -184,14 +202,6 @@
         this.showMobile = showMobile;
     }
 
-    public String getGoodsTypeName() {
-        return goodsTypeName;
-    }
-
-    public void setGoodsTypeName(String goodsTypeName) {
-        this.goodsTypeName = goodsTypeName;
-    }
-
     public List<String> getFileUrls() {
         return fileUrls;
     }
@@ -199,4 +209,196 @@
     public void setFileUrls(List<String> fileUrls) {
         this.fileUrls = fileUrls;
     }
+
+    public String getShId() {
+        return shId;
+    }
+
+    public void setShId(String shId) {
+        this.shId = shId;
+    }
+
+    public String getShName() {
+        return shName;
+    }
+
+    public void setShName(String shName) {
+        this.shName = shName;
+    }
+
+    public String getShType() {
+        return shType;
+    }
+
+    public void setShType(String shType) {
+        this.shType = shType;
+    }
+
+    public String getShObjId() {
+        return shObjId;
+    }
+
+    public void setShObjId(String shObjId) {
+        this.shObjId = shObjId;
+    }
+
+    public String getWarningStock() {
+        return warningStock;
+    }
+
+    public void setWarningStock(String warningStock) {
+        this.warningStock = warningStock;
+    }
+
+    public String getAveragePrice() {
+        return averagePrice;
+    }
+
+    public void setAveragePrice(String averagePrice) {
+        this.averagePrice = averagePrice;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRstId() {
+        return rstId;
+    }
+
+    public void setRstId(String rstId) {
+        this.rstId = rstId;
+    }
+
+    public String getRstName() {
+        return rstName;
+    }
+
+    public void setRstName(String rstName) {
+        this.rstName = rstName;
+    }
+
+    public String getRssId() {
+        return rssId;
+    }
+
+    public void setRssId(String rssId) {
+        this.rssId = rssId;
+    }
+
+    public String getRssName() {
+        return rssName;
+    }
+
+    public void setRssName(String rssName) {
+        this.rssName = rssName;
+    }
+
+    public String getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(String totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getMiniUnitCode() {
+        return miniUnitCode;
+    }
+
+    public void setMiniUnitCode(String miniUnitCode) {
+        this.miniUnitCode = miniUnitCode;
+    }
+
+    public String getMiniUnitStock() {
+        return miniUnitStock;
+    }
+
+    public void setMiniUnitStock(String miniUnitStock) {
+        this.miniUnitStock = miniUnitStock;
+    }
+
+    public String getUnitCodeName() {
+        return unitCodeName;
+    }
+
+    public void setUnitCodeName(String unitCodeName) {
+        this.unitCodeName = unitCodeName;
+    }
+
+    public String getMiniUnitCodeName() {
+        return miniUnitCodeName;
+    }
+
+    public void setMiniUnitCodeName(String miniUnitCodeName) {
+        this.miniUnitCodeName = miniUnitCodeName;
+    }
+
+    public String getMiniStock() {
+        return miniStock;
+    }
+
+    public void setMiniStock(String miniStock) {
+        this.miniStock = miniStock;
+    }
+
+    public String getParentRstId() {
+        return parentRstId;
+    }
+
+    public void setParentRstId(String parentRstId) {
+        this.parentRstId = parentRstId;
+    }
+
+    public String getParentRstName() {
+        return parentRstName;
+    }
+
+    public void setParentRstName(String parentRstName) {
+        this.parentRstName = parentRstName;
+    }
+
+    public String getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(String isShow) {
+        this.isShow = isShow;
+    }
+
+    public String getIsFixed() {
+        return isFixed;
+    }
+
+    public void setIsFixed(String isFixed) {
+        this.isFixed = isFixed;
+    }
+
+    public String getIsFixedName() {
+        return isFixedName;
+    }
+
+    public void setIsFixedName(String isFixedName) {
+        this.isFixedName = isFixedName;
+    }
+
+    public String[] getShObjIds() {
+        return shObjIds;
+    }
+
+    public void setShObjIds(String[] shObjIds) {
+        this.shObjIds = shObjIds;
+    }
 }

--
Gitblit v1.8.0