Skip to content

H
hg-smart
Commit 8dbfc24d by liuyang
Options

2024-09-20 涉及新增单据和选择来源的单据日期都可进行修改

parent 1ffb5e81
Showing with 71 additions and 21 deletions
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW004.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
......@@ -579,7 +580,7 @@ public class HGCW004 extends DaoEPBase {
setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_SIGNING_DATE))), signingDate));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setPartyB(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_B)), partyB));
setReviewStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW005.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
......@@ -570,7 +571,7 @@ public class HGCW005 extends DaoEPBase {
setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_SIGNING_DATE))), signingDate));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setPartyB(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_B)), partyB));
setReviewStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW006.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
......@@ -869,15 +870,15 @@ public class HGCW006 extends DaoEPBase {
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setPartyB(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_B)), partyB));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_SIGNING_DATE))), signingDate));
setTotalQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_QUANTITY)), totalQuantity));
setPartyAName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A_NAME)), partyAName));
setPartyAPhoneNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A_PHONE_NUMBER)), partyAPhoneNumber));
setAlreadyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ALREADY_NAME)), alreadyName));
setAlreadyPhoneNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ALREADY_PHONE_NUMBER)), alreadyPhoneNumber));
setContractStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CONTRACT_STATUS)), contractStatus));
setLeaseStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_LEASE_START_DATE)), leaseStartDate));
setLeaseEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_LEASE_END_DATE)), leaseEndDate));
setLeaseStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_LEASE_START_DATE))), leaseStartDate));
setLeaseEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_LEASE_END_DATE))), leaseEndDate));
setPaymentMethod(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PAYMENT_METHOD)), paymentMethod));
setPricingMethod(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PRICING_METHOD)), pricingMethod));
setTaxPoints(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW010A.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils;
......@@ -776,7 +777,7 @@ public class HGCW010A extends DaoEPBase {
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
setSettlementNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SETTLEMENT_NUMBER)), settlementNumber));
setSettlementType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SETTLEMENT_TYPE)), settlementType));
setContractDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_DATE)), contractDate));
setContractDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_CONTRACT_DATE))), contractDate));
setTaxPoints(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
setPriceTaxSeparation(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PRICE_TAX_SEPARATION)), priceTaxSeparation));
setThisSettlementAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_AMOUNT)), thisSettlementAmount));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW012.java
......@@ -837,7 +837,7 @@ public class HGCW012 extends DaoEPBase {
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
setRemainingAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_AMOUNT)), remainingAmount));
setReceiveDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIVE_DATE)), receiveDate));
setReceiveDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_RECEIVE_DATE))), receiveDate));
setContractType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CONTRACT_TYPE)), contractType));
setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW012A.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils;
......@@ -753,7 +754,7 @@ public class HGCW012A extends DaoEPBase {
setContractName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NAME)), contractName));
setSettlementNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SETTLEMENT_NUMBER)), settlementNumber));
setSettlementType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SETTLEMENT_TYPE)), settlementType));
setContractDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_DATE)), contractDate));
setContractDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_CONTRACT_DATE))), contractDate));
setTaxPoints(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_TAX_POINTS)), taxPoints));
setPriceTaxSeparation(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PRICE_TAX_SEPARATION)), priceTaxSeparation));
setThisSettlementAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_AMOUNT)), thisSettlementAmount));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW014.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
......@@ -529,7 +530,7 @@ public class HGCW014 extends DaoEPBase {
setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
setIncomeNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INCOME_NUMBER)), incomeNumber));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_SIGNING_DATE))), signingDate));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setCancelStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CANCEL_STATUS)), cancelStatus));
setReviewStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW016.java
package com.baosight.hggp.hg.cw.domain;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
......@@ -508,7 +509,7 @@ public class HGCW016 extends DaoEPBase {
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setContractNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CONTRACT_NUMBER)), contractNumber));
setIncomeNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INCOME_NUMBER)), incomeNumber));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SIGNING_DATE)), signingDate));
setSigningDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_SIGNING_DATE))), signingDate));
setPartyA(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PARTY_A)), partyA));
setCancelStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CANCEL_STATUS)), cancelStatus));
setReviewStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVIEW_STATUS)), reviewStatus));
......
src/main/webapp/HG/CW/HGCW010.js
......@@ -169,6 +169,14 @@ function addFunc() {
if (rows.length == 1) {
mainId = rows[0].id;
}
if (rows.length == 1 && rows[0].reviewStatus == "1"){
message("数据已审核，无法选择");
return;
}
if (rows.length == 1 && rows[0].billState == "2"){
message("数据已开票，无法选择");
return;
}
}else {
message("请选择一条数据或不选择数据");
return;
......@@ -188,11 +196,11 @@ function add1Func() {
if (rows.length == 1) {
mainId = rows[0].id;
}
if (rows[0].reviewStatus == "1"){
if (rows.length == 1 && rows[0].reviewStatus == "1"){
message("数据已审核，无法选择");
return;
}
if (rows[0].billState == "2"){
if (rows.length == 1 && rows[0].billState == "2"){
message("数据已开票，无法选择");
return;
}
......@@ -215,6 +223,14 @@ function add2Func() {
if (rows.length == 1) {
mainId = rows[0].id;
}
if (rows.length == 1 && rows[0].reviewStatus == "1"){
message("数据已审核，无法选择");
return;
}
if (rows.length == 1 && rows[0].billState == "2"){
message("数据已开票，无法选择");
return;
}
}else {
message("请选择一条数据或不选择数据");
return;
......
src/main/webapp/HG/CW/HGCW010.jsp
......@@ -70,7 +70,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" defaultValue="1">
<EF:EFCodeOption codeName="hggp.cw.billTybe"/>
</EF:EFComboColumn>
<EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="true" readonly="true" align="center"
<EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="true" readonly="false" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFColumn ename="billNumber" cname="发票号" width="120" align="center"/>
<EF:EFComboColumn ename="taxPoints" cname="税率" width="80" align="center" required="true"
......
src/main/webapp/HG/CW/HGCW010A.jsp
......@@ -40,7 +40,7 @@
<EF:EFColumn ename="projCode" cname="项目编号" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="projName" 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="contractDate" cname="结算日期" width="120" enable="false" readonly="true" align="center"
<EF:EFColumn ename="contractDate" cname="结算日期" width="120" enable="true" readonly="false" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFComboColumn ename="taxPoints" cname="税率" width="120" align="center" required="true"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
......
src/main/webapp/HG/CW/HGCW010D.jsp
......@@ -47,7 +47,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractNumber" 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="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center"
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="false" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
......
src/main/webapp/HG/CW/HGCW010E.jsp
......@@ -47,7 +47,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractNumber" 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="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center"
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="false" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
......
src/main/webapp/HG/CW/HGCW012A.js
......@@ -228,10 +228,19 @@ $(function () {
field: "receiveDate",
title: "收货日期",
headerTemplate: "<span style='color: '>收货日期 </span>",
enable: false,
editType: "date",
parseFormats:"['yyyyMMdd']",
dateFormat:"yyyy-MM-dd",
enable: true,
locked: false,
template: function (date) {
return date.receiveDate ? convertToDate(date.receiveDate, "yyyy-MM-dd"):" ";
if (date.receiveDate instanceof Date){
return kendo.toString(date.receiveDate, "yyyy-MM-dd");
}else if (!isBlank(date.receiveDate)){
return convertToDate(date.receiveDate, "yyyy-MM-dd")
}else{
return "";
}
}
},
{
......@@ -320,9 +329,18 @@ $(function () {
field: "contractDate",
title: "结算日期",
headerTemplate: "<span style='color: '>结算日期 </span>",
editType: "date",
parseFormats:"['yyyyMMdd']",
dateFormat:"yyyy-MM-dd",
locked: false,
template: function (date) {
return date.contractDate ? convertToDate(date.contractDate, "yyyy-MM-dd"):" ";
if (date.contractDate instanceof Date){
return kendo.toString(date.contractDate, "yyyy-MM-dd");
}else if (!isBlank(date.contractDate)){
return convertToDate(date.contractDate, "yyyy-MM-dd")
}else{
return "";
}
}
},
{
......@@ -430,9 +448,18 @@ $(function () {
field: "signingDate",
title: "结算日期",
headerTemplate: "<span style='color: '>结算日期 </span>",
editType: "date",
parseFormats:"['yyyyMMdd']",
dateFormat:"yyyy-MM-dd",
locked: false,
template: function (date) {
return date.signingDate ? convertToDate(date.signingDate, "yyyy-MM-dd"):" ";
if (date.signingDate instanceof Date){
return kendo.toString(date.signingDate, "yyyy-MM-dd");
}else if (!isBlank(date.signingDate)){
return convertToDate(date.signingDate, "yyyy-MM-dd")
}else{
return "";
}
}
},
{
......
src/main/webapp/HG/CW/HGCW014A.jsp
......@@ -57,7 +57,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
<EF:EFCodeOption codeName="hggp.cw.billTybe"/>
</EF:EFComboColumn>
<EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd" readonly="true" align="center"/>
<EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="true" editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd" readonly="false" align="center"/>
<EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:N2}" editType="text"
......
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