升级代码结构，采用Maven来管理jar包(10)

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

@@ -0,0 +1,225 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AccountHeadModel implements Serializable
+{
+    private AccountHeadShowModel showModel = new AccountHeadShowModel();
+
+    /**======开始接受页面参数=================**/
+    private String Type;
+    private Long OrganId;
+    private Long HandsPersonId;    
+    private Double ChangeAmount;
+    private Double TotalPrice;
+    private Long AccountId;
+    private String BillNo;
+    private String BillTime;  
+    private String Remark;
+    private String BeginTime; //查询开始时间
+    private String EndTime;  //查询结束时间
+    private String MonthTime;  //查询月份
+    /**
+     * 分类ID
+     */
+    private Long accountHeadID = 0l;
+
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String accountHeadIDs = "";
+
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+    public void setShowModel(AccountHeadShowModel showModel)
+    {
+        this.showModel = showModel;
+    }
+
+    public AccountHeadShowModel getShowModel()
+    {
+        return showModel;
+    }
+
+    public void setType(String type)
+    {
+        Type = type;
+    }
+
+    public String getType()
+    {
+        return Type;
+    }
+
+    public void setOrganId(Long organId)
+    {
+        OrganId = organId;
+    }
+
+    public Long getOrganId()
+    {
+        return OrganId;
+    }
+
+    public void setHandsPersonId(Long handsPersonId)
+    {
+        HandsPersonId = handsPersonId;
+    }
+
+    public Long getHandsPersonId()
+    {
+        return HandsPersonId;
+    }
+
+    public void setChangeAmount(Double changeAmount)
+    {
+        ChangeAmount = changeAmount;
+    }
+
+    public Double getChangeAmount()
+    {
+        return ChangeAmount;
+    }
+
+	public void setTotalPrice(Double totalPrice) {
+		TotalPrice = totalPrice;
+	}
+
+    public Double getTotalPrice() {
+		return TotalPrice;
+	}
+    
+	public void setAccountId(Long accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Long getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setBillNo(String billNo)
+    {
+        BillNo = billNo;
+    }
+
+    public String getBillNo()
+    {
+        return BillNo;
+    }
+
+    public void setBillTime(String billTime)
+    {
+        BillTime = billTime;
+    }
+
+    public String getBillTime()
+    {
+        return BillTime;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+    public void setBeginTime(String beginTime)
+    {
+        BeginTime = beginTime;
+    }
+
+    public String getBeginTime()
+    {
+        return BeginTime;
+    }
+
+    public void setEndTime(String endTime)
+    {
+        EndTime = endTime;
+    }
+
+    public String getEndTime()
+    {
+        return EndTime;
+    }
+
+    public void setMonthTime(String monthTime)
+    {
+        MonthTime = monthTime;
+    }
+
+    public String getMonthTime()
+    {
+        return MonthTime;
+    }
+
+    public void setAccountHeadID(Long accountHeadID)
+    {
+        this.accountHeadID = accountHeadID;
+    }
+
+    public Long getAccountHeadID()
+    {
+        return accountHeadID;
+    }
+
+    public void setAccountHeadIDs(String accountHeadIDs)
+    {
+        this.accountHeadIDs = accountHeadIDs;
+    }
+
+    public String getAccountHeadIDs()
+    {
+        return accountHeadIDs;
+    }
+
+    public void setPageSize(int pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageNo(int pageNo)
+    {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageNo()
+    {
+        return pageNo;
+    }
+
+
+    public void setClientIp(String clientIp)
+    {
+        this.clientIp = clientIp;
+    }
+
+    public String getClientIp()
+    {
+        return clientIp;
+    }}

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

@@ -0,0 +1,42 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class AccountHeadShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+    private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public Map<String, List> getMap() {
+        return map;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public void setMap(Map<String, List> map) {
+        this.map = map;
+    }
+
+}

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

@@ -0,0 +1,251 @@
+package com.jsh.model.vo.materials;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AccountItemModel implements Serializable
+{
+    private AccountItemShowModel showModel = new AccountItemShowModel();
+
+    /**======开始接受页面参数=================**/
+    private Long HeaderId;
+    private Long AccountId;
+    private Long InOutItemId;
+    private Double EachAmount;
+    private String Remark = "";
+
+    private String Inserted = "";   //json插入记录
+    private String Deleted = "";    //json删除记录
+    private String Updated = "";    //json修改记录
+
+    private String HeadIds = "";    //表头集合列表
+    private String MonthTime = "";  //月份
+    private String browserType = "";
+    /**
+     * 文件名称
+     */
+    private String fileName = "";
+    /**
+     * 分类ID
+     */
+    private Long accountItemID = 0l;
+
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String accountItemIDs = "";
+
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 800;
+
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+
+    /**
+     * 输入流，导出excel文件
+     */
+    private InputStream excelStream;
+
+    public void setShowModel(AccountItemShowModel showModel)
+    {
+        this.showModel = showModel;
+    }
+
+    public AccountItemShowModel getShowModel()
+    {
+        return showModel;
+    }
+
+    public void setHeaderId(Long headerId)
+    {
+        HeaderId = headerId;
+    }
+
+    public Long getHeaderId()
+    {
+        return HeaderId;
+    }
+
+    public void setAccountId(Long accountId)
+    {
+        AccountId = accountId;
+    }
+
+    public Long getAccountId()
+    {
+        return AccountId;
+    }
+
+    public void setInOutItemId(Long inOutItemId)
+    {
+        InOutItemId = inOutItemId;
+    }
+
+    public Long getInOutItemId()
+    {
+        return InOutItemId;
+    }
+
+    public void setEachAmount(Double eachAmount)
+    {
+        EachAmount = eachAmount;
+    }
+
+    public Double getEachAmount()
+    {
+        return EachAmount;
+    }
+
+    public void setRemark(String remark)
+    {
+        Remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return Remark;
+    }
+
+    public void setInserted(String inserted)
+    {
+        Inserted = inserted;
+    }
+
+    public String getInserted()
+    {
+        return Inserted;
+    }
+
+    public void setDeleted(String deleted)
+    {
+        Deleted = deleted;
+    }
+
+    public String getDeleted()
+    {
+        return Deleted;
+    }
+
+    public void setUpdated(String updated)
+    {
+        Updated = updated;
+    }
+
+    public String getUpdated()
+    {
+        return Updated;
+    }
+
+    public void setHeadIds(String headIds)
+    {
+        HeadIds = headIds;
+    }
+
+    public String getHeadIds()
+    {
+        return HeadIds;
+    }
+
+    public void setMonthTime(String monthTime)
+    {
+        MonthTime = monthTime;
+    }
+
+    public String getMonthTime()
+    {
+        return MonthTime;
+    }
+
+    public void setBrowserType(String browserType)
+    {
+        this.browserType = browserType;
+    }
+
+    public String getBrowserType()
+    {
+        return browserType;
+    }
+
+    public void setFileName(String fileName)
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName()
+    {
+        return fileName;
+    }
+
+    public void setAccountItemID(Long accountItemID)
+    {
+        this.accountItemID = accountItemID;
+    }
+
+    public Long getAccountItemID()
+    {
+        return accountItemID;
+    }
+
+    public void setAccountItemIDs(String accountItemIDs)
+    {
+        this.accountItemIDs = accountItemIDs;
+    }
+
+    public String getAccountItemIDs()
+    {
+        return accountItemIDs;
+    }
+
+    public void setPageSize(int pageSize)
+    {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageSize()
+    {
+        return pageSize;
+    }
+
+    public void setPageNo(int pageNo)
+    {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageNo()
+    {
+        return pageNo;
+    }
+
+    public void setClientIp(String clientIp)
+    {
+        this.clientIp = clientIp;
+    }
+
+    public String getClientIp()
+    {
+        return clientIp;
+    }
+    
+
+
+    public void setExcelStream(InputStream excelStream)
+    {
+        this.excelStream = excelStream;
+    }
+
+    public InputStream getExcelStream()
+    {
+        return excelStream;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AccountItemShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+}

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

@@ -0,0 +1,229 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class DepotHeadModel implements Serializable
+{
+    private DepotHeadShowModel showModel = new DepotHeadShowModel();
+
+    /**======开始接受页面参数=================**/
+	private String Type = "";
+	private String SubType = "";
+	private Long ProjectId;
+	private String Number = "";
+	private String OperPersonName = "";	
+	private String OperTime;	
+	private Long OrganId;
+	private Long HandsPersonId;
+	private Long AccountId;
+	private Double ChangeAmount;	
+	private Long AllocationProjectId;	
+	private Double TotalPrice;
+	private String Remark = "";	
+	
+	private String BeginTime; //查询开始时间
+	private String EndTime;  //查询结束时间
+	private String MonthTime;  //查询月份
+    /**
+     * 分类ID
+     */
+    private Long depotHeadID = 0l;
+    
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String depotHeadIDs = "";
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+	public DepotHeadShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(DepotHeadShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public String getType() {
+		return Type;
+	}
+
+	public void setType(String type) {
+		Type = type;
+	}
+
+	public String getSubType() {
+		return SubType;
+	}
+
+	public void setSubType(String subType) {
+		SubType = subType;
+	}
+
+	public Long getProjectId() {
+		return ProjectId;
+	}
+
+	public void setProjectId(Long projectId) {
+		ProjectId = projectId;
+	}
+
+	public String getNumber() {
+		return Number;
+	}
+
+	public void setNumber(String number) {
+		Number = number;
+	}
+
+	public String getOperPersonName() {
+		return OperPersonName;
+	}
+
+	public void setOperPersonName(String operPersonName) {
+		OperPersonName = operPersonName;
+	}
+
+	public Long getOrganId() {
+		return OrganId;
+	}
+
+	public void setOrganId(Long organId) {
+		OrganId = organId;
+	}
+
+	public Long getHandsPersonId() {
+		return HandsPersonId;
+	}
+
+	public void setHandsPersonId(Long handsPersonId) {
+		HandsPersonId = handsPersonId;
+	}
+
+	public Long getAccountId() {
+		return AccountId;
+	}
+
+	public void setAccountId(Long accountId) {
+		AccountId = accountId;
+	}
+
+	public Double getChangeAmount() {
+		return ChangeAmount;
+	}
+
+	public void setChangeAmount(Double changeAmount) {
+		ChangeAmount = changeAmount;
+	}
+
+	public Long getAllocationProjectId() {
+		return AllocationProjectId;
+	}
+
+	public void setAllocationProjectId(Long allocationProjectId) {
+		AllocationProjectId = allocationProjectId;
+	}
+
+	public Double getTotalPrice() {
+		return TotalPrice;
+	}
+
+	public void setTotalPrice(Double totalPrice) {
+		TotalPrice = totalPrice;
+	}
+
+	public String getRemark() {
+		return Remark;
+	}
+
+	public void setRemark(String remark) {
+		Remark = remark;
+	}
+
+	public Long getDepotHeadID() {
+		return depotHeadID;
+	}
+
+	public void setDepotHeadID(Long depotHeadID) {
+		this.depotHeadID = depotHeadID;
+	}
+
+	public String getDepotHeadIDs() {
+		return depotHeadIDs;
+	}
+
+	public void setDepotHeadIDs(String depotHeadIDs) {
+		this.depotHeadIDs = depotHeadIDs;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+
+	public String getBeginTime() {
+		return BeginTime;
+	}
+
+	public void setBeginTime(String beginTime) {
+		BeginTime = beginTime;
+	}
+
+	public String getEndTime() {
+		return EndTime;
+	}
+
+	public void setEndTime(String endTime) {
+		EndTime = endTime;
+	}
+
+	public String getOperTime() {
+		return OperTime;
+	}
+
+	public void setOperTime(String operTime) {
+		OperTime = operTime;
+	}
+
+	public String getMonthTime() {
+		return MonthTime;
+	}
+
+	public void setMonthTime(String monthTime) {
+		MonthTime = monthTime;
+	}
+	
+}

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

@@ -0,0 +1,42 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class DepotHeadShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+    
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+	private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+	@SuppressWarnings("rawtypes")
+	public Map<String, List> getMap() {
+		return map;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMap(Map<String, List> map) {
+		this.map = map;
+	}
+    
+}

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

@@ -0,0 +1,238 @@
+package com.jsh.model.vo.materials;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class DepotItemModel implements Serializable
+{
+    private DepotItemShowModel showModel = new DepotItemShowModel();
+
+    /**======开始接受页面参数=================**/
+	private Long HeaderId;
+	private Long MaterialId;
+	private Double OperNumber;
+	private Double UnitPrice;
+	private Double AllPrice;
+	private String Remark = "";
+	private String Img = "";
+    
+	private String Inserted = "";	//json插入记录
+	private String Deleted = "";	//json删除记录
+	private String Updated = "";	//json修改记录
+	
+	private String HeadIds = "";	//表头集合列表
+	private String MaterialIds = "";	//材料列表
+	private String MonthTime = "";  //月份
+  	private String browserType = "";
+  	/**
+  	 * 文件名称
+  	 */
+  	private String fileName = "";
+    /**
+     * 分类ID
+     */
+    private Long depotItemID = 0l;
+    
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String depotItemIDs = "";
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 800;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+    
+    
+    /**
+     * 输入流，导出excel文件
+     */
+  	private InputStream excelStream;
+
+	public DepotItemShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(DepotItemShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public Long getHeaderId() {
+		return HeaderId;
+	}
+
+	public void setHeaderId(Long headerId) {
+		HeaderId = headerId;
+	}
+
+	public Long getMaterialId() {
+		return MaterialId;
+	}
+
+	public void setMaterialId(Long materialId) {
+		MaterialId = materialId;
+	}
+
+	public Double getOperNumber() {
+		return OperNumber;
+	}
+
+	public void setOperNumber(Double operNumber) {
+		OperNumber = operNumber;
+	}
+
+	public Double getUnitPrice() {
+		return UnitPrice;
+	}
+
+	public void setUnitPrice(Double unitPrice) {
+		UnitPrice = unitPrice;
+	}
+
+	public Double getAllPrice() {
+		return AllPrice;
+	}
+
+	public void setAllPrice(Double allPrice) {
+		AllPrice = allPrice;
+	}
+
+	public String getRemark() {
+		return Remark;
+	}
+
+	public void setRemark(String remark) {
+		Remark = remark;
+	}
+
+	public String getImg() {
+		return Img;
+	}
+
+	public void setImg(String img) {
+		Img = img;
+	}
+
+	public Long getDepotItemID() {
+		return depotItemID;
+	}
+
+	public void setDepotItemID(Long depotItemID) {
+		this.depotItemID = depotItemID;
+	}
+
+	public String getDepotItemIDs() {
+		return depotItemIDs;
+	}
+
+	public void setDepotItemIDs(String depotItemIDs) {
+		this.depotItemIDs = depotItemIDs;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+
+	public String getInserted() {
+		return Inserted;
+	}
+
+	public void setInserted(String inserted) {
+		Inserted = inserted;
+	}
+
+	public String getDeleted() {
+		return Deleted;
+	}
+
+	public void setDeleted(String deleted) {
+		Deleted = deleted;
+	}
+
+	public String getUpdated() {
+		return Updated;
+	}
+
+	public void setUpdated(String updated) {
+		Updated = updated;
+	}
+
+	public String getHeadIds() {
+		return HeadIds;
+	}
+
+	public void setHeadIds(String headIds) {
+		HeadIds = headIds;
+	}
+
+	public String getMonthTime() {
+		return MonthTime;
+	}
+
+	public void setMonthTime(String monthTime) {
+		MonthTime = monthTime;
+	}
+
+	public String getMaterialIds() {
+		return MaterialIds;
+	}
+
+	public void setMaterialIds(String materialIds) {
+		MaterialIds = materialIds;
+	}
+
+	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;
+	}
+}

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

@@ -0,0 +1,22 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class DepotItemShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class MaterialCategoryModel implements Serializable
+{
+    private MaterialCategoryShowModel showModel = new MaterialCategoryShowModel();
+
+    /**======开始接受页面参数=================**/
+    /**
+     * 名称
+     */
+    private String Name = "";
+    
+    /**
+     * 等级
+     */
+    private Short CategoryLevel;
+    
+    /**
+     * ParentId
+     */
+    private Long ParentId;
+    
+    /**
+     * 分类ID
+     */
+    private Long materialCategoryID = 0l;
+    
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String materialCategoryIDs = "";
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+	public MaterialCategoryShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(MaterialCategoryShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public String getName() {
+		return Name;
+	}
+
+	public void setName(String name) {
+		Name = name;
+	}
+
+	public Short getCategoryLevel() {
+		return CategoryLevel;
+	}
+
+	public void setCategoryLevel(Short categoryLevel) {
+		CategoryLevel = categoryLevel;
+	}
+
+	public Long getParentId() {
+		return ParentId;
+	}
+
+	public void setParentId(Long parentId) {
+		ParentId = parentId;
+	}
+
+	public Long getMaterialCategoryID() {
+		return materialCategoryID;
+	}
+
+	public void setMaterialCategoryID(Long materialCategoryID) {
+		this.materialCategoryID = materialCategoryID;
+	}
+
+	public String getMaterialCategoryIDs() {
+		return materialCategoryIDs;
+	}
+
+	public void setMaterialCategoryIDs(String materialCategoryIDs) {
+		this.materialCategoryIDs = materialCategoryIDs;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+	
+}

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

@@ -0,0 +1,43 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class MaterialCategoryShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+    
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+	private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+	@SuppressWarnings("rawtypes")
+	public Map<String, List> getMap() {
+		return map;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMap(Map<String, List> map) {
+		this.map = map;
+	}
+    
+    
+}

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

@@ -0,0 +1,235 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class MaterialModel implements Serializable
+{
+    private MaterialShowModel showModel = new MaterialShowModel();
+
+    /**======开始接受页面参数=================**/
+    /**
+     * 名称
+     */
+    private String Name = "";
+    
+    /**
+     * 型号
+     */
+    private String Model = "";
+    
+    /**
+     * 颜色
+     */
+    private String Color = "";
+    
+    /**
+     * 单位
+     */
+    private String Unit = "";    
+        
+    /**
+     * 零售价
+     */
+    private Double RetailPrice;
+    
+    /**
+     * 最低售价
+     */
+    private Double LowPrice;
+     
+    /**
+     * 预设售价一
+     */
+    private Double PresetPriceOne;
+     
+    /**
+     * 预设售价二
+     */ 
+    private Double PresetPriceTwo;
+    
+    /**
+     * 备注
+     */
+    private String Remark = "";
+    
+    /**
+     * CategoryId
+     */
+    private Long CategoryId;
+    
+    /**
+     * CategoryIds 用于in子查询
+     */
+    private String CategoryIds = "1";
+    
+    /**
+     * 分类ID
+     */
+    private Long materialID = 0l;
+    
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String materialIDs = "";
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+	public MaterialShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(MaterialShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public String getName() {
+		return Name;
+	}
+
+	public void setName(String name) {
+		Name = name;
+	}
+
+	public String getModel() {
+		return Model;
+	}
+
+	public void setModel(String model) {
+		Model = model;
+	}
+	
+	public String getColor() {
+		return Color;
+	}
+
+	public void setColor(String color) {
+		Color = color;
+	}
+
+	public String getUnit() {
+		return Unit;
+	}
+
+	public void setUnit(String unit) {
+		Unit = unit;
+	}
+    
+    public void setRetailPrice(Double retailPrice)
+    {
+        RetailPrice = retailPrice;
+    }
+
+    public Double getRetailPrice()
+    {
+        return RetailPrice;
+    }
+
+    public void setLowPrice(Double lowPrice)
+    {
+        LowPrice = lowPrice;
+    }
+
+    public Double getLowPrice()
+    {
+        return LowPrice;
+    }
+
+    public void setPresetPriceOne(Double presetPriceOne)
+    {
+        PresetPriceOne = presetPriceOne;
+    }
+
+    public Double getPresetPriceOne()
+    {
+        return PresetPriceOne;
+    }
+
+    public void setPresetPriceTwo(Double presetPriceTwo)
+    {
+        PresetPriceTwo = presetPriceTwo;
+    }
+
+    public Double getPresetPriceTwo()
+    {
+        return PresetPriceTwo;
+    }
+
+	public String getRemark() {
+		return Remark;
+	}
+
+	public void setRemark(String remark) {
+		Remark = remark;
+	}
+
+	public Long getCategoryId() {
+		return CategoryId;
+	}
+
+	public void setCategoryId(Long categoryId) {
+		CategoryId = categoryId;
+	}
+
+	public Long getMaterialID() {
+		return materialID;
+	}
+
+	public void setMaterialID(Long materialID) {
+		this.materialID = materialID;
+	}
+
+	public String getMaterialIDs() {
+		return materialIDs;
+	}
+
+	public void setMaterialIDs(String materialIDs) {
+		this.materialIDs = materialIDs;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+
+	public String getCategoryIds() {
+		return CategoryIds;
+	}
+
+	public void setCategoryIds(String categoryIds) {
+		CategoryIds = categoryIds;
+	}
+
+}

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

@@ -0,0 +1,43 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class MaterialShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+    
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+	private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+	@SuppressWarnings("rawtypes")
+	public Map<String, List> getMap() {
+		return map;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMap(Map<String, List> map) {
+		this.map = map;
+	}
+    
+    
+}

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

@@ -0,0 +1,109 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class PersonModel implements Serializable
+{
+    private PersonShowModel showModel = new PersonShowModel();
+
+    /**======开始接受页面参数=================**/
+    /**
+     * 类型
+     */
+    private String Type = "";
+    /**
+     * 姓名
+     */
+    private String Name = "";
+    
+    /**
+     * 分类ID
+     */
+    private Long personID = 0l;
+    
+    /**
+     * 分类IDs 批量操作使用
+     */
+    private String personIDs = "";
+    
+    /**
+     * 每页显示的个数
+     */
+    private int pageSize = 10;
+    
+    /**
+     * 当前页码
+     */
+    private int pageNo = 1;
+    
+    /**
+     * 用户IP，用户记录操作日志
+     */
+    private String clientIp = "";
+
+	public PersonShowModel getShowModel() {
+		return showModel;
+	}
+
+	public void setShowModel(PersonShowModel showModel) {
+		this.showModel = showModel;
+	}
+
+	public String getType() {
+		return Type;
+	}
+
+	public void setType(String type) {
+		Type = type;
+	}
+
+	public String getName() {
+		return Name;
+	}
+
+	public void setName(String name) {
+		Name = name;
+	}
+
+	public Long getPersonID() {
+		return personID;
+	}
+
+	public void setPersonID(Long personID) {
+		this.personID = personID;
+	}
+
+	public String getPersonIDs() {
+		return personIDs;
+	}
+
+	public void setPersonIDs(String personIDs) {
+		this.personIDs = personIDs;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+	
+}

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

@@ -0,0 +1,42 @@
+package com.jsh.model.vo.materials;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public class PersonShowModel implements Serializable
+{
+    /**
+     * 提示信息
+     */
+    private String msgTip = "";
+    
+    /**
+     * 系统数据
+     */
+    @SuppressWarnings("rawtypes")
+	private Map<String,List> map = new HashMap<String,List>();
+
+    public String getMsgTip() 
+    {
+        return msgTip;
+    }
+
+    public void setMsgTip(String msgTip) 
+    {
+        this.msgTip = msgTip;
+    }
+
+	@SuppressWarnings("rawtypes")
+	public Map<String, List> getMap() {
+		return map;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setMap(Map<String, List> map) {
+		this.map = map;
+	}
+    
+}