更新后端代码

src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java

@@ -12,6 +12,7 @@ public class DepotHeadModel implements Serializable
 	private String SubType = "";
 	private Long ProjectId;
 	private String DepotIds = "";
+	private String DefaultNumber = "";
 	private String Number = "";
 	private String OperPersonName = "";	
 	private String OperTime;	
@@ -22,7 +23,19 @@ public class DepotHeadModel implements Serializable
 	private Long AllocationProjectId;	
 	private Double TotalPrice;
 	private String PayType = "";
-	private String Remark = "";	
+	private String Remark = "";
+
+	private String Salesman;
+	private String AccountIdList;
+	private String AccountMoneyList;
+	private Double Discount;
+	private Double DiscountMoney;
+	private Double DiscountLastMoney;
+	private Double OtherMoney;
+	private String OtherMoneyList;
+	private String OtherMoneyItem;
+	private Integer AccountDay;
+	private Boolean Status = false; //单据状态
 	
 	private String BeginTime; //查询开始时间
 	private String EndTime;  //查询结束时间
@@ -95,6 +108,14 @@ public class DepotHeadModel implements Serializable
 		DepotIds = depotIds;
 	}
 
+	public String getDefaultNumber() {
+		return DefaultNumber;
+	}
+
+	public void setDefaultNumber(String defaultNumber) {
+		DefaultNumber = defaultNumber;
+	}
+
 	public String getNumber() {
 		return Number;
 	}
@@ -254,6 +275,92 @@ public class DepotHeadModel implements Serializable
 	public void setSupplierId(String supplierId) {
 		this.supplierId = supplierId;
 	}
-	
-	
+
+	public String getSalesman() {
+		return Salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		Salesman = salesman;
+	}
+
+	public String getAccountIdList() {
+		return AccountIdList;
+	}
+
+	public void setAccountIdList(String accountIdList) {
+		AccountIdList = accountIdList;
+	}
+
+	public String getAccountMoneyList() {
+		return AccountMoneyList;
+	}
+
+	public void setAccountMoneyList(String accountMoneyList) {
+		AccountMoneyList = accountMoneyList;
+	}
+
+	public Double getDiscount() {
+		return Discount;
+	}
+
+	public void setDiscount(Double discount) {
+		Discount = discount;
+	}
+
+	public Double getDiscountMoney() {
+		return DiscountMoney;
+	}
+
+	public void setDiscountMoney(Double discountMoney) {
+		DiscountMoney = discountMoney;
+	}
+
+	public Double getDiscountLastMoney() {
+		return DiscountLastMoney;
+	}
+
+	public void setDiscountLastMoney(Double discountLastMoney) {
+		DiscountLastMoney = discountLastMoney;
+	}
+
+	public Double getOtherMoney() {
+		return OtherMoney;
+	}
+
+	public void setOtherMoney(Double otherMoney) {
+		OtherMoney = otherMoney;
+	}
+
+	public String getOtherMoneyList() {
+		return OtherMoneyList;
+	}
+
+	public void setOtherMoneyList(String otherMoneyList) {
+		OtherMoneyList = otherMoneyList;
+	}
+
+	public String getOtherMoneyItem() {
+		return OtherMoneyItem;
+	}
+
+	public void setOtherMoneyItem(String otherMoneyItem) {
+		OtherMoneyItem = otherMoneyItem;
+	}
+
+	public Integer getAccountDay() {
+		return AccountDay;
+	}
+
+	public void setAccountDay(Integer accountDay) {
+		AccountDay = accountDay;
+	}
+
+	public Boolean getStatus() {
+		return Status;
+	}
+
+	public void setStatus(Boolean status) {
+		Status = status;
+	}
 }

src/main/java/com/jsh/model/vo/materials/DepotItemModel.java

@@ -11,11 +11,25 @@ public class DepotItemModel implements Serializable
     /**======开始接受页面参数=================**/
 	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 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 Inserted = "";	//json插入记录
 	private String Deleted = "";	//json删除记录
@@ -85,6 +99,22 @@ public class DepotItemModel implements Serializable
 		MaterialId = materialId;
 	}
 
+	public String getMUnit() {
+		return MUnit;
+	}
+
+	public void setMUnit(String MUnit) {
+		this.MUnit = MUnit;
+	}
+
+	public Double getTaxUnitPrice() {
+		return TaxUnitPrice;
+	}
+
+	public void setTaxUnitPrice(Double taxUnitPrice) {
+		TaxUnitPrice = taxUnitPrice;
+	}
+
 	public Double getOperNumber() {
 		return OperNumber;
 	}
@@ -93,6 +123,14 @@ public class DepotItemModel implements Serializable
 		OperNumber = operNumber;
 	}
 
+	public Double getBasicNumber() {
+		return BasicNumber;
+	}
+
+	public void setBasicNumber(Double basicNumber) {
+		BasicNumber = basicNumber;
+	}
+
 	public Double getUnitPrice() {
 		return UnitPrice;
 	}
@@ -244,4 +282,84 @@ public class DepotItemModel implements Serializable
 	public void setExcelStream(InputStream excelStream) {
 		this.excelStream = excelStream;
 	}
+
+	public Long getDepotId() {
+		return DepotId;
+	}
+
+	public void setDepotId(Long depotId) {
+		DepotId = depotId;
+	}
+
+	public Long getAnotherDepotId() {
+		return AnotherDepotId;
+	}
+
+	public void setAnotherDepotId(Long anotherDepotId) {
+		AnotherDepotId = anotherDepotId;
+	}
+
+	public Double getTaxRate() {
+		return TaxRate;
+	}
+
+	public void setTaxRate(Double taxRate) {
+		TaxRate = taxRate;
+	}
+
+	public Double getTaxMoney() {
+		return TaxMoney;
+	}
+
+	public void setTaxMoney(Double taxMoney) {
+		TaxMoney = taxMoney;
+	}
+
+	public Double getTaxLastMoney() {
+		return TaxLastMoney;
+	}
+
+	public void setTaxLastMoney(Double taxLastMoney) {
+		TaxLastMoney = taxLastMoney;
+	}
+
+	public String getOtherField1() {
+		return OtherField1;
+	}
+
+	public void setOtherField1(String otherField1) {
+		OtherField1 = otherField1;
+	}
+
+	public String getOtherField2() {
+		return OtherField2;
+	}
+
+	public void setOtherField2(String otherField2) {
+		OtherField2 = otherField2;
+	}
+
+	public String getOtherField3() {
+		return OtherField3;
+	}
+
+	public void setOtherField3(String otherField3) {
+		OtherField3 = otherField3;
+	}
+
+	public String getOtherField4() {
+		return OtherField4;
+	}
+
+	public void setOtherField4(String otherField4) {
+		OtherField4 = otherField4;
+	}
+
+	public String getOtherField5() {
+		return OtherField5;
+	}
+
+	public void setOtherField5(String otherField5) {
+		OtherField5 = otherField5;
+	}
 }

src/main/java/com/jsh/model/vo/materials/MaterialModel.java

@@ -1,5 +1,7 @@
 package com.jsh.model.vo.materials;
 
+import java.io.File;
+import java.io.InputStream;
 import java.io.Serializable;
 
 @SuppressWarnings("serial")
@@ -12,7 +14,12 @@ public class MaterialModel implements Serializable
      * 名称
      */
     private String Name = "";
-    
+
+	private String Mfrs = ""; //制造商
+
+	private Double Packing; //包装（KG/包）
+
+	private Double SafetyStock; //安全存量（KG）
     /**
      * 型号
      */
@@ -31,7 +38,7 @@ public class MaterialModel implements Serializable
     /**
      * 单位
      */
-    private String Unit = "";    
+    private String Unit = "";
         
     /**
      * 零售价
@@ -57,6 +64,18 @@ public class MaterialModel implements Serializable
      * 备注
      */
     private String Remark = "";
+
+	private Long UnitId;
+	private String FirstOutUnit;
+	private String FirstInUnit;
+	private String PriceStrategy;
+
+	/**
+	 * 导入excel文件
+	 */
+	private File materialFile;
+
+	private Boolean Enabled  = true; //是否启用
     
     /**
      * CategoryId
@@ -93,6 +112,10 @@ public class MaterialModel implements Serializable
      */
     private String clientIp = "";
 
+	private String browserType = ""; //浏览器类型
+	private String fileName = ""; //文件名称
+	private InputStream excelStream;  //输入流，导出excel文件
+
 	public MaterialShowModel getShowModel() {
 		return showModel;
 	}
@@ -109,6 +132,30 @@ public class MaterialModel implements Serializable
 		Name = name;
 	}
 
+	public String getMfrs() {
+		return Mfrs;
+	}
+
+	public void setMfrs(String mfrs) {
+		Mfrs = mfrs;
+	}
+
+	public Double getPacking() {
+		return Packing;
+	}
+
+	public void setPacking(Double packing) {
+		Packing = packing;
+	}
+
+	public Double getSafetyStock() {
+		return SafetyStock;
+	}
+
+	public void setSafetyStock(Double safetyStock) {
+		SafetyStock = safetyStock;
+	}
+
 	public String getModel() {
 		return Model;
 	}
@@ -140,8 +187,8 @@ public class MaterialModel implements Serializable
 	public void setUnit(String unit) {
 		Unit = unit;
 	}
-    
-    public void setRetailPrice(Double retailPrice)
+
+	public void setRetailPrice(Double retailPrice)
     {
         RetailPrice = retailPrice;
     }
@@ -245,4 +292,75 @@ public class MaterialModel implements Serializable
 		CategoryIds = categoryIds;
 	}
 
+	public Long getUnitId() {
+		return UnitId;
+	}
+
+	public void setUnitId(Long unitId) {
+		UnitId = unitId;
+	}
+
+	public String getFirstOutUnit() {
+		return FirstOutUnit;
+	}
+
+	public void setFirstOutUnit(String firstOutUnit) {
+		FirstOutUnit = firstOutUnit;
+	}
+
+	public String getFirstInUnit() {
+		return FirstInUnit;
+	}
+
+	public void setFirstInUnit(String firstInUnit) {
+		FirstInUnit = firstInUnit;
+	}
+
+	public String getPriceStrategy() {
+		return PriceStrategy;
+	}
+
+	public void setPriceStrategy(String priceStrategy) {
+		PriceStrategy = priceStrategy;
+	}
+
+	public Boolean getEnabled() {
+		return Enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		Enabled = enabled;
+	}
+
+	public String getBrowserType() {
+		return browserType;
+	}
+
+	public void setBrowserType(String browserType) {
+		this.browserType = browserType;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public InputStream getExcelStream() {
+		return excelStream;
+	}
+
+	public void setExcelStream(InputStream excelStream) {
+		this.excelStream = excelStream;
+	}
+
+	public File getMaterialFile() {
+		return materialFile;
+	}
+
+	public void setMaterialFile(File materialFile) {
+		this.materialFile = materialFile;
+	}
 }