从jsh远程仓库更新

(cherry picked from commit 36139e26a4)

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java

@@ -1,364 +1,374 @@
-package com.jsh.erp.datasource.entities;
-
-public class DepotItemVo4WithInfoEx {
-
-    private Long id;
-
-    private Long headerid;
-
-    private Long materialid;
-
-    private String munit;
-
-    private Double opernumber;
-
-    private Double basicnumber;
-
-    private Double unitprice;
-
-    private Double taxunitprice;
-
-    private Double allprice;
-
-    private String remark;
-
-    private String img;
-
-    private Double incidentals;
-
-    private Long depotid;
-
-    private Long anotherdepotid;
-
-    private Double taxrate;
-
-    private Double taxmoney;
-
-    private Double taxlastmoney;
-
-    private String otherfield1;
-
-    private String otherfield2;
-
-    private String otherfield3;
-
-    private String otherfield4;
-
-    private String otherfield5;
-
-    private String mtype;
-
-    private String MName;
-
-    private String MModel;
-
-    private String MaterialUnit;
-
-    private String MColor;
-
-    private String MStandard;
-
-    private String MMfrs;
-
-    private String MOtherField1;
-
-    private String MOtherField2;
-
-    private String MOtherField3;
-
-    private String DepotName;
-
-    private String AnotherDepotName;
-
-    private Long UnitId;
-
-    private String UName;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getHeaderid() {
-        return headerid;
-    }
-
-    public void setHeaderid(Long headerid) {
-        this.headerid = headerid;
-    }
-
-    public Long getMaterialid() {
-        return materialid;
-    }
-
-    public void setMaterialid(Long materialid) {
-        this.materialid = materialid;
-    }
-
-    public String getMunit() {
-        return munit;
-    }
-
-    public void setMunit(String munit) {
-        this.munit = munit;
-    }
-
-    public Double getOpernumber() {
-        return opernumber;
-    }
-
-    public void setOpernumber(Double opernumber) {
-        this.opernumber = opernumber;
-    }
-
-    public Double getBasicnumber() {
-        return basicnumber;
-    }
-
-    public void setBasicnumber(Double basicnumber) {
-        this.basicnumber = basicnumber;
-    }
-
-    public Double getUnitprice() {
-        return unitprice;
-    }
-
-    public void setUnitprice(Double unitprice) {
-        this.unitprice = unitprice;
-    }
-
-    public Double getTaxunitprice() {
-        return taxunitprice;
-    }
-
-    public void setTaxunitprice(Double taxunitprice) {
-        this.taxunitprice = taxunitprice;
-    }
-
-    public Double getAllprice() {
-        return allprice;
-    }
-
-    public void setAllprice(Double allprice) {
-        this.allprice = allprice;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public Double getIncidentals() {
-        return incidentals;
-    }
-
-    public void setIncidentals(Double incidentals) {
-        this.incidentals = incidentals;
-    }
-
-    public Long getDepotid() {
-        return depotid;
-    }
-
-    public void setDepotid(Long depotid) {
-        this.depotid = depotid;
-    }
-
-    public Long getAnotherdepotid() {
-        return anotherdepotid;
-    }
-
-    public void setAnotherdepotid(Long anotherdepotid) {
-        this.anotherdepotid = anotherdepotid;
-    }
-
-    public Double getTaxrate() {
-        return taxrate;
-    }
-
-    public void setTaxrate(Double taxrate) {
-        this.taxrate = taxrate;
-    }
-
-    public Double getTaxmoney() {
-        return taxmoney;
-    }
-
-    public void setTaxmoney(Double taxmoney) {
-        this.taxmoney = taxmoney;
-    }
-
-    public Double getTaxlastmoney() {
-        return taxlastmoney;
-    }
-
-    public void setTaxlastmoney(Double taxlastmoney) {
-        this.taxlastmoney = taxlastmoney;
-    }
-
-    public String getOtherfield1() {
-        return otherfield1;
-    }
-
-    public void setOtherfield1(String otherfield1) {
-        this.otherfield1 = otherfield1;
-    }
-
-    public String getOtherfield2() {
-        return otherfield2;
-    }
-
-    public void setOtherfield2(String otherfield2) {
-        this.otherfield2 = otherfield2;
-    }
-
-    public String getOtherfield3() {
-        return otherfield3;
-    }
-
-    public void setOtherfield3(String otherfield3) {
-        this.otherfield3 = otherfield3;
-    }
-
-    public String getOtherfield4() {
-        return otherfield4;
-    }
-
-    public void setOtherfield4(String otherfield4) {
-        this.otherfield4 = otherfield4;
-    }
-
-    public String getOtherfield5() {
-        return otherfield5;
-    }
-
-    public void setOtherfield5(String otherfield5) {
-        this.otherfield5 = otherfield5;
-    }
-
-    public String getMtype() {
-        return mtype;
-    }
-
-    public void setMtype(String mtype) {
-        this.mtype = mtype;
-    }
-
-    public String getMName() {
-        return MName;
-    }
-
-    public void setMName(String MName) {
-        this.MName = MName;
-    }
-
-    public String getMModel() {
-        return MModel;
-    }
-
-    public void setMModel(String MModel) {
-        this.MModel = MModel;
-    }
-
-    public String getMaterialUnit() {
-        return MaterialUnit;
-    }
-
-    public void setMaterialUnit(String materialUnit) {
-        MaterialUnit = materialUnit;
-    }
-
-    public String getMColor() {
-        return MColor;
-    }
-
-    public void setMColor(String MColor) {
-        this.MColor = MColor;
-    }
-
-    public String getMStandard() {
-        return MStandard;
-    }
-
-    public void setMStandard(String MStandard) {
-        this.MStandard = MStandard;
-    }
-
-    public String getMMfrs() {
-        return MMfrs;
-    }
-
-    public void setMMfrs(String MMfrs) {
-        this.MMfrs = MMfrs;
-    }
-
-    public String getMOtherField1() {
-        return MOtherField1;
-    }
-
-    public void setMOtherField1(String MOtherField1) {
-        this.MOtherField1 = MOtherField1;
-    }
-
-    public String getMOtherField2() {
-        return MOtherField2;
-    }
-
-    public void setMOtherField2(String MOtherField2) {
-        this.MOtherField2 = MOtherField2;
-    }
-
-    public String getMOtherField3() {
-        return MOtherField3;
-    }
-
-    public void setMOtherField3(String MOtherField3) {
-        this.MOtherField3 = MOtherField3;
-    }
-
-    public String getDepotName() {
-        return DepotName;
-    }
-
-    public void setDepotName(String depotName) {
-        DepotName = depotName;
-    }
-
-    public String getAnotherDepotName() {
-        return AnotherDepotName;
-    }
-
-    public void setAnotherDepotName(String anotherDepotName) {
-        AnotherDepotName = anotherDepotName;
-    }
-
-    public Long getUnitId() {
-        return UnitId;
-    }
-
-    public void setUnitId(Long unitId) {
-        UnitId = unitId;
-    }
-
-    public String getUName() {
-        return UName;
-    }
-
-    public void setUName(String UName) {
-        this.UName = UName;
-    }
+package com.jsh.erp.datasource.entities;
+
+public class DepotItemVo4WithInfoEx {
+
+    private Long id;
+
+    private Long headerid;
+
+    private Long materialid;
+
+    private String munit;
+
+    private Double opernumber;
+
+    private Double basicnumber;
+
+    private Double unitprice;
+
+    private Double taxunitprice;
+
+    private Double allprice;
+
+    private String remark;
+
+    private String img;
+
+    private Double incidentals;
+
+    private Long depotid;
+
+    private Long anotherdepotid;
+
+    private Double taxrate;
+
+    private Double taxmoney;
+
+    private Double taxlastmoney;
+
+    private String otherfield1;
+
+    private String otherfield2;
+
+    private String otherfield3;
+
+    private String otherfield4;
+
+    private String otherfield5;
+
+    private String mtype;
+
+    private Long MId;
+
+    private String MName;
+
+    private String MModel;
+
+    private String MaterialUnit;
+
+    private String MColor;
+
+    private String MStandard;
+
+    private String MMfrs;
+
+    private String MOtherField1;
+
+    private String MOtherField2;
+
+    private String MOtherField3;
+
+    private String DepotName;
+
+    private String AnotherDepotName;
+
+    private Long UnitId;
+
+    private String UName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getHeaderid() {
+        return headerid;
+    }
+
+    public void setHeaderid(Long headerid) {
+        this.headerid = headerid;
+    }
+
+    public Long getMaterialid() {
+        return materialid;
+    }
+
+    public void setMaterialid(Long materialid) {
+        this.materialid = materialid;
+    }
+
+    public String getMunit() {
+        return munit;
+    }
+
+    public void setMunit(String munit) {
+        this.munit = munit;
+    }
+
+    public Double getOpernumber() {
+        return opernumber;
+    }
+
+    public void setOpernumber(Double opernumber) {
+        this.opernumber = opernumber;
+    }
+
+    public Double getBasicnumber() {
+        return basicnumber;
+    }
+
+    public void setBasicnumber(Double basicnumber) {
+        this.basicnumber = basicnumber;
+    }
+
+    public Double getUnitprice() {
+        return unitprice;
+    }
+
+    public void setUnitprice(Double unitprice) {
+        this.unitprice = unitprice;
+    }
+
+    public Double getTaxunitprice() {
+        return taxunitprice;
+    }
+
+    public void setTaxunitprice(Double taxunitprice) {
+        this.taxunitprice = taxunitprice;
+    }
+
+    public Double getAllprice() {
+        return allprice;
+    }
+
+    public void setAllprice(Double allprice) {
+        this.allprice = allprice;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public Double getIncidentals() {
+        return incidentals;
+    }
+
+    public void setIncidentals(Double incidentals) {
+        this.incidentals = incidentals;
+    }
+
+    public Long getDepotid() {
+        return depotid;
+    }
+
+    public void setDepotid(Long depotid) {
+        this.depotid = depotid;
+    }
+
+    public Long getAnotherdepotid() {
+        return anotherdepotid;
+    }
+
+    public void setAnotherdepotid(Long anotherdepotid) {
+        this.anotherdepotid = anotherdepotid;
+    }
+
+    public Double getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(Double taxrate) {
+        this.taxrate = taxrate;
+    }
+
+    public Double getTaxmoney() {
+        return taxmoney;
+    }
+
+    public void setTaxmoney(Double taxmoney) {
+        this.taxmoney = taxmoney;
+    }
+
+    public Double getTaxlastmoney() {
+        return taxlastmoney;
+    }
+
+    public void setTaxlastmoney(Double taxlastmoney) {
+        this.taxlastmoney = taxlastmoney;
+    }
+
+    public String getOtherfield1() {
+        return otherfield1;
+    }
+
+    public void setOtherfield1(String otherfield1) {
+        this.otherfield1 = otherfield1;
+    }
+
+    public String getOtherfield2() {
+        return otherfield2;
+    }
+
+    public void setOtherfield2(String otherfield2) {
+        this.otherfield2 = otherfield2;
+    }
+
+    public String getOtherfield3() {
+        return otherfield3;
+    }
+
+    public void setOtherfield3(String otherfield3) {
+        this.otherfield3 = otherfield3;
+    }
+
+    public String getOtherfield4() {
+        return otherfield4;
+    }
+
+    public void setOtherfield4(String otherfield4) {
+        this.otherfield4 = otherfield4;
+    }
+
+    public String getOtherfield5() {
+        return otherfield5;
+    }
+
+    public void setOtherfield5(String otherfield5) {
+        this.otherfield5 = otherfield5;
+    }
+
+    public String getMtype() {
+        return mtype;
+    }
+
+    public void setMtype(String mtype) {
+        this.mtype = mtype;
+    }
+
+    public Long getMId() {
+        return MId;
+    }
+
+    public void setMId(Long MId) {
+        this.MId = MId;
+    }
+
+    public String getMName() {
+        return MName;
+    }
+
+    public void setMName(String MName) {
+        this.MName = MName;
+    }
+
+    public String getMModel() {
+        return MModel;
+    }
+
+    public void setMModel(String MModel) {
+        this.MModel = MModel;
+    }
+
+    public String getMaterialUnit() {
+        return MaterialUnit;
+    }
+
+    public void setMaterialUnit(String materialUnit) {
+        MaterialUnit = materialUnit;
+    }
+
+    public String getMColor() {
+        return MColor;
+    }
+
+    public void setMColor(String MColor) {
+        this.MColor = MColor;
+    }
+
+    public String getMStandard() {
+        return MStandard;
+    }
+
+    public void setMStandard(String MStandard) {
+        this.MStandard = MStandard;
+    }
+
+    public String getMMfrs() {
+        return MMfrs;
+    }
+
+    public void setMMfrs(String MMfrs) {
+        this.MMfrs = MMfrs;
+    }
+
+    public String getMOtherField1() {
+        return MOtherField1;
+    }
+
+    public void setMOtherField1(String MOtherField1) {
+        this.MOtherField1 = MOtherField1;
+    }
+
+    public String getMOtherField2() {
+        return MOtherField2;
+    }
+
+    public void setMOtherField2(String MOtherField2) {
+        this.MOtherField2 = MOtherField2;
+    }
+
+    public String getMOtherField3() {
+        return MOtherField3;
+    }
+
+    public void setMOtherField3(String MOtherField3) {
+        this.MOtherField3 = MOtherField3;
+    }
+
+    public String getDepotName() {
+        return DepotName;
+    }
+
+    public void setDepotName(String depotName) {
+        DepotName = depotName;
+    }
+
+    public String getAnotherDepotName() {
+        return AnotherDepotName;
+    }
+
+    public void setAnotherDepotName(String anotherDepotName) {
+        AnotherDepotName = anotherDepotName;
+    }
+
+    public Long getUnitId() {
+        return UnitId;
+    }
+
+    public void setUnitId(Long unitId) {
+        UnitId = unitId;
+    }
+
+    public String getUName() {
+        return UName;
+    }
+
+    public void setUName(String UName) {
+        this.UName = UName;
+    }
 }