huojin\hj
parent
7be25901d5
commit
b1666e909e
File diff suppressed because it is too large
Load Diff
|
|
@ -321,10 +321,10 @@ public class DefaultBillFeeManager extends DefaultBaseManager implements BillFee
|
|||
public void Refresh(Long BillFeeID){
|
||||
BillFee b = commonDao.load(BillFee.class,BillFeeID);
|
||||
List<Object> Objects1 = commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f "
|
||||
+ " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费','预付款') ",
|
||||
+ " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费','预付款','垫付车贷款','甲醇费','易流费') ",
|
||||
new String[] { "id"},new Object[] {BillFeeID});
|
||||
List<Object> Objects2 = commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f "
|
||||
+ " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费','预付款') ",
|
||||
+ " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费','预付款','垫付车贷款','甲醇费','易流费') ",
|
||||
new String[] { "id"},new Object[] {BillFeeID});
|
||||
b.setTotalFee((Double)Objects1.get(0)-(Double)Objects2.get(0));
|
||||
commonDao.store(b);
|
||||
|
|
|
|||
|
|
@ -464,7 +464,10 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
|
|||
s.setFee6(getFeeAmount(billId, BillObjectType.SHIPMENT, "油卡费"));
|
||||
s.setFee8(getFeeAmount(billId, BillObjectType.SHIPMENT, "卸货费"));
|
||||
s.setFee9(getFeeAmount(billId, BillObjectType.SHIPMENT, "预付款"));
|
||||
s.setPayfee(s.getFee1()+s.getFee2()+s.getFee3()-s.getFee5()-s.getFee6()+s.getFee4()+s.getFee8()-s.getFee9());
|
||||
s.setFee10(getFeeAmount(billId, BillObjectType.SHIPMENT, "垫付车贷款"));
|
||||
s.setImprest(getFeeAmount(billId, BillObjectType.SHIPMENT, "甲醇费"));
|
||||
s.setProfit(getFeeAmount(billId, BillObjectType.SHIPMENT, "易流费"));
|
||||
s.setPayfee(s.getFee1()+s.getFee2()+s.getFee3()-s.getFee5()-s.getFee6()+s.getFee4()+s.getFee8()-s.getFee9()-s.getFee10()-s.getImprest()-s.getProfit());
|
||||
s.setFee7(s.getFee1()+s.getFee2()+s.getFee3()+s.getFee4()+s.getFee8());
|
||||
s.setDescription(s.getDescription());
|
||||
commonDao.store(s);
|
||||
|
|
@ -2505,8 +2508,11 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
|
|||
saveInputFee(id, billObject, null, "待时费", shipment.getFee4());
|
||||
saveInputFee(id, billObject, null, "卸货费", shipment.getFee8());
|
||||
saveInputFee(id, billObject, null, "预付款", shipment.getFee9());
|
||||
saveInputFee(id, billObject, null, "垫付车贷款", shipment.getFee10());
|
||||
saveInputFee(id, billObject, null, "甲醇费", shipment.getImprest());
|
||||
saveInputFee(id, billObject, null, "易流费", shipment.getProfit());
|
||||
refreshBillFee(id, billObject, Boolean.TRUE);
|
||||
String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8();
|
||||
String des="运输费"+shipment.getFee1()+";提货费"+shipment.getFee2()+";送货费"+shipment.getFee3()+";其他费"+shipment.getFee5()+";油卡费"+shipment.getFee6()+";待时费"+shipment.getFee4()+";卸货费"+shipment.getFee8()+";预付费"+shipment.getFee9()+";垫付车贷款"+shipment.getFee10()+";甲醇费"+shipment.getImprest()+";易流费"+shipment.getProfit();
|
||||
operationHisManager.storeOperationHis(shipment.getId(), shipment.getCode(), null, des, "成本维护", "录入",null,null,shipment.getQuantity(),shipment.getWeight(),shipment.getVolume(),0, des, "TMS");
|
||||
}
|
||||
static Date sdate=new Date();
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ public class DefaultOrderShipmentManager extends DefaultBaseManager implements
|
|||
deleteOpFee(shipment);
|
||||
shipment.setPayfee(0);
|
||||
shipment.setTurnover(0);
|
||||
shipment.setProfit(0);
|
||||
shipment.setStatus(ShipmentStatus.CANCEL);
|
||||
if (shipment.getVehicle() != null) {
|
||||
Vehicle v=shipment.getVehicle();
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
<search>
|
||||
<inputUIs>
|
||||
<text id="applyBill.applicant" title="applyBill.applicant" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
||||
<numberText id="applyBill.applicationFee" title="applyBill.applicationFee" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" validator="number" returnType="Double" decimal="2" />
|
||||
|
||||
<!-- <text id="applyBill.department.name" title="applyBill.department" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/> -->
|
||||
<!-- <text id="applyBill.status" title="applyBill.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>-->
|
||||
<!-- <list id="applyBill.generalDepartment.id" title="applyBill.generalDepartment" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable"> -->
|
||||
|
|
@ -69,6 +71,7 @@
|
|||
/~applyBill.generalDepartment.id: AND applyBill.generalDepartment.id = {applyBill.generalDepartment.id}~/
|
||||
/~applyBill.status: AND applyBill.status like {applyBill.status}~/
|
||||
/~account.id: AND applyBill.consignor.id = {account.id}~/
|
||||
/~applyBill.applicationFee: AND applyBill.applicationFee = {applyBill.applicationFee}~/
|
||||
/~applyBill.invoiceNo: AND upper(applyBill.invoiceNo) like upper({applyBill.invoiceNo})~/
|
||||
]]></datasource>
|
||||
<columns>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,15 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
|
|||
<numberText id="shipment.fee9" title="预付款" row="9" col="4" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
|
||||
<numberText id="shipment.fee10" title="垫付车贷款" row="10" col="1" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.imprest" title="甲醇费" row="10" col="2" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
<numberText id="shipment.profit" title="易流费" row="10" col="3" span="1" readOnly="false"
|
||||
required="false" reserve="false" forceOverride="true" inVisible="false" validator="number"
|
||||
returnType="Double" decimal="2"/>
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
|
|
|
|||
|
|
@ -1,177 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainApplyPaymentPage" title="maintainApplyPaymentPage" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<text id="applyBill.applicant" title="applyBill.applicant" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
||||
<!-- <text id="applyBill.department.name" title="applyBill.department" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/> -->
|
||||
<!-- <text id="applyBill.status" title="applyBill.status" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>-->
|
||||
<!-- <list id="applyBill.generalDepartment.id" title="applyBill.generalDepartment" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" editModel="uneditable"> -->
|
||||
<!-- <hql><![CDATA[ SELECT -->
|
||||
<!-- d.id, -->
|
||||
<!-- d.name, -->
|
||||
<!-- '' as remark -->
|
||||
<!-- FROM Department d -->
|
||||
<!-- WHERE d.disabled = false and d.org = #{SESSION_PLATFORM} -->
|
||||
<!-- ]]></hql> -->
|
||||
<!-- </list> -->
|
||||
<list id="applyBill.status" title="applyBill.status" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="FeeStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT','CHECK')
|
||||
order by enumerate.id]]></hql>
|
||||
</list>
|
||||
<remote id="account.id" title="account.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" manualEditable="true" displayedTableHead="序号,编码,名称">
|
||||
<hql><![CDATA[select company.id, company.code, company.name from Organization company
|
||||
where (upper(company.code) like upper(:param) or company.name like :param)
|
||||
and (company.beCarrier=true or company.beInCarrier=true)
|
||||
and (company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
|
||||
or company.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
|
||||
and company.disabled=false]]></hql>
|
||||
</remote>
|
||||
<text id="applyBill.invoiceNo" title="applyBill.invoiceNo" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[ SELECT applyBill.id,applyBill.applyCode,
|
||||
applyBill.consignor.name,
|
||||
applyBill.applicationFee,
|
||||
applyBill.applicant,
|
||||
applyBill.status,
|
||||
applyBill.invoiceCompany.companyName,
|
||||
applyBill.invoiceCompany.taxpayer,
|
||||
applyBill.invoiceCompany.address,
|
||||
applyBill.invoiceCompany.phone,
|
||||
applyBill.invoiceCompany.bank,
|
||||
applyBill.invoiceCompany.accountNumber,
|
||||
applyBill.invoiceType,
|
||||
applyBill.submitDate,
|
||||
applyBill.month,
|
||||
applyBill.invoiceNo,
|
||||
applyBill.invoiceDate,
|
||||
applyBill.taxInfo,
|
||||
CAST(round(applyBill.noTaxFee,2) as string),
|
||||
CAST(round(applyBill.taxFee,2) as string),
|
||||
CAST(round(applyBill.taxMoney,2) as string),
|
||||
applyBill.applicationTime,
|
||||
applyBill.description
|
||||
|
||||
FROM ApplyBill applyBill
|
||||
left join applyBill.generalDepartment
|
||||
left join applyBill.department
|
||||
left join applyBill.invoiceCompany
|
||||
WHERE 1=1
|
||||
and applyBill.platForm=#{SESSION_PLATFORM}
|
||||
and applyBill.paymentBill='PAYMENT'
|
||||
/~applyBill.applicant: AND applyBill.applicant like {applyBill.applicant}~/
|
||||
/~applyBill.department.name: AND applyBill.department.name like {applyBill.department.name}~/
|
||||
/~applyBill.generalDepartment.id: AND applyBill.generalDepartment.id = {applyBill.generalDepartment.id}~/
|
||||
/~applyBill.status: AND applyBill.status like {applyBill.status}~/
|
||||
/~account.id: AND applyBill.consignor.id = {account.id}~/
|
||||
/~applyBill.invoiceNo: AND upper(applyBill.invoiceNo) like upper({applyBill.invoiceNo})~/
|
||||
]]></datasource>
|
||||
<columns>
|
||||
<column id="applyBill.id" title="applyBill.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
|
||||
<column id="applyBill.applyCode" title="applyBill.applyCode" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.consignor" title="fee.account.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.applicationFee" title="applyBill.applicationFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.applicant" title="applyBill.applicant" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.status" title="applyBill.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
|
||||
<column id="applyBill.invoiceCompany.companyName" title="applyBill.companyName" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceCompany.taxpayer" title="applyBill.taxpayer" visible="false" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="applyBill.invoiceCompany.address" title="applyBill.address" visible="false" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="applyBill.invoiceCompany.phone" title="applyBill.phone" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceCompany.bank" title="applyBill.bank" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceCompany.accountNumber" title="applyBill.accountNumber" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceType" title="applyBill.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="InvoiceType"/>
|
||||
<column id="applyBill.submitDate" width="80" title="applyBill.submitDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.month" width="80" title="applyBill.month" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceNo" width="80" title="applyBill.invoiceNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.invoiceDate" width="80" title="applyBill.invoiceDate1" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.taxInfo" title="applyBill.taxInfo" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="applyBill.noTaxFee" width="70" title="abd.noTaxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.taxFee" width="70" title="abd.taxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.applicationTime" title="applyBill.applicationTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="applyBill.description" title="applyBill.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<popup id="newApplyBillButton" title="maintainOrderPage.newOrderButton" enableType="none" invisible="false" containId="false" pageId="modifyApplyBillPayPage"/>
|
||||
<popup id="selectApplyBillrButton" title="maintainOrderPage.selectOrderButton" enableType="single" invisible="false" containId="true" pageId="modifyApplyBillPayPage">
|
||||
<!-- <enableExpression><![CDATA[${billFee.status} == 'OPEN' ]]></enableExpression>-->
|
||||
</popup>
|
||||
<!-- <popup id="ViewApplyPayFee" title="ViewApplyPayFee" enableType="single" invisible="false" containId="true" pageId="modifyViewApplyPayFeePage"/> -->
|
||||
|
||||
<!-- <popup id="selectApplyButton" title="selectApplyButton" enableType="single" invisible="false" containId="true" pageId="printZFSQMXPage"> -->
|
||||
<!-- </popup> -->
|
||||
<commit id="AuditApplyBillButton" title="AuditButton" enableType="multi" invisible="false" >
|
||||
<enableExpression><![CDATA[${applyBill.status} == 'OPEN' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="applyBillManager" methodName="AuditApplyBill" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="retrnApplyBill" title="retrnApplyBill" enableType="multi" invisible="false" >
|
||||
<enableExpression><![CDATA[${applyBill.status} == 'SUBMIT' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="applyBillManager" methodName="retrnApplyBill" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <commit id="retrnApplyBill" title="retrnApplyBill" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.retrnApplyBill.confirmMessage">-->
|
||||
<!-- <enableExpression><![CDATA[${applyBill.status} == 'SUBMIT' ]]></enableExpression>-->
|
||||
<!-- <mappings>-->
|
||||
<!-- <mapping id="ids" className="list"/>-->
|
||||
<!-- </mappings>-->
|
||||
<!-- <actions>-->
|
||||
<!-- <action managerName="applyBillManager" methodName="retrnApplyBill" parameter="ids"/>-->
|
||||
<!-- </actions>-->
|
||||
<!-- <forwards>-->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>-->
|
||||
<!-- </forwards>-->
|
||||
<!-- </commit>-->
|
||||
<commit id="checkApplyBill" title="checkApplyBill" enableType="multi" invisible="false" >
|
||||
<enableExpression><![CDATA[${applyBill.status} == 'SUBMIT' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="applyBillManager" methodName="checkApplyBill" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="InvoiceInfoButton" title="InvoiceInfoButton" enableType="single" invisible="false" containId="true" pageId="editInvoiceInfoPage">-->
|
||||
<!-- </popup>-->
|
||||
<commit id="deleteApplyBill" title="deleteOrderFee" enableType="multi" invisible="false" confirmMessage="delete.confirmMessage">
|
||||
<enableExpression><![CDATA[${applyBill.status} == 'OPEN' ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="applyBillManager" methodName="deleteApplyBill" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
|
||||
</forwards>
|
||||
|
||||
</commit>
|
||||
<!-- <popup id="printZFSQD" title="print" enableType="single" invisible="false" containId="true" pageId="printZFSQDPage"/> -->
|
||||
<!-- <popup id="printWWZF" title="printWWZF" enableType="none" invisible="false" containId="true" pageId="printWWZFPage"> -->
|
||||
<!-- </popup> -->
|
||||
<!-- <popup id="printWWZFCB" title="printWWZFCB" enableType="none" invisible="false" containId="true" pageId="printWWZFCBPage"> -->
|
||||
<!-- </popup> -->
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
Loading…
Reference in New Issue