diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index 75ea5d0..ded9185 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -1,75 +1,75 @@  - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.742,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899/12/30 00:00:00.000.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899/12/30 00:00:00.000.987,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableInput.pas - 1899/12/30 00:00:00.000.292,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_FinPurchasePlanSel.pas + 1899/12/30 00:00:00.000.895,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutList.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.979,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutInPut.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.742,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.453,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayInput.pas 1899/12/30 00:00:00.000.595,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.pas - 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.pas 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.895,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutList.pas + 1899/12/30 00:00:00.000.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.pas + 1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm + 1899/12/30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj + 1899/12/30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.446,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowList.pas - 1899/12/30 00:00:00.000.772,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas + 1899/12/30 00:00:00.000.772,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas 1899/12/30 00:00:00.000.806,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899/12/30 00:00:00.000.885,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ExpenseList.pas - 1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm 1899/12/30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899/12/30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas - 1899/12/30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899/12/30 00:00:00.000.987,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableInput.pas + 1899/12/30 00:00:00.000.292,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_FinPurchasePlanSel.pas + 1899/12/30 00:00:00.000.446,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowList.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899/12/30 00:00:00.000.052,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CollectList.pas - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.381,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableInput.pas + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.pas + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm 1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm - 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm - 1899/12/30 00:00:00.000.765,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowTotalList.pas - 1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatement.pas + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.381,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableInput.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.912,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayList.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.pas - 1899/12/30 00:00:00.000.508,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableList.pas - 1899/12/30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.765,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowTotalList.pas + 1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatement.pas 1899/12/30 00:00:00.000.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.508,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableList.pas + 1899/12/30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas + 1899/12/30 00:00:00.000.912,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayList.pas + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas 2026/05/22 14:41:58.000.210,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.pas - 2026/05/22 14:42:09.000.263,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectInput2.pas=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.pas - 2026/05/22 14:42:09.000.263,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectInput2.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.dfm + 2026/05/22 14:42:09.000.263,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectInput2.dfm + 2026/05/22 14:42:09.000.263,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.pas=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectInput2.pas 2026/05/22 15:10:32.000.542,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceSel.pas - 2026/05/22 15:10:56.000.683,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceOutSel.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceSel.dfm - 2026/05/22 15:10:56.000.683,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceOutSel.pas=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceSel.pas - 2026/05/30 14:03:53.690,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas - 2026/05/30 14:04:26.060,D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.dfm - 2026/05/30 14:04:26.060,D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.pas=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas - 2026/05/30 14:05:55.119,D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.pas= - 2026/05/30 14:42:33.201,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas + 2026/05/22 15:10:56.000.683,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceSel.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceOutSel.dfm + 2026/05/22 15:10:56.000.683,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceSel.pas=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_InvoiceOutSel.pas + 2026/05/30 14:03:53.000.690,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas + 2026/05/30 14:04:26.000.060,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.dfm=D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.dfm + 2026/05/30 14:04:26.000.060,D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas=D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.pas + 2026/05/30 14:05:55.000.119,D:\D10W\项目代码\D10myXingrui\B02基础纱线仓库\U_YarnInfoImport.pas= + 2026/05/30 14:42:33.000.201,=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_CollectImport.pas diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index 1de30c6..ef1d7d2 100644 Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ diff --git a/A09财务通用管理/U_CollectList.dfm b/A09财务通用管理/U_CollectList.dfm index 9bfa200..2b56735 100644 --- a/A09财务通用管理/U_CollectList.dfm +++ b/A09财务通用管理/U_CollectList.dfm @@ -451,6 +451,7 @@ inherited frmCollectList: TfrmCollectList Font.Style = [fsBold] ParentFont = False TabOrder = 3 + Visible = False Properties.CustomButtons.Buttons = <> Properties.Style = 2 Properties.TabIndex = 0 diff --git a/A09财务通用管理/U_CollectList.pas b/A09财务通用管理/U_CollectList.pas index 707aced..ed9a922 100644 --- a/A09财务通用管理/U_CollectList.pas +++ b/A09财务通用管理/U_CollectList.pas @@ -122,6 +122,8 @@ begin btnChk.Enabled := false; // btnReChk.Enabled := false; // + btnChk.Visible := false; // + btnReChk.Visible := false; // btnAdd.Enabled := false; // btnEdit.Enabled := false; //޸ @@ -136,12 +138,12 @@ begin begin btnEdit.Enabled := true; btnDel.Enabled := true; - btnChk.Enabled := true; +// btnChk.Enabled := true; TBInvoice.Enabled := true; end; 1: begin - btnReChk.Enabled := true; +// btnReChk.Enabled := true; end; 2: begin diff --git a/A09财务通用管理/U_CustStatement.dfm b/A09财务通用管理/U_CustStatement.dfm index 8b0baa6..ab8dbf0 100644 --- a/A09财务通用管理/U_CustStatement.dfm +++ b/A09财务通用管理/U_CustStatement.dfm @@ -178,18 +178,22 @@ inherited frmCustStatement: TfrmCustStatement DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < item + Format = '#,###.##' Kind = skSum Column = v2Column5 end item + Format = '#,###.##' Kind = skSum Column = v2Column1 end item + Format = '#,###.##' Kind = skSum Column = v2Column2 end item + Format = '#,###.##' Kind = skSum Column = v2Column3 end @@ -286,8 +290,8 @@ inherited frmCustStatement: TfrmCustStatement Caption = #19978#26399#27424#27454 DataBinding.FieldName = 'SQJYAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.Alignment.Horz = taCenter + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 96 @@ -296,8 +300,8 @@ inherited frmCustStatement: TfrmCustStatement Caption = #26412#26399#24212#25910 DataBinding.FieldName = 'BQYSAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.Alignment.Horz = taCenter + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 106 @@ -306,8 +310,8 @@ inherited frmCustStatement: TfrmCustStatement Caption = #26412#26399#25910#27454 DataBinding.FieldName = 'BQSKAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.Alignment.Horz = taCenter + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 108 @@ -316,8 +320,8 @@ inherited frmCustStatement: TfrmCustStatement Caption = #26412#26399#27424#27454 DataBinding.FieldName = 'BQJYAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.Alignment.Horz = taCenter + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 104 diff --git a/A09财务通用管理/U_CustStatement.pas b/A09财务通用管理/U_CustStatement.pas index a95ce74..aaa571c 100644 --- a/A09财务通用管理/U_CustStatement.pas +++ b/A09财务通用管理/U_CustStatement.pas @@ -16,7 +16,7 @@ uses dxBarBuiltInMenu, cxPC, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils, cxContainer, dxCore, cxDateUtils, cxDropDownEdit, dxSkinsCore, dxSkinsDefaultPainters, - dxScrollbarAnnotations, cxProgressBar, dxSkinWXI; + dxScrollbarAnnotations, cxProgressBar, dxSkinWXI, cxCurrencyEdit; type TfrmCustStatement = class(TfrmBaseList) @@ -94,7 +94,7 @@ begin Filtered := False; Close; SQL.Clear; - sql.Add(' exec P_Fin_CustStatement '); + sql.Add(' exec P_Fin_CustStatement_New '); sql.Add(' @begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.Date)))); sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.Date + 1)))); case cxTabControl1.TabIndex of @@ -187,7 +187,7 @@ begin begdate.Date := self.begdate.Date; enddate.Date := self.Enddate.Date; OppCoName.Text := self.CDS_HZ.fieldbyname('OppCoName').AsString; - FOppCoNo := self.CDS_HZ.fieldbyname('OppCoNo').AsString; + FOppCoNo := self.CDS_HZ.fieldbyname('oppshuino').AsString; FZKType := Self.FZKType; case cxTabControl1.TabIndex of 0: diff --git a/A09财务通用管理/U_ExpenseList.dfm b/A09财务通用管理/U_ExpenseList.dfm index 5f27f39..2f585b9 100644 --- a/A09财务通用管理/U_ExpenseList.dfm +++ b/A09财务通用管理/U_ExpenseList.dfm @@ -19,7 +19,7 @@ inherited frmExpenseList: TfrmExpenseList Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 108 + ButtonWidth = 107 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_Financial.ImageList_new32 @@ -37,7 +37,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = TBRafreshClick end object btnAdd: TToolButton - Left = 71 + Left = 63 Top = 0 AutoSize = True Caption = #26032#22686 @@ -45,7 +45,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnAddClick end object btnEdit: TToolButton - Left = 142 + Left = 126 Top = 0 AutoSize = True Caption = #20462#25913 @@ -53,7 +53,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnEditClick end object btnDel: TToolButton - Left = 213 + Left = 189 Top = 0 AutoSize = True Caption = #21024#38500 @@ -61,7 +61,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnDelClick end object btnChk: TToolButton - Left = 284 + Left = 252 Top = 0 AutoSize = True Caption = #23457#26680'1' @@ -69,7 +69,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnChkClick end object btnReChk: TToolButton - Left = 364 + Left = 322 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680'1' @@ -77,7 +77,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnReChkClick end object btnChk2: TToolButton - Left = 476 + Left = 416 Top = 0 AutoSize = True Caption = #23457#26680'2' @@ -85,7 +85,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnChk2Click end object btnReChk2: TToolButton - Left = 556 + Left = 486 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680'2' @@ -93,7 +93,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = btnReChk2Click end object TbnPay: TToolButton - Left = 668 + Left = 580 Top = 0 AutoSize = True Caption = #20184#27454 @@ -101,7 +101,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = TbnPayClick end object TbnRePay: TToolButton - Left = 739 + Left = 643 Top = 0 AutoSize = True Caption = #25764#38144#20184#27454 @@ -109,15 +109,23 @@ inherited frmExpenseList: TfrmExpenseList OnClick = TbnRePayClick end object TbFP: TToolButton - Left = 842 + Left = 730 Top = 0 AutoSize = True Caption = #20851#32852#21457#31080 ImageIndex = 52 OnClick = TbFPClick end + object TbCancelFP: TToolButton + Left = 817 + Top = 0 + AutoSize = True + Caption = #25764#38144#20851#32852#21457#31080 + ImageIndex = 11 + OnClick = TbCancelFPClick + end object ToolButton9: TToolButton - Left = 945 + Left = 928 Top = 0 AutoSize = True Caption = #38468#20214#19978#20256 @@ -125,7 +133,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = ToolButton9Click end object ToolButton4: TToolButton - Left = 1048 + Left = 1015 Top = 0 AutoSize = True Caption = #23548#20986 @@ -133,7 +141,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = ToolButton4Click end object TbPrint: TToolButton - Left = 1119 + Left = 1078 Top = 0 AutoSize = True Caption = #25171#21360 @@ -141,7 +149,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = TbPrintClick end object ToolButton5: TToolButton - Left = 1190 + Left = 1141 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -149,7 +157,7 @@ inherited frmExpenseList: TfrmExpenseList OnClick = ToolButton5Click end object TBClose: TToolButton - Left = 1293 + Left = 1228 Top = 0 AutoSize = True Caption = #20851#38381 @@ -178,37 +186,30 @@ inherited frmExpenseList: TfrmExpenseList object Label4: TLabel Left = 456 Top = 6 - Width = 32 + Width = 64 Height = 21 - Caption = #21697#21517 + Caption = #20184#27454#26041#24335 end object Label6: TLabel Left = 456 Top = 37 - Width = 32 - Height = 21 - Caption = #32534#21495 - end - object Label10: TLabel - Left = 665 - Top = 37 - Width = 68 - Height = 21 - Caption = #21512' '#21516' '#21495 - end - object Label11: TLabel - Left = 669 - Top = 6 Width = 64 Height = 21 - Caption = #23458#25143#21333#21495 + Caption = #23545#26041#31246#21495 + end + object Label11: TLabel + Left = 714 + Top = 6 + Width = 32 + Height = 21 + Caption = #29992#36884 end object Label2: TLabel Left = 218 Top = 37 Width = 64 Height = 21 - Caption = #19978#32423#21333#20301 + Caption = #30003#35831#21333#21495 end object Label1: TLabel Left = 67 @@ -225,43 +226,36 @@ inherited frmExpenseList: TfrmExpenseList OnKeyPress = OppCoNameKeyPress Width = 150 end - object F_Name: TcxTextEdit + object PayMent: TcxTextEdit Tag = 2 - Left = 490 - Top = 2 + Left = 542 + Top = 0 TabOrder = 1 OnKeyPress = OppCoNameKeyPress Width = 150 end - object P_Code: TcxTextEdit - Tag = 1 - Left = 490 + object oppShuiNo: TcxTextEdit + Tag = 2 + Left = 542 Top = 33 TabOrder = 2 OnKeyPress = OppCoNameKeyPress Width = 150 end - object ConNo: TcxTextEdit - Tag = 2 - Left = 734 - Top = 33 + object Use: TcxTextEdit + Tag = 77 + Left = 752 + Top = 0 + Hint = 'A.' TabOrder = 3 OnKeyPress = OppCoNameKeyPress Width = 150 end - object BuyConNo: TcxTextEdit + object FFID: TcxTextEdit Tag = 2 - Left = 734 - Top = 2 - TabOrder = 4 - OnKeyPress = OppCoNameKeyPress - Width = 150 - end - object OppParentCoName: TcxTextEdit - Tag = 2 - Left = 281 + Left = 283 Top = 33 - TabOrder = 5 + TabOrder = 4 OnKeyPress = OppCoNameKeyPress Width = 150 end @@ -269,14 +263,14 @@ inherited frmExpenseList: TfrmExpenseList Left = 87 Top = 2 Properties.ShowTime = False - TabOrder = 6 + TabOrder = 5 Width = 120 end object Enddate: TcxDateEdit Left = 87 Top = 33 Properties.ShowTime = False - TabOrder = 7 + TabOrder = 6 Width = 120 end object CheckBox1: TcxCheckBox @@ -284,7 +278,7 @@ inherited frmExpenseList: TfrmExpenseList Top = 4 Caption = #26597#35810#26085#26399 State = cbsChecked - TabOrder = 8 + TabOrder = 7 end end object cxGrid1: TcxGrid [2] diff --git a/A09财务通用管理/U_ExpenseList.pas b/A09财务通用管理/U_ExpenseList.pas index e1522c9..3a998e8 100644 --- a/A09财务通用管理/U_ExpenseList.pas +++ b/A09财务通用管理/U_ExpenseList.pas @@ -41,23 +41,21 @@ type CDS_1: TClientDataSet; btnAdd: TToolButton; v2FactoryName: TcxGridDBColumn; - F_Name: TcxTextEdit; + PayMent: TcxTextEdit; Label4: TLabel; Label6: TLabel; - P_Code: TcxTextEdit; + oppShuiNo: TcxTextEdit; Tv1OppBankName: TcxGridDBColumn; cxTabControl1: TcxTabControl; - Label10: TLabel; - ConNo: TcxTextEdit; Label11: TLabel; - BuyConNo: TcxTextEdit; + Use: TcxTextEdit; btnChk: TToolButton; btnReChk: TToolButton; PM_1: TPopupMenu; N1: TMenuItem; ToolButton4: TToolButton; Label2: TLabel; - OppParentCoName: TcxTextEdit; + FFID: TcxTextEdit; ToolButton5: TToolButton; N2: TMenuItem; btnEdit: TToolButton; @@ -95,6 +93,7 @@ type TbFP: TToolButton; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; + TbCancelFP: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure btnDelClick(Sender: TObject); @@ -120,6 +119,7 @@ type procedure btnChk2Click(Sender: TObject); procedure btnReChk2Click(Sender: TObject); procedure TbFPClick(Sender: TObject); + procedure TbCancelFPClick(Sender: TObject); private FPayOurBankName: TcxButtonEdit; FPayOurBankCardNo: TcxTextEdit; @@ -331,6 +331,10 @@ begin end; end; + if Trim(Use.Text) <> '' then + begin + SQL.Add(' and A.[Use] like ''%' + Trim(Use.Text) + '%'' '); + end; if CheckBox1.Checked then begin sql.Add(' and A.FFTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.Date) + ''' '); @@ -370,6 +374,70 @@ begin Action := caFree; end; +procedure TfrmExpenseList.TbCancelFPClick(Sender: TObject); +var + FFFIDS: string; +begin + inherited; + + if CDS_1.IsEmpty then + Exit; + + if not CDS_1.Locate('SSel', True, []) then + begin + Application.MessageBox('ѡ', 'ʾϢ', MB_OK + MB_ICONINFORMATION); + Exit; + end; + + with CDS_1 do + begin + DisableControls; + First; + while not Eof do + begin + if FieldByName('SSel').AsBoolean then + begin + if Trim(FieldByName('IVID').AsString) = '' then + begin + Application.MessageBox(PChar('¼' + FieldByName('FFID').AsString + 'δƱ賷'), 'ʾϢ', MB_OK + MB_ICONWARNING); + EnableControls; + Exit; + end; + FFFIDS := FFFIDS + Trim(FieldByName('FFID').AsString) + ','; + end; + Next; + end; + EnableControls; + end; + + if FFFIDS <> '' then + FFFIDS := Copy(FFFIDS, 1, Length(FFFIDS) - 1) + else + Exit; + + try + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('UPDATE Finance_Flow SET IVNo = '''', IVID = '''' '); + SQL.Add('WHERE FFID IN (SELECT rtvalue FROM dbo.F_Tool_SplitString(' + + QuotedStr(FFFIDS) + ', '',''))'); + ExecSQL; + end; + + Application.MessageBox('Ʊɹ', 'ʾϢ', MB_OK + MB_ICONINFORMATION); + + InitGrid(); + + except + on E: Exception do + begin + Application.MessageBox(PChar('Ʊʧܣ' + E.Message), 'Ϣ', MB_OK + MB_ICONERROR); + end; + end; +end; + procedure TfrmExpenseList.TBCloseClick(Sender: TObject); begin @@ -982,7 +1050,7 @@ end; procedure TfrmExpenseList.TBRafreshClick(Sender: TObject); begin - begdate.SetFocus; + toolbar1.SetFocus; InitGrid(); diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index 07f3934..19ffaf9 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -77,9 +77,9 @@ begin user := 'kaixiyasa'; pswd := 'rightsoft,.KXY@YN'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - Parameters1:=''; -// Parameters1 := '2'; -// Parameters1 := ''; + Parameters1:=''; + Parameters1 := '2'; + Parameters1 := ''; end else begin diff --git a/A09财务通用管理/U_InvoiceInList.pas b/A09财务通用管理/U_InvoiceInList.pas index d2e3c4e..25c526a 100644 --- a/A09财务通用管理/U_InvoiceInList.pas +++ b/A09财务通用管理/U_InvoiceInList.pas @@ -197,9 +197,16 @@ begin sql.Add(' select A.* '); sql.Add(',FJFlag=CAST((CASE WHEN (SELECT COUNT(X.FileName) FROM FJ_File X where X.TFType=''Ʊ'' and X.WBID=A.IVNo)>0 THEN 1 ELSE 0 END) AS BIT)'); sql.Add(',checkStatus=case when A.status = ''0'' then ''δ'' else '''' end '); - sql.Add(',PayStatus=(select PayStatus from Finance_Flow X where X.IVID = A.IVID ) '); -// sql.Add(',PayTime=(select PayTime from Finance_Flow X where X.IVID = A.IVID ) '); - sql.Add(',PayTime=case when (select PayStatus from Finance_Flow X where X.IVID = A.IVID ) = ''δ'' then null else (select PayTime from Finance_Flow X where X.IVID = A.IVID ) end '); + + sql.Add(',PayStatus=(SELECT TOP 1 X.PayStatus FROM Finance_Flow X '); + sql.Add(' WHERE CHARINDEX('','' + A.IVID + '','', '','' + X.IVID + '','') > 0 ) '); + + sql.Add(',PayTime=case when (SELECT TOP 1 X.PayStatus FROM Finance_Flow X '); + sql.Add(' WHERE CHARINDEX('','' + A.IVID + '','', '','' + X.IVID + '','') > 0 ) = ''δ'' '); + sql.Add(' then null '); + sql.Add(' else (SELECT TOP 1 X.PayTime FROM Finance_Flow X '); + sql.Add(' WHERE CHARINDEX('','' + A.IVID + '','', '','' + X.IVID + '','') > 0 ) end '); + sql.Add(' from Finance_Invoice A '); sql.add(' where A.IVDate>=''' + formatdatetime('yyyy-MM-dd', begdate.Date) + ''' '); @@ -256,7 +263,7 @@ end; procedure TfrmInvoiceInList.TBRafreshClick(Sender: TObject); begin - begdate.SetFocus; + toolbar1.SetFocus; InitGrid(); end; diff --git a/A09财务通用管理/U_InvoiceSel.dfm b/A09财务通用管理/U_InvoiceSel.dfm index b736c7b..843bb56 100644 --- a/A09财务通用管理/U_InvoiceSel.dfm +++ b/A09财务通用管理/U_InvoiceSel.dfm @@ -356,7 +356,7 @@ object frmInvoiceSel: TfrmInvoiceSel end object begdate: TcxDateEdit Left = 87 - Top = 2 + Top = -2 Properties.ShowTime = False TabOrder = 0 Width = 120 @@ -368,6 +368,32 @@ object frmInvoiceSel: TfrmInvoiceSel TabOrder = 1 Width = 120 end + object SupplierShuiNo: TcxTextEdit + Tag = 2 + Left = 326 + Top = 8 + TabOrder = 2 + OnKeyPress = SupplierShuiNoKeyPress + Width = 131 + end + object cxLabel1: TcxLabel + Left = 240 + Top = 6 + Caption = #20379#24212#21830#31246#21495 + end + object Supplier: TcxTextEdit + Tag = 2 + Left = 576 + Top = 8 + TabOrder = 4 + OnKeyPress = SupplierShuiNoKeyPress + Width = 150 + end + object cxLabel2: TcxLabel + Left = 481 + Top = 6 + Caption = #20379#24212#21830#21517#31216 + end end object DataSource1: TDataSource DataSet = CDS_Invoice diff --git a/A09财务通用管理/U_InvoiceSel.pas b/A09财务通用管理/U_InvoiceSel.pas index 818f2f4..f89115a 100644 --- a/A09财务通用管理/U_InvoiceSel.pas +++ b/A09财务通用管理/U_InvoiceSel.pas @@ -12,7 +12,7 @@ uses cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar, dxDateRanges, dxBarBuiltInMenu, ComObj, dxSkinsCore, dxSkinsDefaultPainters, dxScrollbarAnnotations, cxPC, cxContainer, dxCore, cxDateUtils, cxCheckBox, - cxMaskEdit, dxSkinWXI, cxCurrencyEdit; + cxMaskEdit, dxSkinWXI, cxCurrencyEdit, cxLabel; type TfrmInvoiceSel = class(TForm) @@ -56,6 +56,10 @@ type ToolButton6: TToolButton; Label4: TLabel; Tv1Column1: TcxGridDBColumn; + SupplierShuiNo: TcxTextEdit; + cxLabel1: TcxLabel; + Supplier: TcxTextEdit; + cxLabel2: TcxLabel; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TSaveClick(Sender: TObject); @@ -80,6 +84,7 @@ type procedure Tv1DblClick(Sender: TObject); procedure cxTabControl1Change(Sender: TObject); procedure ToolButton6Click(Sender: TObject); + procedure SupplierShuiNoKeyPress(Sender: TObject; var Key: Char); private procedure initGrid(); procedure SaveDate(); @@ -181,6 +186,14 @@ begin end; end; +procedure TfrmInvoiceSel.SupplierShuiNoKeyPress(Sender: TObject; var Key: Char); +begin + if Key = #13 then + begin + InitGrid(); + end; +end; + procedure TfrmInvoiceSel.SaveDate(); var MaxNo: string; @@ -247,13 +260,14 @@ begin end; procedure TfrmInvoiceSel.initGrid(); +var + filterStr: string; begin with ADOQueryTmp do begin close; sql.Clear; sql.Add('select A.*,B.BankName,B.BankNo,B.CoCode,C.BankDeposit,C.BankCardNo from Finance_Invoice A '); - sql.add(' left join BS_Company B on A.SupplierNo = B.CoCode '); SQL.Add(' LEFT JOIN ('); SQL.Add(' SELECT *, ROW_NUMBER() OVER (PARTITION BY GSTT ORDER BY (SELECT NULL)) AS rn'); @@ -262,18 +276,22 @@ begin sql.add(' where isnull(A.Status,''0'')=''9'' '); - if cxTabControl1.TabIndex = 1 then - begin - sql.Add(' and A.ivdate>=''' + FormatDateTime('yyyy-MM-dd', begdate.Date) + ''' '); - sql.Add(' and A.ivdate<''' + FormatDateTime('yyyy-MM-dd', Enddate.Date + 1) + ''' '); - end; + sql.Add(' and A.ivdate>=''' + FormatDateTime('yyyy-MM-dd', begdate.Date) + ''' '); + sql.Add(' and A.ivdate<''' + FormatDateTime('yyyy-MM-dd', Enddate.Date + 1) + ''' '); + if cxTabControl1.TabIndex = 0 then begin - sql.add(' and not exists (select 1 from Finance_Flow X where X.IVID = A.IVID) '); + sql.add(' and not exists (select 1 from Finance_Flow X where CHARINDEX('','' + A.IVID + '','', '','' + X.IVID + '','') > 0) '); end; if cxTabControl1.TabIndex = 1 then begin - sql.add(' and exists (select 1 from Finance_Flow X where X.IVID = A.IVID) '); + sql.add(' and exists (select 1 from Finance_Flow X where CHARINDEX('','' + A.IVID + '','', '','' + X.IVID + '','') > 0) '); + end; + + filterStr := SGetFilters(Panel1, 1, 2); + if filterStr <> '' then + begin + sql.add(' and ' + filterStr); end; open; @@ -826,6 +844,7 @@ end; procedure TfrmInvoiceSel.ToolButton6Click(Sender: TObject); begin + toolbar1.SetFocus; initGrid(); end; diff --git a/A09财务通用管理/U_PayInput.dfm b/A09财务通用管理/U_PayInput.dfm index 0d4c1f4..5c72275 100644 --- a/A09财务通用管理/U_PayInput.dfm +++ b/A09财务通用管理/U_PayInput.dfm @@ -34,7 +34,6 @@ object frmPayInput: TfrmPayInput ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 784 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -66,9 +65,6 @@ object frmPayInput: TfrmPayInput ParentColor = False ParentCtl3D = False TabOrder = 1 - ExplicitTop = 36 - ExplicitWidth = 1180 - ExplicitHeight = 553 object Label7: TLabel Left = 62 Top = 238 diff --git a/A09财务通用管理/U_PayInput.pas b/A09财务通用管理/U_PayInput.pas index cbb9114..32fa561 100644 --- a/A09财务通用管理/U_PayInput.pas +++ b/A09财务通用管理/U_PayInput.pas @@ -14,7 +14,7 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, - cxCurrencyEdit, dxSkinsCore, dxSkinsDefaultPainters; + cxCurrencyEdit, dxSkinsCore, dxSkinsDefaultPainters, dxCoreGraphics, dxSkinWXI; type TfrmPayInput = class(TForm) diff --git a/A09财务通用管理/U_PayableList.dfm b/A09财务通用管理/U_PayableList.dfm index 66b57b2..728a792 100644 --- a/A09财务通用管理/U_PayableList.dfm +++ b/A09财务通用管理/U_PayableList.dfm @@ -271,8 +271,6 @@ inherited frmPayableList: TfrmPayableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitLeft = 102 - ExplicitTop = 119 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_PayableList.pas b/A09财务通用管理/U_PayableList.pas index b26399d..9ff35fd 100644 --- a/A09财务通用管理/U_PayableList.pas +++ b/A09财务通用管理/U_PayableList.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, cxContainer, dxCore, cxDateUtils, dxSkinsCore, - dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar; + dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar, dxSkinWXI; type TfrmPayableList = class(TfrmBaseList) diff --git a/A09财务通用管理/U_SingleCustStatement.pas b/A09财务通用管理/U_SingleCustStatement.pas index 821f402..d6ed229 100644 --- a/A09财务通用管理/U_SingleCustStatement.pas +++ b/A09财务通用管理/U_SingleCustStatement.pas @@ -101,7 +101,7 @@ begin Close; SQL.Clear; Filtered := False; - sql.Add(' exec P_Fin_CustStatementSingle '); + sql.Add(' exec P_Fin_CustStatementSingle_New '); sql.Add(' @Begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime)))); sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1)))); sql.Add(' ,@OppCoNo=' + QuotedStr(Trim(FOppCoNo))); diff --git a/A09财务通用管理/testDll.identcache b/A09财务通用管理/testDll.identcache index 44ef6f3..b1e7871 100644 Binary files a/A09财务通用管理/testDll.identcache and b/A09财务通用管理/testDll.identcache differ