purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购入库，增加单行的金额，合计金额，付款账户，付款金额等字段，改动较大，为临时版本

Browse Source
This commit is contained in:
季圣华
2016-12-24 23:57:50 +08:00
parent 77e30a07c8
commit adb6105fde
65 changed files with 1292 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/jsh/model/po/Building.hbm.xml
View File

@@ -1,29 +0,0 @@
<?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.Building" table="jsh_building">
<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="Name" type="java.lang.String">
<column length="20" name="Name">
<comment>名称</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="50" name="Remark">
<comment>备注</comment>
</column>
</property>
<property generated="never" lazy="false" name="Enabled" type="boolean">
<column length="1" name="Enabled">
<comment>启用</comment>
</column>
</property>
</class>
</hibernate-mapping>

70
src/com/jsh/model/po/Building.java
View File

@@ -1,70 +0,0 @@
package com.jsh.model.po;
@SuppressWarnings("serial")
public class Building implements java.io.Serializable
{
private Long Id;
private Depot depot;
private String Name;
private String Remark;
private Boolean Enabled;
public Building()
{
}
public Building(Long Id)
{
this.Id = Id;
}
public Building(Depot depot, String name, String remark, Boolean enabled) {
super();
this.depot = depot;
Name = name;
Remark = remark;
Enabled = enabled;
}
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 getName() {
return Name;
}
public void setName(String name) {
Name = name;
}
public String getRemark() {
return Remark;
}
public void setRemark(String remark) {
Remark = remark;
}
public Boolean getEnabled() {
return Enabled;
}
public void setEnabled(Boolean enabled) {
Enabled = enabled;
}
}

39
src/com/jsh/model/po/DepotHead.hbm.xml
View File

@@ -49,48 +49,33 @@
</many-to-one>
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
<column name="HandsPersonId">
<comment>采购/领料-经手人Id</comment>
<comment>经手人Id</comment>
</column>
</many-to-one>
<many-to-one name="WareHousePersonId" class="com.jsh.model.po.Person" lazy="false">
<column name="WareHousePersonId" not-null="true">
<comment>仓管员-经手人Id</comment>
<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
<column name="AccountId">
<comment>账户Id</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="SettlementWay" type="java.lang.String">
<column length="50" name="SettlementWay">
<comment>现金/记账</comment>
<property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
<column name="ChangeAmount" precision="22" scale="3">
<comment>变动金额(收款/付款)</comment>
</column>
</property>
<many-to-one name="BuildingId" class="com.jsh.model.po.Building" lazy="false">
<column name="BuildingId">
<comment>单元Id</comment>
</column>
</many-to-one>
<many-to-one name="AllocationProjectId" class="com.jsh.model.po.Depot" lazy="false">
<column name="AllocationProjectId">
<comment>调拨时，对方项目Id</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double">
<column name="TotalPrice" precision="22" scale="3">
<comment>合计金额</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="1000" name="Remark">
<comment>备注</comment>
</column>
</property>
<property generated="never" lazy="false" name="State" type="java.lang.String">
<column length="50" name="State">
<comment>草稿/已生效/废弃/待审核/未通过</comment>
</column>
</property>
<property generated="never" lazy="false" name="ReAuditPersonName" type="java.lang.String">
<column length="50" name="ReAuditPersonName">
<comment>撤审人</comment>
</column>
</property>
<property generated="never" lazy="false" name="Reason" type="java.lang.String">
<column length="100" name="Reason">
<comment>撤审原因</comment>
</column>
</property>
</class>
</hibernate-mapping>

86
src/com/jsh/model/po/DepotHead.java
View File

@@ -15,15 +15,11 @@ public class DepotHead implements java.io.Serializable
private Timestamp OperTime;
private Supplier OrganId;
private Person HandsPersonId;
private Person WareHousePersonId;
private String SettlementWay;
private Building BuildingId;
private Account AccountId;
private Double ChangeAmount;
private Depot AllocationProjectId;
private String Remark;
private String State;
private String ReAuditPersonName;
private String Reason;
private Double TotalPrice;
private String Remark;
public DepotHead()
{
@@ -38,9 +34,7 @@ public class DepotHead implements java.io.Serializable
public DepotHead(String type, String subType, Depot projectId,
String number, String operPersonName, Timestamp createTime,
Timestamp operTime, Supplier organId, Person handsPersonId,
Person wareHousePersonId, String settlementWay,
Building buildingId, Depot allocationProjectId, String remark,
String state, String reAuditPersonName, String reason) {
Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice, String remark) {
super();
Type = type;
SubType = subType;
@@ -51,14 +45,11 @@ public class DepotHead implements java.io.Serializable
OperTime = operTime;
OrganId = organId;
HandsPersonId = handsPersonId;
WareHousePersonId = wareHousePersonId;
SettlementWay = settlementWay;
BuildingId = buildingId;
AccountId = accountId;
ChangeAmount = changeAmount;
AllocationProjectId = allocationProjectId;
TotalPrice = totalPrice;
Remark = remark;
State = state;
ReAuditPersonName = reAuditPersonName;
Reason = reason;
}
public Long getId() {
@@ -140,29 +131,21 @@ public class DepotHead implements java.io.Serializable
public void setHandsPersonId(Person handsPersonId) {
HandsPersonId = handsPersonId;
}
public Person getWareHousePersonId() {
return WareHousePersonId;
public Account getAccountId() {
return AccountId;
}
public void setWareHousePersonId(Person wareHousePersonId) {
WareHousePersonId = wareHousePersonId;
public void setAccountId(Account accountId) {
AccountId = accountId;
}
public String getSettlementWay() {
return SettlementWay;
public Double getChangeAmount() {
return ChangeAmount;
}
public void setSettlementWay(String settlementWay) {
SettlementWay = settlementWay;
}
public Building getBuildingId() {
return BuildingId;
}
public void setBuildingId(Building buildingId) {
BuildingId = buildingId;
public void setChangeAmount(Double changeAmount) {
ChangeAmount = changeAmount;
}
public Depot getAllocationProjectId() {
@@ -173,6 +156,14 @@ public class DepotHead implements java.io.Serializable
AllocationProjectId = allocationProjectId;
}
public Double getTotalPrice() {
return TotalPrice;
}
public void setTotalPrice(Double totalPrice) {
TotalPrice = totalPrice;
}
public String getRemark() {
return Remark;
}
@@ -180,31 +171,4 @@ public class DepotHead implements java.io.Serializable
public void setRemark(String remark) {
Remark = remark;
}
public String getState() {
return State;
}
public void setState(String state) {
State = state;
}
public String getReAuditPersonName() {
return ReAuditPersonName;
}
public void setReAuditPersonName(String reAuditPersonName) {
ReAuditPersonName = reAuditPersonName;
}
public String getReason() {
return Reason;
}
public void setReason(String reason) {
Reason = reason;
}
}

6
src/com/jsh/model/po/DepotItem.hbm.xml
View File

@@ -27,9 +27,9 @@
<comment>单价</comment>
</column>
</property>
<property generated="never" lazy="false" name="Incidentals" type="java.lang.Double">
<column name="Incidentals" precision="22" scale="3">
<comment>运杂费</comment>
<property generated="never" lazy="false" name="AllPrice" type="java.lang.Double">
<column name="AllPrice" precision="22" scale="3">
<comment>金额</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">

14
src/com/jsh/model/po/DepotItem.java
View File

@@ -8,7 +8,7 @@ public class DepotItem implements java.io.Serializable
private Material MaterialId;
private Double OperNumber;
private Double UnitPrice;
private Double Incidentals;
private Double AllPrice;
private String Remark;
private String Img;
@@ -23,14 +23,14 @@ public class DepotItem implements java.io.Serializable
}
public DepotItem(DepotHead headerId, Material materialId,
Double operNumber, Double unitPrice, Double incidentals,
Double operNumber, Double unitPrice, Double allPrice,
String remark, String img) {
super();
HeaderId = headerId;
MaterialId = materialId;
OperNumber = operNumber;
UnitPrice = unitPrice;
Incidentals = incidentals;
AllPrice = allPrice;
Remark = remark;
Img = img;
}
@@ -75,12 +75,12 @@ public class DepotItem implements java.io.Serializable
UnitPrice = unitPrice;
}
public Double getIncidentals() {
return Incidentals;
public Double getAllPrice() {
return AllPrice;
}
public void setIncidentals(Double incidentals) {
Incidentals = incidentals;
public void setAllPrice(Double allPrice) {
AllPrice = allPrice;
}
public String getRemark() {

3
src/com/jsh/model/po/Person.hbm.xml
View File

@@ -7,9 +7,6 @@
<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="Type" type="java.lang.String">
<column length="20" name="Type">
<comment>类型</comment>

12
src/com/jsh/model/po/Person.java
View File

@@ -4,7 +4,6 @@ package com.jsh.model.po;
public class Person implements java.io.Serializable
{
private Long Id;
private Depot depot;
private String Type;
private String Name;
@@ -18,8 +17,7 @@ public class Person implements java.io.Serializable
this.Id = Id;
}
public Person(Depot depot, String type, String name) {
this.depot = depot;
public Person(String type, String name) {
Type = type;
Name = name;
}
@@ -32,14 +30,6 @@ public class Person implements java.io.Serializable
Id = id;
}
public Depot getDepot() {
return depot;
}
public void setDepot(Depot depot) {
this.depot = depot;
}
public String getType() {
return Type;
}

133
src/com/jsh/model/vo/materials/BuildingModel.java
View File

@@ -1,133 +0,0 @@
package com.jsh.model.vo.materials;
import java.io.Serializable;
@SuppressWarnings("serial")
public class BuildingModel implements Serializable
{
private BuildingShowModel showModel = new BuildingShowModel();
/**======开始接受页面参数=================**/
/**
* ProjectId
*/
private Long ProjectId;
/**
* 名称
*/
private String Name = "";
/**
* 备注
*/
private String Remark = "";
/**
* 启用
*/
private Boolean Enabled = false;
/**
* 分类ID
*/
private Long buildingID = 0l;
/**
* 分类IDs 批量操作使用
*/
private String buildingIDs = "";
/**
* 每页显示的个数
*/
private int pageSize = 10;
/**
* 当前页码
*/
private int pageNo = 1;
/**
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
public BuildingShowModel getShowModel() {
return showModel;
}
public void setShowModel(BuildingShowModel showModel) {
this.showModel = showModel;
}
public Long getProjectId() {
return ProjectId;
}
public void setProjectId(Long projectId) {
ProjectId = projectId;
}
public String getName() {
return Name;
}
public void setName(String name) {
Name = name;
}
public String getRemark() {
return Remark;
}
public void setRemark(String remark) {
Remark = remark;
}
public Boolean getEnabled() {
return Enabled;
}
public void setEnabled(Boolean enabled) {
Enabled = enabled;
}
public Long getBuildingID() {
return buildingID;
}
public void setBuildingID(Long buildingID) {
this.buildingID = buildingID;
}
public String getBuildingIDs() {
return buildingIDs;
}
public void setBuildingIDs(String buildingIDs) {
this.buildingIDs = buildingIDs;
}
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;
}
}

37
src/com/jsh/model/vo/materials/BuildingShowModel.java
View File

@@ -1,37 +0,0 @@
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 BuildingShowModel 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;
}
}

65
src/com/jsh/model/vo/materials/DepotHeadModel.java
View File

@@ -16,14 +16,11 @@ public class DepotHeadModel implements Serializable
private String OperTime;
private Long OrganId;
private Long HandsPersonId;
private Long WareHousePersonId;
private String SettlementWay = "";
private Long BuildingId;
private Long AccountId;
private Double ChangeAmount;
private Long AllocationProjectId;
private Double TotalPrice;
private String Remark = "";
private String State = "";
private String ReAuditPersonName = "";
private String Reason = "";
private String BeginTime; //查询开始时间
private String EndTime; //查询结束时间
@@ -117,28 +114,20 @@ public class DepotHeadModel implements Serializable
HandsPersonId = handsPersonId;
}
public Long getWareHousePersonId() {
return WareHousePersonId;
public Long getAccountId() {
return AccountId;
}
public void setWareHousePersonId(Long wareHousePersonId) {
WareHousePersonId = wareHousePersonId;
public void setAccountId(Long accountId) {
AccountId = accountId;
}
public String getSettlementWay() {
return SettlementWay;
public Double getChangeAmount() {
return ChangeAmount;
}
public void setSettlementWay(String settlementWay) {
SettlementWay = settlementWay;
}
public Long getBuildingId() {
return BuildingId;
}
public void setBuildingId(Long buildingId) {
BuildingId = buildingId;
public void setChangeAmount(Double changeAmount) {
ChangeAmount = changeAmount;
}
public Long getAllocationProjectId() {
@@ -149,6 +138,14 @@ public class DepotHeadModel implements Serializable
AllocationProjectId = allocationProjectId;
}
public Double getTotalPrice() {
return TotalPrice;
}
public void setTotalPrice(Double totalPrice) {
TotalPrice = totalPrice;
}
public String getRemark() {
return Remark;
}
@@ -157,30 +154,6 @@ public class DepotHeadModel implements Serializable
Remark = remark;
}
public String getState() {
return State;
}
public void setState(String state) {
State = state;
}
public String getReAuditPersonName() {
return ReAuditPersonName;
}
public void setReAuditPersonName(String reAuditPersonName) {
ReAuditPersonName = reAuditPersonName;
}
public String getReason() {
return Reason;
}
public void setReason(String reason) {
Reason = reason;
}
public Long getDepotHeadID() {
return depotHeadID;
}

10
src/com/jsh/model/vo/materials/DepotItemModel.java
View File

@@ -13,7 +13,7 @@ public class DepotItemModel implements Serializable
private Long MaterialId;
private Double OperNumber;
private Double UnitPrice;
private Double Incidentals;
private Double AllPrice;
private String Remark = "";
private String Img = "";
@@ -100,12 +100,12 @@ public class DepotItemModel implements Serializable
UnitPrice = unitPrice;
}
public Double getIncidentals() {
return Incidentals;
public Double getAllPrice() {
return AllPrice;
}
public void setIncidentals(Double incidentals) {
Incidentals = incidentals;
public void setAllPrice(Double allPrice) {
AllPrice = allPrice;
}
public String getRemark() {

12
src/com/jsh/model/vo/materials/PersonModel.java
View File

@@ -8,10 +8,6 @@ public class PersonModel implements Serializable
private PersonShowModel showModel = new PersonShowModel();
/**======开始接受页面参数=================**/
/**
* ProjectId
*/
private Long ProjectId;
/**
* 类型
*/
@@ -54,14 +50,6 @@ public class PersonModel implements Serializable
this.showModel = showModel;
}
public Long getProjectId() {
return ProjectId;
}
public void setProjectId(Long projectId) {
ProjectId = projectId;
}
public String getType() {
return Type;
}