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

给财务单据增加合计的功能

Browse Source
This commit is contained in:
季圣华
2017-01-21 23:04:42 +08:00
parent 4a632b58d7
commit a1701cce81
10 changed files with 220 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/jsh/action/materials/AccountHeadAction.java
View File

@@ -69,6 +69,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));}
if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
accountHead.setChangeAmount(model.getChangeAmount());
accountHead.setTotalPrice(model.getTotalPrice());
if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
accountHead.setBillNo(model.getBillNo());
try
@@ -154,6 +155,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));}
if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
accountHead.setChangeAmount(model.getChangeAmount());
accountHead.setTotalPrice(model.getTotalPrice());
if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));}
accountHead.setBillNo(model.getBillNo());
try
@@ -255,6 +257,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
item.put("BillNo", accountHead.getBillNo());
item.put("BillTime", Tools.getCurrentMonth(accountHead.getBillTime()));
item.put("ChangeAmount", accountHead.getChangeAmount()==null?"":Math.abs(accountHead.getChangeAmount()));
item.put("TotalPrice", accountHead.getTotalPrice()==null?"":Math.abs(accountHead.getTotalPrice()));
item.put("Remark", accountHead.getRemark());
item.put("op", 1);
dataArray.add(item);

107
src/com/jsh/model/po/AccountHead.hbm.xml
View File

@@ -1,51 +1,56 @@
<?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.AccountHead" table="jsh_accounthead">
<id name="Id" type="java.lang.Long">
<column name="Id"/>
<generator class="native"/>
</id>
<property generated="never" lazy="false" name="Type" type="java.lang.String">
<column length="50" name="Type">
<comment>类型(支出/收入/收款/付款/转账)</comment>
</column>
</property>
<many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false">
<column name="OrganId">
<comment>单位Id(收款/付款单位)</comment>
</column>
</many-to-one>
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
<column name="HandsPersonId">
<comment>经手人Id</comment>
</column>
</many-to-one>
<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="AccountId" class="com.jsh.model.po.Account" lazy="false">
<column name="AccountId">
<comment>账户(收款/付款)</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="BillNo" type="java.lang.String">
<column length="50" name="BillNo">
<comment>单据编号</comment>
</column>
</property>
<property name="BillTime" type="java.sql.Timestamp">
<column length="19" name="BillTime">
<comment>单据日期</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="100" name="Remark">
<comment>备注</comment>
</column>
</property>
</class>
</hibernate-mapping>
<?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.AccountHead" table="jsh_accounthead">
<id name="Id" type="java.lang.Long">
<column name="Id"/>
<generator class="native"/>
</id>
<property generated="never" lazy="false" name="Type" type="java.lang.String">
<column length="50" name="Type">
<comment>类型(支出/收入/收款/付款/转账)</comment>
</column>
</property>
<many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false">
<column name="OrganId">
<comment>单位Id(收款/付款单位)</comment>
</column>
</many-to-one>
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
<column name="HandsPersonId">
<comment>经手人Id</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
<column name="ChangeAmount" precision="22" scale="3">
<comment>变动金额(优惠/收款/付款/实付)</comment>
</column>
</property>
<property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double">
<column name="TotalPrice" precision="22" scale="3">
<comment>合计金额</comment>
</column>
</property>
<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
<column name="AccountId">
<comment>账户(收款/付款)</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="BillNo" type="java.lang.String">
<column length="50" name="BillNo">
<comment>单据编号</comment>
</column>
</property>
<property name="BillTime" type="java.sql.Timestamp">
<column length="19" name="BillTime">
<comment>单据日期</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="100" name="Remark">
<comment>备注</comment>
</column>
</property>
</class>
</hibernate-mapping>

16
src/com/jsh/model/po/AccountHead.java
View File

@@ -10,6 +10,7 @@ public class AccountHead implements java.io.Serializable
private Supplier OrganId;
private Person HandsPersonId;
private Double ChangeAmount;
private Double TotalPrice;
private Account AccountId;
private String BillNo;
private Timestamp BillTime;
@@ -26,14 +27,15 @@ public class AccountHead implements java.io.Serializable
}
public AccountHead(String type, Supplier organId,
Person handsPersonId, Double changeAmount, Account accountId,
String billNo, Timestamp billTime, String remark)
Person handsPersonId, Double changeAmount, Double totalPrice,
Account accountId, String billNo, Timestamp billTime, String remark)
{
super();
Type = type;
OrganId = organId;
HandsPersonId = handsPersonId;
ChangeAmount = changeAmount;
TotalPrice = totalPrice;
AccountId = accountId;
BillNo = billNo;
BillTime = billTime;
@@ -89,8 +91,16 @@ public class AccountHead implements java.io.Serializable
{
return ChangeAmount;
}
public void setTotalPrice(Double totalPrice) {
TotalPrice = totalPrice;
}
public Double getTotalPrice() {
return TotalPrice;
}
public void setAccountId(Account accountId)
public void setAccountId(Account accountId)
{
AccountId = accountId;
}

11
src/com/jsh/model/vo/materials/AccountHeadModel.java
View File

@@ -12,6 +12,7 @@ public class AccountHeadModel implements Serializable
private Long OrganId;
private Long HandsPersonId;
private Double ChangeAmount;
private Double TotalPrice;
private Long AccountId;
private String BillNo;
private String BillTime;
@@ -94,7 +95,15 @@ public class AccountHeadModel implements Serializable
return ChangeAmount;
}
public void setAccountId(Long accountId)
public void setTotalPrice(Double totalPrice) {
TotalPrice = totalPrice;
}
public Double getTotalPrice() {
return TotalPrice;
}
public void setAccountId(Long accountId)
{
AccountId = accountId;
}