Skip to content

H
hg-smart
Commit 1eabfc30 by 13420
Options

销售开票更改文件名

parent 28459713
Showing with 328 additions and 160 deletions
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW010.java
...@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.cw.domain; ...@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.cw.domain;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn; import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase; import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap; import java.util.HashMap;
...@@ -29,13 +30,17 @@ public class HGCW010 extends DaoEPBase { ...@@ -29,13 +30,17 @@ public class HGCW010 extends DaoEPBase {
public static final String FIELD_COMPANY_NAME = "companyName"; /* 公司名称*/ public static final String FIELD_COMPANY_NAME = "companyName"; /* 公司名称*/
public static final String FIELD_PROJ_NAME = "projName"; /* 项目名称*/ public static final String FIELD_PROJ_NAME = "projName"; /* 项目名称*/
public static final String FIELD_PROJ_CODE = "projCode"; /* 项目编号*/ public static final String FIELD_PROJ_CODE = "projCode"; /* 项目编号*/
public static final String FIELD_CONTRACT_NUMBER = "contractNumber"; /* 来源单号*/ public static final String FIELD_SETTLEMENT_NUMBER = "settlementNumber"; /* 来源单号*/
public static final String FIELD_INCOME_NUMBER = "incomeNumber"; /* 收款单号*/ public static final String FIELD_BILL_TYBE = "billTybe"; /* 票据类型*/
public static final String FIELD_SIGNING_DATE = "signingDate"; /* 收款日期*/ public static final String FIELD_BILL_NUMBER = "billNumber"; /* 发票号*/
public static final String FIELD_BILL_STATE = "billState"; /* 开票状态*/
public static final String FIELD_SIGNING_DATE = "signingDate"; /* 开票日期*/
public static final String FIELD_PARTY_A = "partyA"; /* 客户名称*/ public static final String FIELD_PARTY_A = "partyA"; /* 客户名称*/
public static final String FIELD_CANCEL_STATUS = "cancelStatus"; /* 核销状态*/
public static final String FIELD_REVIEW_STATUS = "reviewStatus"; /* 审批状态*/ public static final String FIELD_REVIEW_STATUS = "reviewStatus"; /* 审批状态*/
public static final String FIELD_TOTAL_CONTRACT_PRICE_INCLUDING = "totalContractPriceIncluding"; /* 收款总额*/ public static final String FIELD_THIS_SETTLEMENT_TAX = "thisSettlementTax"; /* 税额*/
public static final String FIELD_THIS_SETTLEMENT_AMOUNT = "thisSettlementAmount"; /* 不含税金额*/
public static final String FIELD_TAX_POINTS = "taxPoints"; /* 税率*/
public static final String FIELD_TOTAL_CONTRACT_PRICE_INCLUDING = "totalContractPriceIncluding"; /* 开票总额*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 记录创建者*/ public static final String FIELD_CREATED_BY = "createdBy"; /* 记录创建者*/
public static final String FIELD_CREATED_NAME = "createdName"; /* 记录创建名称*/ public static final String FIELD_CREATED_NAME = "createdName"; /* 记录创建名称*/
public static final String FIELD_CREATED_TIME = "createdTime"; /* 记录创建时间*/ public static final String FIELD_CREATED_TIME = "createdTime"; /* 记录创建时间*/
...@@ -50,13 +55,17 @@ public class HGCW010 extends DaoEPBase { ...@@ -50,13 +55,17 @@ public class HGCW010 extends DaoEPBase {
public static final String COL_COMPANY_NAME = "COMPANY_NAME"; /* 公司名称*/ public static final String COL_COMPANY_NAME = "COMPANY_NAME"; /* 公司名称*/
public static final String COL_PROJ_NAME = "PROJ_NAME"; /* 项目名称*/ public static final String COL_PROJ_NAME = "PROJ_NAME"; /* 项目名称*/
public static final String COL_PROJ_CODE = "PROJ_CODE"; /* 项目编号*/ public static final String COL_PROJ_CODE = "PROJ_CODE"; /* 项目编号*/
public static final String COL_CONTRACT_NUMBER = "CONTRACT_NUMBER"; /* 来源单号*/ public static final String COL_SETTLEMENT_NUMBER = "SETTLEMENT_NUMBER"; /* 来源单号*/
public static final String COL_INCOME_NUMBER = "INCOME_NUMBER"; /* 收款单号*/ public static final String COL_BILL_TYBE = "BILL_TYBE"; /* 票据类型*/
public static final String COL_SIGNING_DATE = "SIGNING_DATE"; /* 收款日期*/ public static final String COL_BILL_NUMBER = "BILL_NUMBER"; /* 发票号*/
public static final String COL_BILL_STATE = "BILL_STATE"; /* 开票状态*/
public static final String COL_SIGNING_DATE = "SIGNING_DATE"; /* 开票日期*/
public static final String COL_PARTY_A = "PARTY_A"; /* 客户名称*/ public static final String COL_PARTY_A = "PARTY_A"; /* 客户名称*/
public static final String COL_CANCEL_STATUS = "CANCEL_STATUS"; /* 核销状态*/
public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; /* 审批状态*/ public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; /* 审批状态*/
public static final String COL_TOTAL_CONTRACT_PRICE_INCLUDING = "TOTAL_CONTRACT_PRICE_INCLUDING"; /* 收款总额*/ public static final String COL_THIS_SETTLEMENT_TAX = "THIS_SETTLEMENT_TAX"; /* 税额*/
public static final String COL_THIS_SETTLEMENT_AMOUNT = "THIS_SETTLEMENT_AMOUNT"; /* 不含税金额*/
public static final String COL_TAX_POINTS = "TAX_POINTS"; /* 税率*/
public static final String COL_TOTAL_CONTRACT_PRICE_INCLUDING = "TOTAL_CONTRACT_PRICE_INCLUDING"; /* 开票总额*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 记录创建者*/ public static final String COL_CREATED_BY = "CREATED_BY"; /* 记录创建者*/
public static final String COL_CREATED_NAME = "CREATED_NAME"; /* 记录创建名称*/ public static final String COL_CREATED_NAME = "CREATED_NAME"; /* 记录创建名称*/
public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 记录创建时间*/ public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 记录创建时间*/
...@@ -69,7 +78,10 @@ public class HGCW010 extends DaoEPBase { ...@@ -69,7 +78,10 @@ public class HGCW010 extends DaoEPBase {
public static final String COUNT = "HGCW010.count"; public static final String COUNT = "HGCW010.count";
public static final String INSERT = "HGCW010.insert"; public static final String INSERT = "HGCW010.insert";
public static final String UPDATE = "HGCW010.update"; public static final String UPDATE = "HGCW010.update";
public static final String UPDATE_STATUS = "HGCW010.updateStatus";
public static final String UPDATE_DOC_ID = "HGCW010.updateDocId";
public static final String DELETE = "HGCW010.delete"; public static final String DELETE = "HGCW010.delete";
public static final String DELETE_FLAG = "HGCW010.deleteFlag";
private Long id = new Long(0); private Long id = new Long(0);
private String accountCode = " "; /* 企业编码*/ private String accountCode = " "; /* 企业编码*/
...@@ -77,13 +89,17 @@ public class HGCW010 extends DaoEPBase { ...@@ -77,13 +89,17 @@ public class HGCW010 extends DaoEPBase {
private String companyName = " "; /* 公司名称*/ private String companyName = " "; /* 公司名称*/
private String projName = " "; /* 项目名称*/ private String projName = " "; /* 项目名称*/
private String projCode = " "; /* 项目编号*/ private String projCode = " "; /* 项目编号*/
private String contractNumber = " "; /* 来源单号*/ private String settlementNumber = " "; /* 来源单号*/
private String incomeNumber = " "; /* 收款单号*/ private String billTybe = " "; /* 票据类型*/
private String signingDate = " "; /* 收款日期*/ private String billNumber = " "; /* 发票号*/
private String billState = " "; /* 开票状态*/
private String signingDate = " "; /* 开票日期*/
private String partyA = " "; /* 客户名称*/ private String partyA = " "; /* 客户名称*/
private Boolean cancelStatus; /* 核销状态*/
private Boolean reviewStatus; /* 审批状态*/ private Boolean reviewStatus; /* 审批状态*/
private String totalContractPriceIncluding = " "; /* 收款总额*/ private String thisSettlementTax = " "; /* 税额*/
private String thisSettlementAmount = " "; /* 不含税金额*/
private String taxPoints = " "; /* 税率*/
private BigDecimal totalContractPriceIncluding = new BigDecimal("0"); /* 开票总额*/
private String createdBy = " "; /* 记录创建者*/ private String createdBy = " "; /* 记录创建者*/
private String createdName = " "; /* 记录创建名称*/ private String createdName = " "; /* 记录创建名称*/
private String createdTime = " "; /* 记录创建时间*/ private String createdTime = " "; /* 记录创建时间*/
...@@ -123,32 +139,51 @@ public class HGCW010 extends DaoEPBase { ...@@ -123,32 +139,51 @@ public class HGCW010 extends DaoEPBase {
eiColumn.setDescName("项目编号"); eiColumn.setDescName("项目编号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CONTRACT_NUMBER); eiColumn = new EiColumn(FIELD_SETTLEMENT_NUMBER);
eiColumn.setDescName("来源单号"); eiColumn.setDescName("来源单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INCOME_NUMBER); eiColumn = new EiColumn(FIELD_BILL_TYBE);
eiColumn.setDescName("收款单号"); eiColumn.setDescName("票据类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_BILL_NUMBER);
eiColumn.setDescName("发票号");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_BILL_STATE);
eiColumn.setDescName("开票状态");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SIGNING_DATE); eiColumn = new EiColumn(FIELD_SIGNING_DATE);
eiColumn.setDescName("收款日期"); eiColumn.setDescName("开票日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PARTY_A); eiColumn = new EiColumn(FIELD_PARTY_A);
eiColumn.setDescName("客户名称"); eiColumn.setDescName("客户名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CANCEL_STATUS);
eiColumn.setDescName("核销状态");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REVIEW_STATUS); eiColumn = new EiColumn(FIELD_REVIEW_STATUS);
eiColumn.setDescName("审批状态"); eiColumn.setDescName("审批状态");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX);
eiColumn.setDescName("税额");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT);
eiColumn.setDescName("不含税金额");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TAX_POINTS);
eiColumn.setDescName("税率");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING); eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING);
eiColumn.setDescName("收款总额"); eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(15);
eiColumn.setDescName("开票总额");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
...@@ -286,39 +321,71 @@ public class HGCW010 extends DaoEPBase { ...@@ -286,39 +321,71 @@ public class HGCW010 extends DaoEPBase {
this.projCode = projCode; this.projCode = projCode;
} }
/** /**
* get the contractNumber - 来源单号. * get the settlementNumber - 来源单号.
* @return the contractNumber * @return the settlementNumber
*/
public String getSettlementNumber() {
return this.settlementNumber;
}
/**
* set the settlementNumber - 来源单号.
*
* @param settlementNumber - 来源单号
*/
public void setSettlementNumber(String settlementNumber) {
this.settlementNumber = settlementNumber;
}
/**
* get the billTybe - 票据类型.
* @return the billTybe
*/ */
public String getContractNumber() { public String getBillTybe() {
return this.contractNumber; return this.billTybe;
} }
/** /**
* set the contractNumber - 来源单号. * set the billTybe - 票据类型.
* *
* @param contractNumber - 来源单号 * @param billTybe - 票据类型
*/ */
public void setContractNumber(String contractNumber) { public void setBillTybe(String billTybe) {
this.contractNumber = contractNumber; this.billTybe = billTybe;
} }
/** /**
* get the incomeNumber - 收款单号. * get the billNumber - 发票号.
* @return the incomeNumber * @return the billNumber
*/ */
public String getIncomeNumber() { public String getBillNumber() {
return this.incomeNumber; return this.billNumber;
} }
/** /**
* set the incomeNumber - 收款单号. * set the billNumber - 发票号.
* *
* @param incomeNumber - 收款单号 * @param billNumber - 发票号
*/ */
public void setIncomeNumber(String incomeNumber) { public void setBillNumber(String billNumber) {
this.incomeNumber = incomeNumber; this.billNumber = billNumber;
} }
/** /**
* get the signingDate - 收款日期. * get the billState - 开票状态.
* @return the billState
*/
public String getBillState() {
return this.billState;
}
/**
* set the billState - 开票状态.
*
* @param billState - 开票状态
*/
public void setBillState(String billState) {
this.billState = billState;
}
/**
* get the signingDate - 开票日期.
* @return the signingDate * @return the signingDate
*/ */
public String getSigningDate() { public String getSigningDate() {
...@@ -326,9 +393,9 @@ public class HGCW010 extends DaoEPBase { ...@@ -326,9 +393,9 @@ public class HGCW010 extends DaoEPBase {
} }
/** /**
* set the signingDate - 收款日期. * set the signingDate - 开票日期.
* *
* @param signingDate - 收款日期 * @param signingDate - 开票日期
*/ */
public void setSigningDate(String signingDate) { public void setSigningDate(String signingDate) {
this.signingDate = signingDate; this.signingDate = signingDate;
...@@ -350,22 +417,6 @@ public class HGCW010 extends DaoEPBase { ...@@ -350,22 +417,6 @@ public class HGCW010 extends DaoEPBase {
this.partyA = partyA; this.partyA = partyA;
} }
/** /**
* get the cancelStatus - 核销状态.
* @return the cancelStatus
*/
public Boolean getCancelStatus() {
return this.cancelStatus;
}
/**
* set the cancelStatus - 核销状态.
*
* @param cancelStatus - 核销状态
*/
public void setCancelStatus(Boolean cancelStatus) {
this.cancelStatus = cancelStatus;
}
/**
* get the reviewStatus - 审批状态. * get the reviewStatus - 审批状态.
* @return the reviewStatus * @return the reviewStatus
*/ */
...@@ -382,19 +433,67 @@ public class HGCW010 extends DaoEPBase { ...@@ -382,19 +433,67 @@ public class HGCW010 extends DaoEPBase {
this.reviewStatus = reviewStatus; this.reviewStatus = reviewStatus;
} }
/** /**
* get the totalContractPriceIncluding - 收款总额. * get the thisSettlementTax - 税额.
* @return the thisSettlementTax
*/
public String getThisSettlementTax() {
return this.thisSettlementTax;
}
/**
* set the thisSettlementTax - 税额.
*
* @param thisSettlementTax - 税额
*/
public void setThisSettlementTax(String thisSettlementTax) {
this.thisSettlementTax = thisSettlementTax;
}
/**
* get the thisSettlementAmount - 不含税金额.
* @return the thisSettlementAmount
*/
public String getThisSettlementAmount() {
return this.thisSettlementAmount;
}
/**
* set the thisSettlementAmount - 不含税金额.
*
* @param thisSettlementAmount - 不含税金额
*/
public void setThisSettlementAmount(String thisSettlementAmount) {
this.thisSettlementAmount = thisSettlementAmount;
}
/**
* get the taxPoints - 税率.
* @return the taxPoints
*/
public String getTaxPoints() {
return this.taxPoints;
}
/**
* set the taxPoints - 税率.
*
* @param taxPoints - 税率
*/
public void setTaxPoints(String taxPoints) {
this.taxPoints = taxPoints;
}
/**
* get the totalContractPriceIncluding - 开票总额.
* @return the totalContractPriceIncluding * @return the totalContractPriceIncluding
*/ */
public String getTotalContractPriceIncluding() { public BigDecimal getTotalContractPriceIncluding() {
return this.totalContractPriceIncluding; return this.totalContractPriceIncluding;
} }
/** /**
* set the totalContractPriceIncluding - 收款总额. * set the totalContractPriceIncluding - 开票总额.
* *
* @param totalContractPriceIncluding - 收款总额 * @param totalContractPriceIncluding - 开票总额
*/ */
public void setTotalContractPriceIncluding(String totalContractPriceIncluding) { public void setTotalContractPriceIncluding(BigDecimal totalContractPriceIncluding) {
this.totalContractPriceIncluding = totalContractPriceIncluding; this.totalContractPriceIncluding = totalContractPriceIncluding;
} }
/** /**
...@@ -523,13 +622,17 @@ public class HGCW010 extends DaoEPBase { ...@@ -523,13 +622,17 @@ public class HGCW010 extends DaoEPBase {
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName)); setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName)); setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode)); setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber)); setSettlementNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SETTLEMENT_NUMBER)), settlementNumber));
setIncomeNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INCOME_NUMBER)), incomeNumber)); setBillTybe(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_TYBE)), billTybe));
setBillNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_NUMBER)), billNumber));
setBillState(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_BILL_STATE)), billState));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate)); setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA)); setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setCancelStatus(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_CANCEL_STATUS)), cancelStatus));
setReviewStatus(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus)); setReviewStatus(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
setTotalContractPriceIncluding(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)), totalContractPriceIncluding)); setThisSettlementTax(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_TAX)), thisSettlementTax));
setThisSettlementAmount(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_AMOUNT)), thisSettlementAmount));
setTaxPoints(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
setTotalContractPriceIncluding(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)), totalContractPriceIncluding));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy)); setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName)); setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime)); setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
...@@ -552,12 +655,16 @@ public class HGCW010 extends DaoEPBase { ...@@ -552,12 +655,16 @@ public class HGCW010 extends DaoEPBase {
map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME))); map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME))); map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE))); map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
map.put(FIELD_CONTRACT_NUMBER, StringUtils.toString(contractNumber, eiMetadata.getMeta(FIELD_CONTRACT_NUMBER))); map.put(FIELD_SETTLEMENT_NUMBER, StringUtils.toString(settlementNumber, eiMetadata.getMeta(FIELD_SETTLEMENT_NUMBER)));
map.put(FIELD_INCOME_NUMBER, StringUtils.toString(incomeNumber, eiMetadata.getMeta(FIELD_INCOME_NUMBER))); map.put(FIELD_BILL_TYBE, StringUtils.toString(billTybe, eiMetadata.getMeta(FIELD_BILL_TYBE)));
map.put(FIELD_BILL_NUMBER, StringUtils.toString(billNumber, eiMetadata.getMeta(FIELD_BILL_NUMBER)));
map.put(FIELD_BILL_STATE, StringUtils.toString(billState, eiMetadata.getMeta(FIELD_BILL_STATE)));
map.put(FIELD_SIGNING_DATE, StringUtils.toString(signingDate, eiMetadata.getMeta(FIELD_SIGNING_DATE))); map.put(FIELD_SIGNING_DATE, StringUtils.toString(signingDate, eiMetadata.getMeta(FIELD_SIGNING_DATE)));
map.put(FIELD_PARTY_A, StringUtils.toString(partyA, eiMetadata.getMeta(FIELD_PARTY_A))); map.put(FIELD_PARTY_A, StringUtils.toString(partyA, eiMetadata.getMeta(FIELD_PARTY_A)));
map.put(FIELD_CANCEL_STATUS, StringUtils.toString(cancelStatus, eiMetadata.getMeta(FIELD_CANCEL_STATUS)));
map.put(FIELD_REVIEW_STATUS, StringUtils.toString(reviewStatus, eiMetadata.getMeta(FIELD_REVIEW_STATUS))); map.put(FIELD_REVIEW_STATUS, StringUtils.toString(reviewStatus, eiMetadata.getMeta(FIELD_REVIEW_STATUS)));
map.put(FIELD_THIS_SETTLEMENT_TAX, StringUtils.toString(thisSettlementTax, eiMetadata.getMeta(FIELD_THIS_SETTLEMENT_TAX)));
map.put(FIELD_THIS_SETTLEMENT_AMOUNT, StringUtils.toString(thisSettlementAmount, eiMetadata.getMeta(FIELD_THIS_SETTLEMENT_AMOUNT)));
map.put(FIELD_TAX_POINTS, StringUtils.toString(taxPoints, eiMetadata.getMeta(FIELD_TAX_POINTS)));
map.put(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING, StringUtils.toString(totalContractPriceIncluding, eiMetadata.getMeta(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING))); map.put(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING, StringUtils.toString(totalContractPriceIncluding, eiMetadata.getMeta(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)));
map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY))); map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME))); map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java → src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010.java
...@@ -3,8 +3,7 @@ package com.baosight.hggp.hg.cw.service; ...@@ -3,8 +3,7 @@ package com.baosight.hggp.hg.cw.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation; import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.dao.DaoUtils; import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.cw.domain.HGCW002; import com.baosight.hggp.hg.cw.domain.HGCW010;
import com.baosight.hggp.hg.cw.domain.HGCW012;
import com.baosight.hggp.hg.cw.tools.HGCWTools; import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.cw.vo.UserVO; import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
...@@ -16,10 +15,8 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -16,10 +15,8 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.resource.I18nMessages; import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.util.StringUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -27,7 +24,7 @@ import java.util.Map; ...@@ -27,7 +24,7 @@ import java.util.Map;
* @author yukang * @author yukang
* @date 2024年05月06日 18:22 * @date 2024年05月06日 18:22
*/ */
public class ServiceHGCW012 extends ServiceBase { public class ServiceHGCW010 extends ServiceBase {
/** /**
* 画面初始化 * 画面初始化
...@@ -41,7 +38,7 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -41,7 +38,7 @@ public class ServiceHGCW012 extends ServiceBase {
try { try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID, CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,
DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false); DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW012().eiMetadata); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW010().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
} }
...@@ -58,7 +55,7 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -58,7 +55,7 @@ public class ServiceHGCW012 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
inInfo = super.query(inInfo, HGCW012.QUERY, new HGCW012()); inInfo = super.query(inInfo, HGCW010.QUERY, new HGCW010());
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
} }
...@@ -77,17 +74,17 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -77,17 +74,17 @@ public class ServiceHGCW012 extends ServiceBase {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据 // 写入数据
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HGCW012 HGCW012 = new HGCW012(); HGCW010 HGCW010 = new HGCW010();
HGCW012.fromMap(resultRows.get(i)); HGCW010.fromMap(resultRows.get(i));
UserVO userVO = HGCWTools.HgCw002.getUserCompany(); UserVO userVO = HGCWTools.HgCw002.getUserCompany();
HGCW012.setCompanyCode(userVO.getUsercode()); HGCW010.setCompanyCode(userVO.getUsercode());
HGCW012.setCompanyName(userVO.getUsername()); HGCW010.setCompanyName(userVO.getUsername());
if (HGCW012.getId() == null || HGCW012.getId() == 0) { if (HGCW010.getId() == null || HGCW010.getId() == 0) {
this.add(HGCW012); this.add(HGCW010);
} else { } else {
this.modify(HGCW012); this.modify(HGCW010);
} }
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
...@@ -102,21 +99,21 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -102,21 +99,21 @@ public class ServiceHGCW012 extends ServiceBase {
/** /**
* 新增操作 * 新增操作
* *
* @param HGCW012 * @param HGCW010
* @return * @return
*/ */
public void add(HGCW012 HGCW012) { public void add(HGCW010 HGCW010) {
DaoUtils.insert("HGCW012.insert", HGCW012); DaoUtils.insert("HGCW010.insert", HGCW010);
} }
/** /**
* 修改操作 * 修改操作
* *
* @param HGCW012 * @param HGCW010
* @return * @return
*/ */
public void modify(HGCW012 HGCW012) { public void modify(HGCW010 HGCW010) {
DaoUtils.update("HGCW012.update", HGCW012); DaoUtils.update("HGCW010.update", HGCW010);
} }
/** /**
...@@ -132,9 +129,9 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -132,9 +129,9 @@ public class ServiceHGCW012 extends ServiceBase {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 数据写入 // 数据写入
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HGCW012 HGCW012 = new HGCW012(); HGCW010 HGCW010 = new HGCW010();
HGCW012.fromMap(resultRows.get(i)); HGCW010.fromMap(resultRows.get(i));
DaoUtils.insert("HGCW012.insert", HGCW012); DaoUtils.insert("HGCW010.insert", HGCW010);
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
...@@ -156,9 +153,9 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -156,9 +153,9 @@ public class ServiceHGCW012 extends ServiceBase {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HGCW012 HGCW012 = new HGCW012(); HGCW010 HGCW010 = new HGCW010();
HGCW012.fromMap(resultRows.get(i)); HGCW010.fromMap(resultRows.get(i));
DaoUtils.update("HGCW012.update", HGCW012); DaoUtils.update("HGCW010.update", HGCW010);
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
...@@ -180,7 +177,7 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -180,7 +177,7 @@ public class ServiceHGCW012 extends ServiceBase {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
DaoUtils.update("HGCW012.delete", resultRows.get(i)); DaoUtils.update("HGCW010.delete", resultRows.get(i));
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
...@@ -203,12 +200,12 @@ public class ServiceHGCW012 extends ServiceBase { ...@@ -203,12 +200,12 @@ public class ServiceHGCW012 extends ServiceBase {
public EiInfo updateDocId(EiInfo inInfo){ public EiInfo updateDocId(EiInfo inInfo){
int i = 0; int i = 0;
try { try {
HGCW012 HGCW012 = new HGCW012(); HGCW010 HGCW010 = new HGCW010();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
for (i = 0; i < eiBlock.getRowCount(); i++) { for (i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i); Map<?, ?> map = eiBlock.getRow(i);
HGCW012.fromMap(map); HGCW010.fromMap(map);
DaoUtils.update(HGCW012.UPDATE_DOC_ID, HGCW012); DaoUtils.update(HGCW010.UPDATE_DOC_ID, HGCW010);
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")}); inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")});
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012A.java → src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010A.java
...@@ -2,9 +2,7 @@ package com.baosight.hggp.hg.cw.service; ...@@ -2,9 +2,7 @@ package com.baosight.hggp.hg.cw.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation; import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.dao.DaoUtils; import com.baosight.hggp.hg.cw.domain.HGCW010;
import com.baosight.hggp.hg.cw.domain.HGCW002;
import com.baosight.hggp.hg.cw.domain.HGCW012;
import com.baosight.hggp.hg.cw.vo.UserVO; import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.hg.pz.domain.HGPZ002; import com.baosight.hggp.hg.pz.domain.HGPZ002;
import com.baosight.hggp.hg.pz.domain.HGPZ003; import com.baosight.hggp.hg.pz.domain.HGPZ003;
...@@ -13,7 +11,6 @@ import com.baosight.hggp.hg.xs.domain.Org; ...@@ -13,7 +11,6 @@ import com.baosight.hggp.hg.xs.domain.Org;
import com.baosight.hggp.hg.xs.tools.HGXSTools; import com.baosight.hggp.hg.xs.tools.HGXSTools;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
import com.baosight.hggp.util.LogUtils; import com.baosight.hggp.util.LogUtils;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
...@@ -26,7 +23,7 @@ import java.util.*; ...@@ -26,7 +23,7 @@ import java.util.*;
* @author yukang * @author yukang
* @date 2024年05月06日 18:22 * @date 2024年05月06日 18:22
*/ */
public class ServiceHGCW012A extends ServiceBase { public class ServiceHGCW010A extends ServiceBase {
/** /**
* 画面初始化 * 画面初始化
...@@ -38,8 +35,8 @@ public class ServiceHGCW012A extends ServiceBase { ...@@ -38,8 +35,8 @@ public class ServiceHGCW012A extends ServiceBase {
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
try { try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
inInfo.addBlock("detail1").addBlockMeta(new HGCW012().eiMetadata); inInfo.addBlock("detail1").addBlockMeta(new HGCW010().eiMetadata);
inInfo.addBlock("detail2").addBlockMeta(new HGCW012().eiMetadata); inInfo.addBlock("detail2").addBlockMeta(new HGCW010().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
} }
...@@ -149,14 +146,14 @@ public class ServiceHGCW012A extends ServiceBase { ...@@ -149,14 +146,14 @@ public class ServiceHGCW012A extends ServiceBase {
map.put("settlementNumber", inInfo.getString("settlementNumber")); map.put("settlementNumber", inInfo.getString("settlementNumber"));
} }
if (StringUtils.isNotEmpty(inInfo.getString("settlementNumbers"))) { if (StringUtils.isNotEmpty(inInfo.getString("settlementNumbers"))) {
String[] contractTyps = inInfo.getString("settlementNumbers").split(","); String[] settlementNumbers = inInfo.getString("settlementNumbers").split(",");
for (String c : contractTyps) { for (String c : settlementNumbers) {
contractTypArray.add(c); contractTypArray.add(c);
} }
map.put("settlementNumbers", contractTypArray); map.put("settlementNumbers", contractTypArray);
} }
List<HGCW012> HGCW012List = dao.query("HGCW012.queryconteractComboBox", map); List<HGCW010> HGCW010List = dao.query("HGCW010.queryconteractComboBox", map);
inInfo.addBlock("conteract_combo_box").setRows(HGCW012List); inInfo.addBlock("conteract_combo_box").setRows(HGCW010List);
return inInfo; return inInfo;
} }
} }
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW010.xml
...@@ -10,13 +10,17 @@ ...@@ -10,13 +10,17 @@
COMPANY_NAME VARCHAR, COMPANY_NAME VARCHAR,
PROJ_NAME VARCHAR, PROJ_NAME VARCHAR,
PROJ_CODE VARCHAR, PROJ_CODE VARCHAR,
CONTRACT_NUMBER VARCHAR, SETTLEMENT_NUMBER VARCHAR,
INCOME_NUMBER VARCHAR, BILL_TYBE VARCHAR,
BILL_NUMBER VARCHAR,
BILL_STATE VARCHAR,
SIGNING_DATE VARCHAR, SIGNING_DATE VARCHAR,
PARTY_A VARCHAR, PARTY_A VARCHAR,
CANCEL_STATUS TINYINT,
REVIEW_STATUS TINYINT, REVIEW_STATUS TINYINT,
TOTAL_CONTRACT_PRICE_INCLUDING VARCHAR, THIS_SETTLEMENT_TAX VARCHAR,
THIS_SETTLEMENT_AMOUNT VARCHAR,
TAX_POINTS VARCHAR,
TOTAL_CONTRACT_PRICE_INCLUDING DECIMAL,
CREATED_BY VARCHAR NOT NULL, CREATED_BY VARCHAR NOT NULL,
CREATED_NAME VARCHAR NOT NULL, CREATED_NAME VARCHAR NOT NULL,
CREATED_TIME VARCHAR NOT NULL, CREATED_TIME VARCHAR NOT NULL,
...@@ -46,11 +50,17 @@ ...@@ -46,11 +50,17 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE = #projCode# PROJ_CODE = #projCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="contractNumber"> <isNotEmpty prepend=" AND " property="settlementNumber">
CONTRACT_NUMBER = #contractNumber# SETTLEMENT_NUMBER = #settlementNumber#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="incomeNumber"> <isNotEmpty prepend=" AND " property="billTybe">
INCOME_NUMBER = #incomeNumber# BILL_TYBE = #billTybe#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="billNumber">
BILL_NUMBER = #billNumber#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="billState">
BILL_STATE = #billState#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="signingDate"> <isNotEmpty prepend=" AND " property="signingDate">
SIGNING_DATE = #signingDate# SIGNING_DATE = #signingDate#
...@@ -58,12 +68,18 @@ ...@@ -58,12 +68,18 @@
<isNotEmpty prepend=" AND " property="partyA"> <isNotEmpty prepend=" AND " property="partyA">
PARTY_A = #partyA# PARTY_A = #partyA#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="cancelStatus">
CANCEL_STATUS = #cancelStatus#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="reviewStatus"> <isNotEmpty prepend=" AND " property="reviewStatus">
REVIEW_STATUS = #reviewStatus# REVIEW_STATUS = #reviewStatus#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="thisSettlementTax">
THIS_SETTLEMENT_TAX = #thisSettlementTax#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="thisSettlementAmount">
THIS_SETTLEMENT_AMOUNT = #thisSettlementAmount#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="taxPoints">
TAX_POINTS = #taxPoints#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="totalContractPriceIncluding"> <isNotEmpty prepend=" AND " property="totalContractPriceIncluding">
TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding# TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#
</isNotEmpty> </isNotEmpty>
...@@ -99,13 +115,17 @@ ...@@ -99,13 +115,17 @@
COMPANY_NAME as "companyName", <!-- 公司名称 --> COMPANY_NAME as "companyName", <!-- 公司名称 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PROJ_CODE as "projCode", <!-- 项目编号 --> PROJ_CODE as "projCode", <!-- 项目编号 -->
CONTRACT_NUMBER as "contractNumber", <!-- 来源单号 --> SETTLEMENT_NUMBER as "settlementNumber", <!-- 来源单号 -->
INCOME_NUMBER as "incomeNumber", <!-- 收款单号 --> BILL_TYBE as "billTybe", <!-- 票据类型 -->
SIGNING_DATE as "signingDate", <!-- 收款日期 --> BILL_NUMBER as "billNumber", <!-- 发票号 -->
BILL_STATE as "billState", <!-- 开票状态 -->
SIGNING_DATE as "signingDate", <!-- 开票日期 -->
PARTY_A as "partyA", <!-- 客户名称 --> PARTY_A as "partyA", <!-- 客户名称 -->
CANCEL_STATUS as "cancelStatus", <!-- 核销状态 -->
REVIEW_STATUS as "reviewStatus", <!-- 审批状态 --> REVIEW_STATUS as "reviewStatus", <!-- 审批状态 -->
TOTAL_CONTRACT_PRICE_INCLUDING as "totalContractPriceIncluding", <!-- 收款总额 --> THIS_SETTLEMENT_TAX as "thisSettlementTax", <!-- 税额 -->
THIS_SETTLEMENT_AMOUNT as "thisSettlementAmount", <!-- 不含税金额 -->
TAX_POINTS as "taxPoints", <!-- 税率 -->
TOTAL_CONTRACT_PRICE_INCLUDING as "totalContractPriceIncluding", <!-- 开票总额 -->
CREATED_BY as "createdBy", <!-- 记录创建者 --> CREATED_BY as "createdBy", <!-- 记录创建者 -->
CREATED_NAME as "createdName", <!-- 记录创建名称 --> CREATED_NAME as "createdName", <!-- 记录创建名称 -->
CREATED_TIME as "createdTime", <!-- 记录创建时间 --> CREATED_TIME as "createdTime", <!-- 记录创建时间 -->
...@@ -150,11 +170,17 @@ ...@@ -150,11 +170,17 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE = #projCode# PROJ_CODE = #projCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="contractNumber"> <isNotEmpty prepend=" AND " property="settlementNumber">
CONTRACT_NUMBER = #contractNumber# SETTLEMENT_NUMBER = #settlementNumber#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="incomeNumber"> <isNotEmpty prepend=" AND " property="billTybe">
INCOME_NUMBER = #incomeNumber# BILL_TYBE = #billTybe#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="billNumber">
BILL_NUMBER = #billNumber#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="billState">
BILL_STATE = #billState#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="signingDate"> <isNotEmpty prepend=" AND " property="signingDate">
SIGNING_DATE = #signingDate# SIGNING_DATE = #signingDate#
...@@ -162,12 +188,18 @@ ...@@ -162,12 +188,18 @@
<isNotEmpty prepend=" AND " property="partyA"> <isNotEmpty prepend=" AND " property="partyA">
PARTY_A = #partyA# PARTY_A = #partyA#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="cancelStatus">
CANCEL_STATUS = #cancelStatus#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="reviewStatus"> <isNotEmpty prepend=" AND " property="reviewStatus">
REVIEW_STATUS = #reviewStatus# REVIEW_STATUS = #reviewStatus#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="thisSettlementTax">
THIS_SETTLEMENT_TAX = #thisSettlementTax#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="thisSettlementAmount">
THIS_SETTLEMENT_AMOUNT = #thisSettlementAmount#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="taxPoints">
TAX_POINTS = #taxPoints#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="totalContractPriceIncluding"> <isNotEmpty prepend=" AND " property="totalContractPriceIncluding">
TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding# TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#
</isNotEmpty> </isNotEmpty>
...@@ -201,13 +233,17 @@ ...@@ -201,13 +233,17 @@
COMPANY_NAME, <!-- 公司名称 --> COMPANY_NAME, <!-- 公司名称 -->
PROJ_NAME, <!-- 项目名称 --> PROJ_NAME, <!-- 项目名称 -->
PROJ_CODE, <!-- 项目编号 --> PROJ_CODE, <!-- 项目编号 -->
CONTRACT_NUMBER, <!-- 来源单号 --> SETTLEMENT_NUMBER, <!-- 来源单号 -->
INCOME_NUMBER, <!-- 收款单号 --> BILL_TYBE, <!-- 票据类型 -->
SIGNING_DATE, <!-- 收款日期 --> BILL_NUMBER, <!-- 发票号 -->
BILL_STATE, <!-- 开票状态 -->
SIGNING_DATE, <!-- 开票日期 -->
PARTY_A, <!-- 客户名称 --> PARTY_A, <!-- 客户名称 -->
CANCEL_STATUS, <!-- 核销状态 -->
REVIEW_STATUS, <!-- 审批状态 --> REVIEW_STATUS, <!-- 审批状态 -->
TOTAL_CONTRACT_PRICE_INCLUDING, <!-- 收款总额 --> THIS_SETTLEMENT_TAX, <!-- 税额 -->
THIS_SETTLEMENT_AMOUNT, <!-- 不含税金额 -->
TAX_POINTS, <!-- 税率 -->
TOTAL_CONTRACT_PRICE_INCLUDING, <!-- 开票总额 -->
CREATED_BY, <!-- 记录创建者 --> CREATED_BY, <!-- 记录创建者 -->
CREATED_NAME, <!-- 记录创建名称 --> CREATED_NAME, <!-- 记录创建名称 -->
CREATED_TIME, <!-- 记录创建时间 --> CREATED_TIME, <!-- 记录创建时间 -->
...@@ -216,7 +252,7 @@ ...@@ -216,7 +252,7 @@
UPDATED_TIME, <!-- 记录修改时间 --> UPDATED_TIME, <!-- 记录修改时间 -->
DEP_CODE <!-- 部门编码 --> DEP_CODE <!-- 部门编码 -->
) )
VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projName#, #projCode#, #contractNumber#, #incomeNumber#, #signingDate#, #partyA#, #cancelStatus#, #reviewStatus#, #totalContractPriceIncluding#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#) VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projName#, #projCode#, #settlementNumber#, #billTybe#, #billNumber#, #billState#, #signingDate#, #partyA#, #reviewStatus#, #thisSettlementTax#, #thisSettlementAmount#, #taxPoints#, #totalContractPriceIncluding#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -232,13 +268,17 @@ ...@@ -232,13 +268,17 @@
COMPANY_NAME = #companyName#, <!-- 公司名称 --> COMPANY_NAME = #companyName#, <!-- 公司名称 -->
PROJ_NAME = #projName#, <!-- 项目名称 --> PROJ_NAME = #projName#, <!-- 项目名称 -->
PROJ_CODE = #projCode#, <!-- 项目编号 --> PROJ_CODE = #projCode#, <!-- 项目编号 -->
CONTRACT_NUMBER = #contractNumber#, <!-- 来源单号 --> SETTLEMENT_NUMBER = #settlementNumber#, <!-- 来源单号 -->
INCOME_NUMBER = #incomeNumber#, <!-- 收款单号 --> BILL_TYBE = #billTybe#, <!-- 票据类型 -->
SIGNING_DATE = #signingDate#, <!-- 收款日期 --> BILL_NUMBER = #billNumber#, <!-- 发票号 -->
BILL_STATE = #billState#, <!-- 开票状态 -->
SIGNING_DATE = #signingDate#, <!-- 开票日期 -->
PARTY_A = #partyA#, <!-- 客户名称 --> PARTY_A = #partyA#, <!-- 客户名称 -->
CANCEL_STATUS = #cancelStatus#, <!-- 核销状态 -->
REVIEW_STATUS = #reviewStatus#, <!-- 审批状态 --> REVIEW_STATUS = #reviewStatus#, <!-- 审批状态 -->
TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#, <!-- 收款总额 --> THIS_SETTLEMENT_TAX = #thisSettlementTax#, <!-- 税额 -->
THIS_SETTLEMENT_AMOUNT = #thisSettlementAmount#, <!-- 不含税金额 -->
TAX_POINTS = #taxPoints#, <!-- 税率 -->
TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#, <!-- 开票总额 -->
CREATED_BY = #createdBy#, <!-- 记录创建者 --> CREATED_BY = #createdBy#, <!-- 记录创建者 -->
CREATED_NAME = #createdName#, <!-- 记录创建名称 --> CREATED_NAME = #createdName#, <!-- 记录创建名称 -->
CREATED_TIME = #createdTime#, <!-- 记录创建时间 --> CREATED_TIME = #createdTime#, <!-- 记录创建时间 -->
...@@ -249,5 +289,32 @@ ...@@ -249,5 +289,32 @@
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
<select id="queryconteractComboBox" parameterClass="java.util.HashMap"
resultClass="java.util.HashMap">
SELECT DISTINCT
COMPANY_NAME as "companyName", <!-- 所属公司 -->
PROJ_CODE as "projCode", <!-- 项目编号 -->
PROJ_NAME as "projName", <!-- 项目名称 -->
CONTRACT_NUMBER as "contractNumber", <!-- 合同号 -->
CONTRACT_NAME as "contractName", <!-- 合同名称 -->
SETTLEMENT_NUMBER as "settlementNumber", <!-- 结算编号 -->
THIS_SETTLEMENT_TAX as "thisSettlementTax", <!-- 税金 -->
THIS_SETTLEMENT_AMOUNT as "thisSettlementAmount", <!-- 结算金额 -->
THIS_PRICE_TAX as "thisPriceTax" <!-- 税价合计 -->
FROM ${hggpSchema}.HGCW008
WHERE 1=1
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="settlementType">
SETTLEMENT_TYPE = "2"
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCodes">
COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
</isNotEmpty>
ORDER BY CONTRACT_NUMBER
</select>
</sqlMap> </sqlMap>
src/main/webapp/HG/CW/HGCW012.js → src/main/webapp/HG/CW/HGCW010.js
...@@ -64,7 +64,7 @@ let query = function () { ...@@ -64,7 +64,7 @@ let query = function () {
*/ */
function addFunc() { function addFunc() {
JSColorbox.open({ JSColorbox.open({
href: "HGCW012A?methodName=initLoad&efParentFormEname=HGCW012", href: "HGCW010A?methodName=initLoad&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>结算单</div>", title: "<div style='text-align: center;'>结算单</div>",
width: "90%", width: "90%",
height: "90%", height: "90%",
...@@ -82,7 +82,7 @@ function updateFunc() { ...@@ -82,7 +82,7 @@ function updateFunc() {
return; return;
} }
JSColorbox.open({ JSColorbox.open({
href: "HGCW012B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW012", href: "HGCW010B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>修改合同</div>", title: "<div style='text-align: center;'>修改合同</div>",
width: "90%", width: "90%",
height: "90%", height: "90%",
...@@ -100,7 +100,7 @@ function windowCallback() { ...@@ -100,7 +100,7 @@ function windowCallback() {
function contractDetailFunc(id) { function contractDetailFunc(id) {
JSColorbox.open({ JSColorbox.open({
href: "HGCW012C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW012", href: "HGCW010C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>合同详情</div>", title: "<div style='text-align: center;'>合同详情</div>",
width: "90%", width: "90%",
height: "90%", height: "90%",
...@@ -110,7 +110,7 @@ function contractDetailFunc(id) { ...@@ -110,7 +110,7 @@ function contractDetailFunc(id) {
function fileDetailFunc(id) { function fileDetailFunc(id) {
JSColorbox.open({ JSColorbox.open({
href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012", href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>附件清单</div>", title: "<div style='text-align: center;'>附件清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -136,7 +136,7 @@ function submitFunc() { ...@@ -136,7 +136,7 @@ function submitFunc() {
ok: function () { ok: function () {
var info = new EiInfo(); var info = new EiInfo();
info.addBlock(JSUtils.checkedRows2Block("result")); info.addBlock(JSUtils.checkedRows2Block("result"));
EiCommunicator.send("HGCW012", "submit", info, { EiCommunicator.send("HGCW010", "submit", info, {
onSuccess: function (ei) { onSuccess: function (ei) {
if (ei.getStatus() >= 0) { if (ei.getStatus() >= 0) {
try { try {
......
src/main/webapp/HG/CW/HGCW012A.js → src/main/webapp/HG/CW/HGCW010A.js
...@@ -73,7 +73,7 @@ function updateFunc() { ...@@ -73,7 +73,7 @@ function updateFunc() {
return; return;
} }
JSColorbox.open({ JSColorbox.open({
href: "HGCW012B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW012", href: "HGCW010B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>修改合同</div>", title: "<div style='text-align: center;'>修改合同</div>",
width: "90%", width: "90%",
height: "90%", height: "90%",
...@@ -91,7 +91,7 @@ function windowCallback() { ...@@ -91,7 +91,7 @@ function windowCallback() {
function contractDetailFunc(id) { function contractDetailFunc(id) {
JSColorbox.open({ JSColorbox.open({
href: "HGCW012C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW012", href: "HGCW010C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>合同详情</div>", title: "<div style='text-align: center;'>合同详情</div>",
width: "90%", width: "90%",
height: "90%", height: "90%",
...@@ -101,7 +101,7 @@ function contractDetailFunc(id) { ...@@ -101,7 +101,7 @@ function contractDetailFunc(id) {
function fileDetailFunc(id) { function fileDetailFunc(id) {
JSColorbox.open({ JSColorbox.open({
href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012", href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW010",
title: "<div style='text-align: center;'>附件清单</div>", title: "<div style='text-align: center;'>附件清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -127,7 +127,7 @@ function submitFunc() { ...@@ -127,7 +127,7 @@ function submitFunc() {
ok: function () { ok: function () {
var info = new EiInfo(); var info = new EiInfo();
info.addBlock(JSUtils.checkedRows2Block("result")); info.addBlock(JSUtils.checkedRows2Block("result"));
EiCommunicator.send("HGCW012", "submit", info, { EiCommunicator.send("HGCW010", "submit", info, {
onSuccess: function (ei) { onSuccess: function (ei) {
if (ei.getStatus() >= 0) { if (ei.getStatus() >= 0) {
try { try {
......
src/main/webapp/HG/CW/HGCW012A.jsp → src/main/webapp/HG/CW/HGCW010A.jsp
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
<EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false"> <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
<EF:EFColumn ename="rowNo" cname="行号" hidden="true"/> <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="companyName" cname="所属公司" width="120" serviceName="HGCW012" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="companyName" cname="所属公司" width="120" serviceName="HGCW010" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="projCode" cname="项目编号" width="120" serviceName="HGCW012" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center" /> <EF:EFColumn ename="projCode" cname="项目编号" width="120" serviceName="HGCW010" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center" />
<EF:EFColumn ename="projName" cname="项目名称" width="120" serviceName="HGCW012" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" serviceName="HGCW010" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractNumber" cname="合同号" width="120" serviceName="HGCW012" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center" /> <EF:EFColumn ename="contractNumber" cname="合同号" width="120" serviceName="HGCW010" methodName="queryconteractComboBox" resultId="conteract_combo_box" enable="false" readonly="true" align="center" />
<EF:EFColumn ename="contractName" cname="合同名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractName" cname="合同名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="settlementNumber" cname="结算编号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="结算编号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="thisPriceTax" cname="结算价税合计金额" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="thisPriceTax" cname="结算价税合计金额" width="120" enable="false" readonly="true" align="center"/>
......
Markdown is supported
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