From ddd985dce90852de7e22d0eafb24365ddd9c09f7 Mon Sep 17 00:00:00 2001
From: "huojin\\hj" <982011>
Date: Mon, 7 Jul 2025 11:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=AE=A1=E7=90=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../origen/base/maintainOperationHisPage.xml  |  10 +-
 .../fee/maintainApplyBillDetailPayPage.xml    |   8 +-
 .../origen/base/maintainOperationHisPage.xml  |  54 --------
 .../fee/maintainApplyBillDetailPayPage.xml    | 124 ------------------
 4 files changed, 9 insertions(+), 187 deletions(-)
 delete mode 100644 target/cqtms/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
 delete mode 100644 target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml

diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
index 3942590..1a559b7 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
@@ -10,9 +10,8 @@
                 <text id="oh.detailNo" title="oh.detailNo" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
                 <text id="oh.actionName" title="oh.actionName" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
                 <text id="oh.userName" title="oh.userName" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-<!--                 <dateRanger id="oh.updateTime" title="oh.updateTime" row="4" col="2" span ="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="oh.beginDate" toDate="oh.endDate" /> -->
-           		 <date id="oh.beginDate" title="oh.updateTime" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" methodName="getClientTime" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-           		<date id="oh.endDate" title="shipmentOrderQueryPage.maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
+                <dateRanger id="oh.updateTime" title="oh.updateTime" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
+			     
             </inputUIs>
         </search>
         <datasource type="hql"><![CDATA[select 
@@ -35,8 +34,9 @@ and oh.warehouseId= #{SESSION_PLAT_ID}
 /~oh.sourceType: AND oh.sourceType like {oh.sourceType} ~/
 /~oh.sourceNo: AND (oh.sourceNo like {oh.sourceNo} or oh.detailNo like {oh.sourceNo} ) ~/
 /~oh.detailNo: AND oh.detailNo like {oh.detailNo} ~/
-/~oh.beginDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  >= {oh.beginDate} ~/
-/~oh.endDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  <= {oh.endDate} ~/
+/~startDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  >= {startDate} ~/
+/~endDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  <= {endDate} ~/
+
 ORDER BY oh.updateTime desc]]></datasource>
         <columns>
             <column id="oh.id" title="oh.id" visible="false" horizonAlign="center" />
diff --git a/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml b/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
index 3a81c31..d10c8f3 100644
--- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
@@ -39,8 +39,8 @@
  ABD.billProject,
  ABD.applyBill.applicant,
  ABD.applyBill.applicationTime,
- invoice.cashPerson,
- invoice.cashTime
+ invoice.createPerson,
+ invoice.createTime
  FROM Invoice invoice,ApplyBillDetail  ABD
   	left join  ABD.applyBill applyBill
 	left join  applyBill.generalDepartment
@@ -73,8 +73,8 @@
             <column id="ABD.billProject" title="abd.billProjectPay" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="ABD.applyBill.applicant" title="applyBill.applicant" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="ABD.applyBill.applicationTime" title="applyBill.applicationTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.cashPerson" title="invoice.paycashPerson" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           	<column id="invoice.cashTime" title="invoice.paycashTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="invoice.cashPerson" title="创建人" visible="true" horizonAlign="center" verticalAlign="middle"/>
+           	<column id="invoice.cashTime" title="创建时间" visible="true" horizonAlign="center" verticalAlign="middle"/>
         </columns>
         <buttons>
 <!--            <popup id="newApplyBillButton" title="maintainOrderPage.newOrderButton" enableType="none" invisible="false" containId="false" pageId="modifyApplyBillPage"/>-->
diff --git a/target/cqtms/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml b/target/cqtms/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
deleted file mode 100644
index 3942590..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/base/maintainOperationHisPage.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainOperationHisPage" title="maintainOperationHisPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="oh.sourceId" title="oh.sourceId" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="false"/>
-                <text id="oh.sourceType" title="oh.sourceType" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="false"/>
-                <text id="oh.sourceNo" title="oh.sourceNo" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="oh.detailNo" title="oh.detailNo" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="oh.actionName" title="oh.actionName" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                <text id="oh.userName" title="oh.userName" row="3" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-<!--                 <dateRanger id="oh.updateTime" title="oh.updateTime" row="4" col="2" span ="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="oh.beginDate" toDate="oh.endDate" /> -->
-           		 <date id="oh.beginDate" title="oh.updateTime" row="9" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" methodName="getClientTime" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-           		<date id="oh.endDate" title="shipmentOrderQueryPage.maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="9" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[select 
-oh.id,
-oh.sourceId,
-oh.sourceNo,
-oh.sourceType,
-oh.actionName,
-oh.detailNo,
-oh.userID,
-oh.userName,
-oh.updateTime,
-oh.remark
-from OperationHis oh
-WHERE 1=1 and (oh.extendStr1='TMS' OR oh.extendStr1 IS NULL) 
-and oh.warehouseId= #{SESSION_PLAT_ID}
-/~oh.sourceId: AND upper(oh.sourceId) like upper({oh.sourceId}) ~/
-/~oh.actionName: AND oh.actionName like {oh.actionName} ~/
-/~oh.userName: AND (oh.userName like {oh.userName} or oh.userName in (select max(u.name) from User u where u.loginName like {oh.userName})) ~/
-/~oh.sourceType: AND oh.sourceType like {oh.sourceType} ~/
-/~oh.sourceNo: AND (oh.sourceNo like {oh.sourceNo} or oh.detailNo like {oh.sourceNo} ) ~/
-/~oh.detailNo: AND oh.detailNo like {oh.detailNo} ~/
-/~oh.beginDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  >= {oh.beginDate} ~/
-/~oh.endDate: AND STR_TO_DATE(DATE_FORMAT(oh.updateTime,'%Y-%m-%d'),'%Y-%m-%d')  <= {oh.endDate} ~/
-ORDER BY oh.updateTime desc]]></datasource>
-        <columns>
-            <column id="oh.id" title="oh.id" visible="false" horizonAlign="center" />
-            <column id="oh.sourceId" title="oh.sourceId" visible="false" horizonAlign="center" />
-			<column id="oh.sourceNo" title="oh.sourceNo" visible="true" horizonAlign="center" />
-            <column id="oh.sourceType" title="oh.sourceType" visible="true" horizonAlign="center" />
-            <column id="oh.actionName" title="oh.actionName" visible="true" horizonAlign="center" />
-            <column id="oh.detailNo" title="oh.detailNo" visible="true" horizonAlign="center" />
-            <column id="oh.userID" title="oh.userID" visible="false" horizonAlign="center" />
-            <column id="oh.userName" title="oh.userName" visible="true" horizonAlign="center" />
-            <column id="oh.updateTime" title="oh.updateTime" visible="true" horizonAlign="center" />
-            <column id="oh.remark" title="oh.remark" visible="true" horizonAlign="center" />
-		</columns>
-    </maintainPage>
-</pages>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
deleted file mode 100644
index 3a81c31..0000000
--- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainApplyBillDetailPayPage.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainApplyBillDetailPayPage" title="maintainApplyBillDetailPayPage" autoQuery="false">
-        <search>
-            <inputUIs>
-                <text id="ABD.invoiceNo" title="invoice.invoiceNo" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-              	<text id="applyBill.companyName" title="applyBill.companyName" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
-<!--              	<text id="ABD.billType" title="abd.billType" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>-->
-            	<list id="applyBill.invoiceType" title="fee.invoiceType" row="3" col="1" defaultValue="" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" forceSpace="false" multiple="false" enumType="InvoiceType" >
-                <hql><![CDATA[ SELECT t.enumValue,t.enumValue 
- FROM Enumerate t 
- WHERE t.enumType = 'InvoiceType'  and t.enumValue in ('ORDINARY','DEDICATED')]]></hql>
-            </list>
-            <list id="invoice.invoiceState" title="ABD.statu" row="3" 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','VERIFICATION')
-  order by enumerate.id]]></hql>
-                </list>
-                <dateRanger id="invoice.issuingDate" title="applyBill.invoiceDate1" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
-			   
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[ SELECT 
- invoice.id,
- applyBill.consignor.name,
- invoiceCompany.companyName,
- invoice.invoiceNo,
- invoice.transferVoucher,
- invoice.invoiceState,
- invoice.issuingDate,
- CAST(round(invoice.billingFee,2) as string),
- CAST(round(invoice.tax,2) as string),
- CAST(round(invoice.taxFee,2) as string),
- CAST(round(invoice.noTaxFee,2) as string),
- applyBill.invoiceType,
- ABD.billProject,
- ABD.applyBill.applicant,
- ABD.applyBill.applicationTime,
- invoice.cashPerson,
- invoice.cashTime
- FROM Invoice invoice,ApplyBillDetail  ABD
-  	left join  ABD.applyBill applyBill
-	left join  applyBill.generalDepartment
-	left join  applyBill.consignor
-	left join  applyBill.invoiceCompany invoiceCompany
- WHERE 1=1  
- and invoice.platForm=#{SESSION_PLATFORM}
- and invoice.payOrReceive='PAY' and ABD.invoice.id=invoice.id 
-/~ABD.invoiceNo: AND ABD.invoiceNo like upper({ABD.invoiceNo})~/
-/~invoiceCompany.companyName: AND invoiceCompany.companyName like {invoiceCompany.companyName}~/
-/~applyBill.invoiceType: AND applyBill.invoiceType = {applyBill.invoiceType}~/
- /~invoice.invoiceState: and invoice.invoiceState = {invoice.invoiceState} ~/
-  /~startDate: AND (invoice.issuingDate) >= {startDate}~/
- /~endDate: AND (invoice.issuingDate) <= {endDate}~/
- ]]></datasource>
-        <columns>
-            <column id="invoice.id" title="invoice.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
-            <column id="applyBill.consignor.name" title="fee.account" visible="false" horizonAlign="center" verticalAlign="middle"/>
-            <column id="ABD.applyBill.invoiceCompany.companyName" title="applyBill.companyName" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.invoiceNo" title="invoice.invoiceNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.transferVoucher" title="invoice.transferVoucher" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.invoiceState" title="ABD.statu" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
-            <column id="invoice.issuingDate" title="applyBill.invoiceDate1" visible="true" horizonAlign="center" verticalAlign="middle"/>
-             <column id="invoice.billingFee" title="applyBillPay.turnover" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.tax" title="abd.taxRate" visible="true" horizonAlign="center" verticalAlign="middle" returnType="int"/>
-             <column id="invoice.taxFee" title="invoice.taxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-              <column id="invoice.noTaxFee" title="invoice.noTaxFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           
-            <column id="ABD.billType" title="abd.billType" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="InvoiceType"/>
-            <column id="ABD.billProject" title="abd.billProjectPay" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="ABD.applyBill.applicant" title="applyBill.applicant" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="ABD.applyBill.applicationTime" title="applyBill.applicationTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="invoice.cashPerson" title="invoice.paycashPerson" visible="true" horizonAlign="center" verticalAlign="middle"/>
-           	<column id="invoice.cashTime" title="invoice.paycashTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
-        </columns>
-        <buttons>
-<!--            <popup id="newApplyBillButton" title="maintainOrderPage.newOrderButton" enableType="none" invisible="false" containId="false" pageId="modifyApplyBillPage"/>-->
-<!--            <popup id="selectApplyBillrButton" title="maintainOrderPage.selectOrderButton" enableType="single" invisible="false" containId="true" pageId="modifyApplyBillPage">-->
-<!--             <enableExpression><![CDATA[${billFee.status} == 'OPEN'  ]]></enableExpression>-->
-<!--          </popup>-->
-<!--          <commit id="AuditApplyBillButton" title="AuditButton" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.AuditApplyBill.confirmMessage">-->
-<!--                <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>-->
-<!--             <popup id="singleInvoicePay" title="singleInvoicePay" enableType="single" invisible="false" containId="true" pageId="editInvoiceInfoPayPage">-->
-<!--              <enableExpression><![CDATA[${invoice.invoiceState}=='OPEN']]></enableExpression>  -->
-<!--             </popup>-->
-          <popup id="singleInvoicePay" title="singleInvoicePay" enableType="multi" invisible="false" containId="true" pageId="editInvoicePayPage">
-              <enableExpression><![CDATA[${invoice.invoiceState}=='OPEN']]></enableExpression>  
-            </popup>
-               <commit id="deleteInvoicePay" title="deleteInvoicePay" enableType="multi" invisible="false" confirmMessage="maintainOrderPage.deleteInvoicePay.confirmMessage">
-                <enableExpression><![CDATA[${invoice.invoiceState} == 'OPEN' || ${invoice.invoiceState} == 'VERIFICATION'  ]]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="applyBillManager" methodName="deleteInvoice" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-<!--             <popup id="multiInvoicePay" title="multiInvoicePay" enableType="multi" invisible="false" containId="true" pageId="editMultiInvoiceInfoPayPage">-->
-<!--             <enableExpression><![CDATA[${invoice.invoiceState}=='OPEN']]></enableExpression>  -->
-<!--             </popup>-->
-             <popup id="SeeInvoicePay" title="SeeInvoicePay" enableType="single" invisible="false" containId="true" pageId="maintainSeeInvoicePayPage">
-             </popup>
-			<popup id="editTransferVoucher" title="editTransferVoucher" enableType="multi" invisible="false" containId="true" pageId="editTransferVoucherPAyPage">
-<!--              <enableExpression><![CDATA[${invoice.invoiceState}=='OPEN']]></enableExpression>  -->
-            </popup>
-        </buttons>
-    </maintainPage>
-</pages>