From 5acba43ac9174916bf25bf9058749fe2a377c4e7 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 16 Aug 2024 17:17:22 +0800
Subject: [PATCH] no message

---
 .../delivery/maintainReceiveBillFee3Page.xml  | 165 ++++++++++++++++++
 .../classes/config/origen/menuConfig.xml      |   1 +
 target/jjwms/.gitignore                       |  36 ----
 3 files changed, 166 insertions(+), 36 deletions(-)
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFee3Page.xml
 delete mode 100644 target/jjwms/.gitignore

diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFee3Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFee3Page.xml
new file mode 100644
index 0000000..bae5af5
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFee3Page.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<pages>
+    <maintainPage id="maintainReceiveBillFee3Page" title="结算账单" autoQuery="false">
+        <search> 
+            <inputUIs>
+            	<text id="customsOrder.code" title="业务编号" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+           
+            	 <remote id="customsOrder.client.id" title="委托方" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" displayedTableHead="序号,编码,名称">
+                    <hql><![CDATA[select company.id, 
+                    company.code,
+                     company.name ,
+                     company.sale
+                     from Structure company
+  where 1=1   
+ and company.beClient = true  and company.disabled=false
+ and (upper(company.code) like upper(:param) or company.name like :param)
+ and company.disabled=false
+ ]]></hql>
+            </remote>
+            <text id="invoiceNo" title="发票号" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+            <text id="courierNo" title="快递单号" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+            <text id="issuingOffice" title="开票单位" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+            <list id="invoiceType" title="发票类型" row="3" col="2" defaultValue="" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" forceSpace="false" multiple="false"  >
+                <hql><![CDATA[ SELECT 
+ c.name,
+ c.name
+ FROM CommonCode c 
+ WHERE c.disabled=0 and c.codeType='发票类型'
+ order by c.id desc 
+  ]]></hql>
+                
+            </list>
+<!--                 <list id="fee.status" title="费用状态" defaultValue="" row="2" col="1" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"> -->
+<!--                     <hql><![CDATA[ SELECT  -->
+<!--  c.name, -->
+<!--  c.name -->
+<!--  FROM CommonCode c  -->
+<!--  WHERE 1=1 -->
+<!--  and c.name in ('已审核','财务审核') -->
+<!--  and c.disabled=0  -->
+<!--  and c.codeType='费用状态'  -->
+<!--  ]]></hql> -->
+<!--                 </list> -->
+<!--                 <checkbox id="ordersAll" title="ordersAll" row="3" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
+            	<dateRanger id="billFee.cashTime" title="收款时间" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin1" toDate="end1"/>
+                <dateRanger id="billFee.issuingDate" title="开票日期" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
+              	<dateRanger id="billFee.auditDate" title="审核时间" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin3" toDate="end3"/>
+                <text id="billFee.creatPeople" title="创建人" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+                <list id="billFee.blanExamine" title="结算状态" row="7" col="2" span="1"   width="120" readOnly="false" required="false" reserve="false" forceOverride="true" >
+                    <hql><![CDATA[ SELECT 
+ c.name,
+ c.name
+ FROM CommonCode c 
+ WHERE 1=1 
+ and c.disabled=0 
+ and c.codeType='结算状态' 
+ ]]></hql>
+        	</list>
+            </inputUIs>
+        </search>
+        <datasource type="hql"><![CDATA[SELECT distinct 
+ billFee.id,
+ billFee.code,
+ customsOrder.code,
+ billFee.blanExamine,
+ customsOrder.client.name,
+ round(billFee.totalFee,2),
+ billFee.issuingDate,
+ billFee.invoiceNo,
+ billFee.issuingOffice,
+ round(billFee.issuingMoney,2),
+ round(billFee.noTaxMoney,2),
+ round(billFee.taxAmount,2),
+ billFee.courierNo,
+ billFee.billDateStart,
+ billFee.status,
+ round(billFee.auditAmount,2),
+ round(billFee.totalFee,2)-round(billFee.auditAmount,2)as wsMenoy,
+ customsOrder.client.returnDay,
+ billFee.issuingDate+customsOrder.client.returnDay,
+ billFee.expireDay,
+ billFee.cashTime,
+ billFee.auditor,
+ billFee.auditDate,
+ billFee.creatPeople
+ FROM BillFee billFee
+ left join billFee.customsOrder as customsOrder 
+ left join customsOrder.client
+ WHERE 1=1 
+ and billFee.status in ('已审核')
+ and billFee.auditAmount>0
+ /~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
+ /~customsOrder.client.id: and customsOrder.client.id = {customsOrder.client.id}~/
+ /~billFee.creatPeople: and upper(billFee.creatPeople) like upper({billFee.creatPeople})~/
+ /~invoiceNo: and billFee.invoiceNo like upper({invoiceNo})~/
+ /~courierNo: and billFee.courierNo like upper({courierNo})~/
+ /~issuingOffice: and billFee.issuingOffice like upper({issuingOffice})~/
+ /~invoiceType: and billFee.invoiceType = {invoiceType}~/
+ /~begin1: AND trunc(billFee.cashTime) >= {begin1} ~/
+ /~end1: AND trunc(billFee.cashTime) <= {end1} ~/
+ /~begin2: AND trunc(billFee.issuingDate) >= {begin2} ~/
+ /~end2: AND trunc(billFee.issuingDate) <= {end2} ~/
+ /~begin3: AND trunc(billFee.auditDate) >= {begin3} ~/
+ /~end3: AND trunc(billFee.auditDate) <= {end3} ~/
+ /~billFee.blanExamine: and billFee.blanExamine = {billFee.blanExamine}~/
+ 
+ order by billFee.id desc
+		]]></datasource>
+        <columns>
+          	<column id="billFee.id" title="fee.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
+        	<column id="billFee.code" title="对账单号" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsOrder.code" title="业务编号" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.blanExamine" title="结算状态" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsOrder.client.name" title="委托方" width="150" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.totalFee" title="应收金额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.issuingDate" title="开票日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.invoiceNo" title="发票号" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.issuingOffice" title="开票单位" width="150" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.issuingMoney" title="开票金额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.noTaxMoney" title="未税金额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.taxAmount" title="税额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.courierNo" title="快递单号" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.billDateStart" title="寄件日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.status" title="状态" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.auditAmount" title="实收金额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="wsMenoy" title="未收金额" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.accountDay" title="合同账期天数" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.expireDate" title="到期日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="expireDay" title="距到期天数" visible="true" horizonAlign="center" verticalAlign="middle" format="billFeeColourFormatter"/>
+            <column id="billFee.cashTime" title="收款时间" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.auditor" title="审核人" visible="true" horizonAlign="center" verticalAlign="middle"/>
+         	<column id="billFee.auditDate" title="审核时间" visible="true" horizonAlign="center" verticalAlign="middle"/>
+         	<column id="billFee.creatPeople" title="创建人" visible="true" horizonAlign="center" verticalAlign="middle"/>
+         
+         </columns>
+        <buttons>
+        	<popup id="receiveFeeLook" title="应收费用查看" enableType="single" invisible="false" containId="true" pageId="modifyReceiveFeeLookExaminePage">
+            </popup>
+      
+            <commit id="returncwdjBillfee" title="退回" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
+            	 <enableExpression><![CDATA[${billFee.status} == '已审核']]></enableExpression>
+                <mappings>
+                    <mapping id="ids" className="list"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsOrderManager" methodName="returncwdjBillfee" parameter="ids"/>
+                </actions>
+                <forwards>
+                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
+                </forwards>
+            </commit>
+            <commit id="totalBillFee" title="合计" enableType="multi" invisible="false">
+                <mappings>
+                    <mapping id="ids" className="list"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsOrderManager" methodName="totalBillFee" parameter="ids"/>
+                </actions>
+                <forwards>
+                </forwards>
+            </commit>
+        </buttons>
+    </maintainPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 73c9b13..5860b51 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -135,6 +135,7 @@
      <menuItem title="maintainSaleConPage" pageId="maintainSaleConPage"/>
      <menuItem title="开票管理" pageId="maintainReceiveBillFeePage"/>
      <menuItem title="收款管理" pageId="maintainReceiveBillFee2Page"/>
+     <menuItem title="结算账单管理" pageId="maintainReceiveBillFee3Page"/>
      <menuItem title="wtfBillFeeReportPage" pageId="wtfBillFeeReportPage"/> 
      <menuItem title="payOrReceiveFeeReportPage" pageId="payOrReceiveFeeReportPage"/>
     </menuItem>
diff --git a/target/jjwms/.gitignore b/target/jjwms/.gitignore
deleted file mode 100644
index 586f6d9..0000000
--- a/target/jjwms/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-/images/
-/imageView.jsp
-/WEB-INF/
-/css/
-/fullLogin.html
-/imageLoad.jsp
-/Head.jsp
-/richtext/
-/scripts/
-/setupLicense.html
-/setupLicenseError.html
-/setupLicenseExpired.html
-/13C83C2A9EF6A4124D3E828F4577BE8B.cache.html
-/34C2C189E187A09161F4F48B43AFDA30.cache.html
-/4F503C089191E7D1D021F89ECED37378.cache.html
-/548CDF11D6FE9011F3447CA200D7FB7F.cache.png
-/74440529F2A86F33126559ED3A570E56.gwt.rpc
-/9DA92932034707C17CFF15F95086D53F.cache.png
-/A7CD51F9E5A7DED5F85AD1D82BA67A8A.cache.png
-/ApplicationWindow.css
-/ApplicationWindow.html
-/E9B80E93324842A33060B06B4103D915.gwt.rpc
-/GwtExt.css
-/ReportCenter.css
-/ReportCenter.html
-/SWMS.css
-/SWMS.html
-/clear.cache.gif
-/com.dev.swms.SWMS.nocache.js
-/gwt-hosted.html
-/history.html
-/hosted.html
-/loadReport.html
-/reportError.html
-/03B5E2CE1CBA8195FA9E9AF911F2CD72.cache.html
-/13804C6F9E7AD3824FEE11CC8DC1E261.cache.html