Skip to content
GitLab
Commit 227cf3b2 authored by 季圣华's avatar 季圣华
Browse files

优化界面，给商品和单位模块增加了部分字段

parent c8f80894
Show whitespace changes
Inline Side-by-side
src/com/jsh/dao/basic/VisitAccountIDAO.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.dao.basic;
import com.jsh.base.BaseIDAO;
import com.jsh.model.po.VisitAccount;
public interface VisitAccountIDAO extends BaseIDAO<VisitAccount>
{
}
src/com/jsh/model/po/Material.hbm.xml
View file @ 227cf3b2
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.jsh.model.po.Material" table="jsh_material">
<id name="Id" type="java.lang.Long">
......@@ -30,6 +30,26 @@
<comment>单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double">
<column name="RetailPrice" precision="22" scale="3">
<comment>零售价</comment>
</column>
</property>
<property generated="never" lazy="false" name="LowPrice" type="java.lang.Double">
<column name="LowPrice" precision="22" scale="3">
<comment>最低售价</comment>
</column>
</property>
<property generated="never" lazy="false" name="PresetPriceOne" type="java.lang.Double">
<column name="PresetPriceOne" precision="22" scale="3">
<comment>预设售价一</comment>
</column>
</property>
<property generated="never" lazy="false" name="PresetPriceTwo" type="java.lang.Double">
<column name="PresetPriceTwo" precision="22" scale="3">
<comment>预设售价二</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="100" name="Remark">
<comment>备注</comment>
......
src/com/jsh/model/po/Material.java
View file @ 227cf3b2
......@@ -9,6 +9,10 @@ public class Material implements java.io.Serializable
private String Model;
private String Color;
private String Unit;
private Double RetailPrice;
private Double LowPrice;
private Double PresetPriceOne;
private Double PresetPriceTwo;
private String Remark;
public Material()
......@@ -22,69 +26,129 @@ public class Material implements java.io.Serializable
}
public Material(MaterialCategory materialCategory, String name,
String model, String color, String unit, String remark) {
String model, String color, String unit, String remark,
Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo)
{
super();
this.materialCategory = materialCategory;
Name = name;
Model = model;
Color = color;
Unit = unit;
RetailPrice = retailPrice;
LowPrice = lowPrice;
PresetPriceOne = presetPriceOne;
PresetPriceTwo = presetPriceTwo;
Remark = remark;
}
public Long getId() {
public Long getId()
{
return Id;
}
public void setId(Long id) {
public void setId(Long id)
{
Id = id;
}
public MaterialCategory getMaterialCategory() {
public MaterialCategory getMaterialCategory()
{
return materialCategory;
}
public void setMaterialCategory(MaterialCategory materialCategory) {
public void setMaterialCategory(MaterialCategory materialCategory)
{
this.materialCategory = materialCategory;
}
public String getName() {
public String getName()
{
return Name;
}
public void setName(String name) {
public void setName(String name)
{
Name = name;
}
public String getModel() {
public String getModel()
{
return Model;
}
public void setModel(String model) {
public void setModel(String model)
{
Model = model;
}
public String getColor() {
public String getColor()
{
return Color;
}
public void setColor(String color) {
public void setColor(String color)
{
Color = color;
}
public String getUnit() {
public String getUnit()
{
return Unit;
}
public void setUnit(String unit) {
public void setUnit(String unit)
{
Unit = unit;
}
public String getRemark() {
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) {
public void setRemark(String remark)
{
Remark = remark;
}
......
src/com/jsh/model/po/Supplier.hbm.xml
View file @ 227cf3b2
......@@ -32,6 +32,26 @@
<comment>电子邮箱</comment>
</column>
</property>
<property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double">
<column name="BeginNeedGet" precision="22" scale="3">
<comment>期初应收</comment>
</column>
</property>
<property generated="never" lazy="false" name="BeginNeedPay" type="java.lang.Double">
<column name="BeginNeedPay" precision="22" scale="3">
<comment>期初应付</comment>
</column>
</property>
<property generated="never" lazy="false" name="AllNeedGet" type="java.lang.Double">
<column name="AllNeedGet" precision="22" scale="3">
<comment>累计应收</comment>
</column>
</property>
<property generated="never" lazy="false" name="AllNeedPay" type="java.lang.Double">
<column name="AllNeedPay" precision="22" scale="3">
<comment>累计应付</comment>
</column>
</property>
<property name="description" type="java.lang.String">
<column name="description" length="500" />
</property>
......
src/com/jsh/model/po/Supplier.java
View file @ 227cf3b2
......@@ -9,6 +9,10 @@ public class Supplier implements java.io.Serializable
private String contacts;
private String phonenum;
private String email;
private Double BeginNeedGet;
private Double BeginNeedPay;
private Double AllNeedGet;
private Double AllNeedPay;
private Short isystem;
private String description;
private Boolean enabled;
......@@ -23,29 +27,36 @@ public class Supplier implements java.io.Serializable
this.id = id;
}
public Supplier(String supplier, String type, String contacts,
String phonenum, String email, Short isystem, String description,
Boolean enabled) {
public Supplier(String supplier, String type, String contacts, String phonenum,
String email, Short isystem, String description, Boolean enabled,
Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) {
super();
this.supplier = supplier;
this.type = type;
this.contacts = contacts;
this.phonenum = phonenum;
this.email = email;
this.BeginNeedGet = beginNeedGet;
this.BeginNeedPay = beginNeedPay;
this.AllNeedGet = allNeedGet;
this.AllNeedPay = allNeedPay;
this.isystem = isystem;
this.description = description;
this.enabled = enabled;
}
public Long getId() {
public Long getId()
{
return id;
}
public void setId(Long id) {
public void setId(Long id)
{
this.id = id;
}
public String getSupplier() {
public String getSupplier()
{
return supplier;
}
......@@ -85,6 +96,46 @@ public class Supplier implements java.io.Serializable
this.email = email;
}
public void setBeginNeedGet(Double beginNeedGet)
{
BeginNeedGet = beginNeedGet;
}
public Double getBeginNeedGet()
{
return BeginNeedGet;
}
public void setBeginNeedPay(Double beginNeedPay)
{
BeginNeedPay = beginNeedPay;
}
public Double getBeginNeedPay()
{
return BeginNeedPay;
}
public void setAllNeedGet(Double allNeedGet)
{
AllNeedGet = allNeedGet;
}
public Double getAllNeedGet()
{
return AllNeedGet;
}
public void setAllNeedPay(Double allNeedPay)
{
AllNeedPay = allNeedPay;
}
public Double getAllNeedPay()
{
return AllNeedPay;
}
public Short getIsystem() {
return isystem;
}
......@@ -109,6 +160,4 @@ public class Supplier implements java.io.Serializable
this.enabled = enabled;
}
}
src/com/jsh/model/po/VisitAccount.hbm.xml deleted 100644 → 0
View file @ c8f80894
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.jsh.model.po.VisitAccount" table="jsh_visitaccount">
<id name="Id" type="java.lang.Long">
<column name="Id"/>
<generator class="native"/>
</id>
<many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
<column name="ProjectId" not-null="true" />
</many-to-one>
<property generated="never" lazy="false" name="LouHao" type="java.lang.String">
<column length="50" name="LouHao">
<comment>楼号</comment>
</column>
</property>
<property generated="never" lazy="false" name="HuHao" type="java.lang.String">
<column length="50" name="HuHao">
<comment>户号</comment>
</column>
</property>
<property generated="never" lazy="false" name="HuiFang" type="java.lang.String">
<column length="50" name="HuiFang">
<comment>回访情况</comment>
</column>
</property>
<property generated="never" lazy="false" name="LuoShi" type="java.lang.String">
<column length="50" name="LuoShi">
<comment>落实情况</comment>
</column>
</property>
<property generated="never" lazy="false" name="Name" type="java.lang.String">
<column length="50" name="Name">
<comment>住户姓名</comment>
</column>
</property>
<property generated="never" lazy="false" name="Tel" type="java.lang.String">
<column length="50" name="Tel">
<comment>电话 </comment>
</column>
</property>
<property name="AddTime" type="java.sql.Timestamp">
<column length="19" name="AddTime">
<comment>时间 </comment>
</column>
</property>
</class>
</hibernate-mapping>
src/com/jsh/model/po/VisitAccount.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.model.po;
import java.sql.Timestamp;
@SuppressWarnings("serial")
public class VisitAccount implements java.io.Serializable
{
private Long Id;
private Depot depot;
private String LouHao;
private String HuHao;
private String HuiFang;
private String LuoShi;
private String Name;
private String Tel;
private Timestamp AddTime;
public VisitAccount()
{
}
public VisitAccount(Long Id)
{
this.Id = Id;
}
public VisitAccount(Depot depot, String LouHao, String HuHao,
String HuiFang,String LuoShi,String Name,String Tel,Timestamp AddTime)
{
this.depot = depot;
this.LouHao = LouHao;
this.HuHao = HuHao;
this.HuiFang = HuiFang;
this.LuoShi = LuoShi;
this.Name = Name;
this.Tel = Tel;
this.AddTime = AddTime;
}
public Long getId() {
return Id;
}
public void setId(Long id) {
Id = id;
}
public Depot getDepot() {
return depot;
}
public void setDepot(Depot depot) {
this.depot = depot;
}
public String getLouHao() {
return LouHao;
}
public void setLouHao(String louHao) {
LouHao = louHao;
}
public String getHuHao() {
return HuHao;
}
public void setHuHao(String huHao) {
HuHao = huHao;
}
public String getHuiFang() {
return HuiFang;
}
public void setHuiFang(String huiFang) {
HuiFang = huiFang;
}
public String getLuoShi() {
return LuoShi;
}
public void setLuoShi(String luoShi) {
LuoShi = luoShi;
}
public String getName() {
return Name;
}
public void setName(String name) {
Name = name;
}
public String getTel() {
return Tel;
}
public void setTel(String tel) {
Tel = tel;
}
public Timestamp getAddTime() {
return AddTime;
}
public void setAddTime(Timestamp addTime) {
AddTime = addTime;
}
}
\ No newline at end of file
src/com/jsh/model/vo/basic/SupplierModel.java
View file @ 227cf3b2
......@@ -33,6 +33,26 @@ public class SupplierModel implements Serializable
*/
private String email = "";
/**
* 期初应收
*/
private Double BeginNeedGet;
/**
* 期初应付
*/
private Double BeginNeedPay;
/**
* 累计应收
*/
private Double AllNeedGet;
/**
* 累计应付
*/
private Double AllNeedPay;
/**
* 描述信息
*/
......@@ -116,6 +136,46 @@ public class SupplierModel implements Serializable
this.email = email;
}
public void setBeginNeedGet(Double beginNeedGet)
{
BeginNeedGet = beginNeedGet;
}
public Double getBeginNeedGet()
{
return BeginNeedGet;
}
public void setBeginNeedPay(Double beginNeedPay)
{
BeginNeedPay = beginNeedPay;
}
public Double getBeginNeedPay()
{
return BeginNeedPay;
}
public void setAllNeedGet(Double allNeedGet)
{
AllNeedGet = allNeedGet;
}
public Double getAllNeedGet()
{
return AllNeedGet;
}
public void setAllNeedPay(Double allNeedPay)
{
AllNeedPay = allNeedPay;
}
public Double getAllNeedPay()
{
return AllNeedPay;
}
public String getDescription() {
return description;
}
......
src/com/jsh/model/vo/basic/VisitAccountModel.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class VisitAccountModel implements Serializable
{
private VisitAccountShowModel showModel = new VisitAccountShowModel();
/**======开始接受页面参数=================**/
/**
* ProjectId
*/
private Long ProjectId;
/**
* 楼号
*/
private String LouHao = "";
/**
* 户号
*/
private String HuHao = "";
/**
* 回访情况
*/
private String HuiFang = "";
/**
* 落实情况
*/
private String LuoShi = "";
/**
* 住户姓名
*/
private String Name = "";
/**
* 电话
*/
private String Tel = "";
/**
* 时间
*/
private String AddTime = "";
/**
* 分类ID
*/
private Long visitAccountID = 0l;
/**
* 分类IDs 批量操作使用
*/
private String visitAccountIDs = "";
/**
* 每页显示的个数
*/
private int pageSize = 10;
/**
* 当前页码
*/
private int pageNo = 1;
/**
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
public VisitAccountShowModel getShowModel() {
return showModel;
}
public void setShowModel(VisitAccountShowModel showModel) {
this.showModel = showModel;
}
public Long getProjectId() {
return ProjectId;
}
public void setProjectId(Long projectId) {
ProjectId = projectId;
}
public String getLouHao() {
return LouHao;
}
public void setLouHao(String louHao) {
LouHao = louHao;
}
public String getHuHao() {
return HuHao;
}
public void setHuHao(String huHao) {
HuHao = huHao;
}
public String getHuiFang() {
return HuiFang;
}
public void setHuiFang(String huiFang) {
HuiFang = huiFang;
}
public String getLuoShi() {
return LuoShi;
}
public void setLuoShi(String luoShi) {
LuoShi = luoShi;
}
public String getName() {
return Name;
}
public void setName(String name) {
Name = name;
}
public String getTel() {
return Tel;
}
public void setTel(String tel) {
Tel = tel;
}
public String getAddTime() {
return AddTime;
}
public void setAddTime(String addTime) {
AddTime = addTime;
}
public Long getVisitAccountID() {
return visitAccountID;
}
public void setVisitAccountID(Long visitAccountID) {
this.visitAccountID = visitAccountID;
}
public String getVisitAccountIDs() {
return visitAccountIDs;
}
public void setVisitAccountIDs(String visitAccountIDs) {
this.visitAccountIDs = visitAccountIDs;
}
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/com/jsh/model/vo/basic/VisitAccountShowModel.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class VisitAccountShowModel implements Serializable
{
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
return msgTip;
}
public void setMsgTip(String msgTip)
{
this.msgTip = msgTip;
}
}
src/com/jsh/model/vo/materials/MaterialModel.java
View file @ 227cf3b2
......@@ -28,6 +28,26 @@ public class MaterialModel implements Serializable
*/
private String Unit = "";
/**
* 零售价
*/
private Double RetailPrice;
/**
* 最低售价
*/
private Double LowPrice;
/**
* 预设售价一
*/
private Double PresetPriceOne;
/**
* 预设售价二
*/
private Double PresetPriceTwo;
/**
* 备注
*/
......@@ -108,6 +128,46 @@ public class MaterialModel implements Serializable
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;
}
......
src/com/jsh/service/basic/VisitAccountIService.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.service.basic;
import com.jsh.base.BaseIService;
import com.jsh.model.po.VisitAccount;
public interface VisitAccountIService extends BaseIService<VisitAccount>
{
}
src/com/jsh/service/basic/VisitAccountService.java deleted 100644 → 0
View file @ c8f80894
package com.jsh.service.basic;
import com.jsh.base.BaseService;
import com.jsh.dao.basic.VisitAccountIDAO;
import com.jsh.model.po.VisitAccount;
public class VisitAccountService extends BaseService<VisitAccount> implements VisitAccountIService
{
@SuppressWarnings("unused")
private VisitAccountIDAO visitAccountDao;
public void setVisitAccountDao(VisitAccountIDAO visitAccountDao) {
this.visitAccountDao = visitAccountDao;
}
@Override
protected Class<VisitAccount> getEntityClass()
{
return VisitAccount.class;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment