diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj index 70661b4..4740156 100644 --- a/A09财务通用管理/Financial.dproj +++ b/A09财务通用管理/Financial.dproj @@ -80,7 +80,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A09财务通用管理\testDll.exe + D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\testDll.exe diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index b20887a..50dae36 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -1,64 +1,64 @@  - 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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.292,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_FinPurchasePlanSel.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.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm - 1899-12-30 00:00:00.000.895,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutList.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.630,=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.987,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableInput.pas - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 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.885,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ExpenseList.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.052,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CollectList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.765,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowTotalList.pas - 1899-12-30 00:00:00.000.381,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableInput.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.659,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatement.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.912,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayList.pas - 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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 - 2026-05-15 11:04:20.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.pas - 2026-05-15 11:04:20.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm + 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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.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.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas + 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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.885,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ExpenseList.pas + 1899/12/30 00:00:00.000.772,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas + 1899/12/30 00:00:00.000.806,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.052,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CollectList.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.446,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowList.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.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.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas + 1899/12/30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.453,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayInput.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.595,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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 @@ -77,7 +77,7 @@ - + diff --git a/A09财务通用管理/U_DataLink.dfm b/A09财务通用管理/U_DataLink.dfm index 4949260..ac2490a 100644 --- a/A09财务通用管理/U_DataLink.dfm +++ b/A09财务通用管理/U_DataLink.dfm @@ -8,6 +8,7 @@ inherited DataLink_Financial: TDataLink_Financial StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + StyleReadOnly.LookAndFeel.SkinName = '' PixelsPerInch = 96 end inherited cxImageList_bar: TcxImageList diff --git a/A09财务通用管理/U_DataLink.pas b/A09财务通用管理/U_DataLink.pas index 2f27d0e..d03ba17 100644 --- a/A09财务通用管理/U_DataLink.pas +++ b/A09财务通用管理/U_DataLink.pas @@ -7,7 +7,8 @@ uses Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, System.ImageList, U_BaseDataLink, cxImageList, cxGraphics, cxEdit, cxContainer, dxSkinsForm, dxSkinsCore, - dxSkinsDefaultPainters, dxCore, cxLocalization, dxLayoutLookAndFeels; + dxSkinsDefaultPainters, dxCore, cxLocalization, dxLayoutLookAndFeels, + dxSkinWXI; type TMyThread = class(TThread) diff --git a/A09财务通用管理/U_ExpenseInput.pas b/A09财务通用管理/U_ExpenseInput.pas index 4b16035..234e244 100644 --- a/A09财务通用管理/U_ExpenseInput.pas +++ b/A09财务通用管理/U_ExpenseInput.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinsCore, dxSkinsDefaultPainters, dxCore, cxDateUtils, - dxScrollbarAnnotations, Vcl.Menus, Clipbrd; + dxScrollbarAnnotations, Vcl.Menus, Clipbrd, dxCoreGraphics, dxSkinWXI; type TfrmExpenseInput = class(TForm) @@ -113,6 +113,8 @@ uses {$R *.dfm} procedure TfrmExpenseInput.InitGrid(); +var + nAmount: Double; begin try @@ -128,7 +130,11 @@ begin if not ADOQueryMain.IsEmpty then begin SCSHData(ADOQueryMain, ScrollBox1, 2); - + if ADOQueryMain.FieldByName('Amount').AsString <> '' then + begin + nAmount := ADOQueryMain.FieldByName('Amount').AsFloat; + Amount.Text := FormatFloat('#,##0', nAmount); + end; end else begin @@ -416,6 +422,9 @@ begin end; procedure TfrmExpenseInput.cxButtonEdit1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +var + CurrentAmount: Double; + TaxAmount: Double; begin try frmInvoiceSel := TfrmInvoiceSel.Create(Application); @@ -434,17 +443,21 @@ begin with frmInvoiceSel.CDS_Invoice do begin + CurrentAmount := StrToFloatDef(StringReplace(Self.Amount.Text, ',', '', [rfReplaceAll]), 0); + TaxAmount := FieldByName('TaxAmount').AsFloat; if Self.IVNo.Text = '' then begin Self.IVNo.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString; Self.IVNo.Properties.LookupItems.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString; - Self.Amount.Text := frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').AsString; + Self.Amount.Text := FormatFloat('#,##0', TaxAmount); +// Self.Amount.Text := frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').AsString; end else begin Self.IVNo.Text := Trim(Self.IVNo.Text) + ',' + Trim(frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString); Self.IVNo.Properties.LookupItems.Text := trim(Self.IVNo.Properties.LookupItems.Text) + ',' + Trim(frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString); - Self.Amount.Text := FloatToStr(strtofloatdef(Self.Amount.Text, 0) + frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').asfloat); + Self.Amount.Text := FormatFloat('#,##0', CurrentAmount + TaxAmount); +// Self.Amount.Text := FloatToStr(strtofloatdef(Self.Amount.Text, 0) + frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').asfloat); end; Self.OppCoName.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString; @@ -506,6 +519,7 @@ end; function TfrmExpenseInput.SaveData(): Boolean; var MaxId, MaxSubId, FCoCode, FCCID: string; + CleanAmount: string; begin try ADOQueryCmd.Connection.BeginTrans; @@ -520,6 +534,7 @@ begin end; FFID.Text := MaxId; + CleanAmount := StringReplace(Amount.Text, ',', '', [rfReplaceAll]); with ADOQueryCmd do begin @@ -557,6 +572,8 @@ begin // FieldByName('FFID').Value := Trim(MaxId); FieldByName('OppCoNo').Value := trim(OppCoName.Properties.LookupItems.Text); FieldByName('IVID').Value := trim(IVNO.Properties.LookupItems.Text); + if CleanAmount <> '' then + FieldByName('Amount').AsFloat := StrToFloatDef(CleanAmount, 0); RTSetsavedata(ADOQueryCmd, 'Finance_Flow', ScrollBox1, 2); Post; diff --git a/A09财务通用管理/U_ExpenseList.pas b/A09财务通用管理/U_ExpenseList.pas index b554528..ee62104 100644 --- a/A09财务通用管理/U_ExpenseList.pas +++ b/A09财务通用管理/U_ExpenseList.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 TfrmExpenseList = class(TfrmBaseList) @@ -152,6 +152,7 @@ begin if Trim(FAuthority) = '' then begin btnAdd.Enabled := true; + TbFP.Enabled := true; cxTabControl1.Tabs[2].Visible := False; cxTabControl1.Tabs[3].Visible := False; // cxTabControl1.Tabs[0].caption := 'aa'; @@ -161,7 +162,7 @@ begin btnEdit.Enabled := true; btnDel.Enabled := true; btnChk.Enabled := true; - TbFP.Enabled := true; +// TbFP.Enabled := true; end; 1: begin @@ -183,6 +184,7 @@ begin if Trim(FAuthority) = '2' then begin btnAdd.Enabled := true; + TbFP.Enabled := true; cxTabControl1.Tabs[0].Visible := False; cxTabControl1.Tabs[3].Visible := False; case cxTabControl1.TabIndex of @@ -191,7 +193,7 @@ begin btnEdit.Enabled := true; btnDel.Enabled := true; // btnChk.Enabled := true; - TbFP.Enabled := true; +// TbFP.Enabled := true; end; 1: begin @@ -216,13 +218,14 @@ begin cxTabControl1.Tabs[1].Visible := False; cxTabControl1.Tabs[2].caption := 'δ'; btnAdd.Enabled := true; + TbFP.Enabled := true; case cxTabControl1.TabIndex of 0: begin btnEdit.Enabled := true; btnDel.Enabled := true; - TbFP.Enabled := true; +// TbFP.Enabled := true; // btnChk.Enabled := true; end; 1: @@ -377,12 +380,12 @@ begin self.ADOQueryCmd.Edit; self.ADOQueryCmd.FieldByName('IVNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString; self.ADOQueryCmd.FieldByName('IVID').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString; - self.ADOQueryCmd.FieldByName('OppCoName').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString; - self.ADOQueryCmd.FieldByName('OppCoNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString; - self.ADOQueryCmd.FieldByName('oppShuiNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('SupplierShuiNo').AsString; - self.ADOQueryCmd.FieldByName('Amount').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Amount').AsString; - self.ADOQueryCmd.FieldByName('OppBankName').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('BankName').AsString; - self.ADOQueryCmd.FieldByName('OppBankCardNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('BankNo').AsString; +// self.ADOQueryCmd.FieldByName('OppCoName').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString; +// self.ADOQueryCmd.FieldByName('OppCoNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString; +// self.ADOQueryCmd.FieldByName('oppShuiNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('SupplierShuiNo').AsString; +// self.ADOQueryCmd.FieldByName('Amount').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('Amount').AsString; +// self.ADOQueryCmd.FieldByName('OppBankName').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('BankName').AsString; +// self.ADOQueryCmd.FieldByName('OppBankCardNo').AsString := frmInvoiceSel.CDS_Invoice.FieldByName('BankNo').AsString; self.ADOQueryCmd.Post; end; @@ -403,6 +406,10 @@ var btnOK, btnCancel: TButton; lblDate, lblBankSlip: TLabel; BankSlipCode: string; + + cxOurBankName, cxOurBankCardNo: TcxTextEdit; + lblOurBankName, lblOurBankCardNo: TLabel; + OurBankName, OurBankCardNo: string; begin if CDS_1.IsEmpty then exit; @@ -413,12 +420,30 @@ begin Exit; end; + OurBankName := ''; + OurBankCardNo := ''; + with CDS_1 do + begin + First; + while not Eof do + begin + if FieldByName('SSel').AsBoolean then + begin + if OurBankName = '' then + OurBankName := Trim(FieldByName('OurBankName').AsString); + if OurBankCardNo = '' then + OurBankCardNo := Trim(FieldByName('OurBankCardNo').AsString); + end; + Next; + end; + end; + // һ DateForm := TForm.Create(nil); try DateForm.Caption := 'Ϣ'; DateForm.Width := 350; - DateForm.Height := 200; + DateForm.Height := 260; DateForm.Position := poScreenCenter; DateForm.BorderStyle := bsDialog; DateForm.BorderIcons := [biSystemMenu]; @@ -443,18 +468,46 @@ begin cxDateEdit.Top := 18; cxDateEdit.Width := 200; + lblOurBankName := TLabel.Create(DateForm); + lblOurBankName.Parent := DateForm; + lblOurBankName.Caption := '˺:'; + lblOurBankName.Left := 20; + lblOurBankName.Top := 63; + + cxOurBankName := TcxTextEdit.Create(DateForm); + cxOurBankName.Parent := DateForm; + cxOurBankName.Left := 120; + cxOurBankName.Top := 58; + cxOurBankName.Width := 200; + cxOurBankName.Text := OurBankName; + // ====== ====== + + // ====== ====== + lblOurBankCardNo := TLabel.Create(DateForm); + lblOurBankCardNo.Parent := DateForm; + lblOurBankCardNo.Caption := ':'; + lblOurBankCardNo.Left := 20; + lblOurBankCardNo.Top := 103; + + cxOurBankCardNo := TcxTextEdit.Create(DateForm); + cxOurBankCardNo.Parent := DateForm; + cxOurBankCardNo.Left := 120; + cxOurBankCardNo.Top := 98; + cxOurBankCardNo.Width := 200; + cxOurBankCardNo.Text := OurBankCardNo; + // ˮǩ lblBankSlip := TLabel.Create(DateForm); lblBankSlip.Parent := DateForm; lblBankSlip.Caption := 'ˮ:'; lblBankSlip.Left := 20; - lblBankSlip.Top := 63; + lblBankSlip.Top := 143; // cxTextEdit ˮ cxTextEdit := TcxTextEdit.Create(DateForm); cxTextEdit.Parent := DateForm; cxTextEdit.Left := 120; - cxTextEdit.Top := 58; + cxTextEdit.Top := 138; cxTextEdit.Width := 200; cxTextEdit.Text := ''; @@ -464,7 +517,7 @@ begin btnOK.Caption := 'ȷ'; btnOK.ModalResult := mrOK; btnOK.Left := 80; - btnOK.Top := 110; + btnOK.Top := 180; btnOK.Width := 80; btnOK.Default := True; @@ -474,7 +527,7 @@ begin btnCancel.Caption := 'ȡ'; btnCancel.ModalResult := mrCancel; btnCancel.Left := 180; - btnCancel.Top := 110; + btnCancel.Top := 180; btnCancel.Width := 80; btnCancel.Cancel := True; @@ -485,6 +538,9 @@ begin SelectedDate := Trunc(cxDateEdit.Date); // ȡڲ BankSlipCode := Trim(cxTextEdit.Text); + OurBankName := Trim(cxOurBankName.Text); + OurBankCardNo := Trim(cxOurBankCardNo.Text); + // ֤ if BankSlipCode = '' then begin @@ -541,6 +597,9 @@ begin sql.Add(',@PayTime=' + QuotedStr(FormatDateTime('yyyy-mm-dd', SelectedDate))); // ˮ - Ҫ޸Ĵ洢 sql.Add(',@BankSlipNumber=' + QuotedStr(BankSlipCode)); + + sql.Add(',@OurBankName=' + QuotedStr(OurBankName)); + sql.Add(',@OurBankCardNo=' + QuotedStr(OurBankCardNo)); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); open; diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index b33bed1..a8c7299 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -78,8 +78,8 @@ begin 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 := '2'; +// Parameters1 := ''; end else begin diff --git a/A09财务通用管理/U_InvoiceSel.dfm b/A09财务通用管理/U_InvoiceSel.dfm index 62ade22..fb0216b 100644 --- a/A09财务通用管理/U_InvoiceSel.dfm +++ b/A09财务通用管理/U_InvoiceSel.dfm @@ -249,8 +249,9 @@ object frmInvoiceSel: TfrmInvoiceSel Caption = #21333#20215 DataBinding.FieldName = 'Price' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DecimalPlaces = 0 + Properties.DisplayFormat = '#,##0' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 93 @@ -259,8 +260,9 @@ object frmInvoiceSel: TfrmInvoiceSel Caption = #24635#37329#39069#26410#21547#31246 DataBinding.FieldName = 'Amount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv1AmountPropertiesEditValueChanged + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DecimalPlaces = 0 + Properties.DisplayFormat = '#,##0' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 111 @@ -269,13 +271,9 @@ object frmInvoiceSel: TfrmInvoiceSel Caption = #31246#37329 DataBinding.FieldName = 'TaxFee' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnEditValueChanged = Tv1AmountPropertiesEditValueChanged + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DecimalPlaces = 0 + Properties.DisplayFormat = '#,##0' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 65 @@ -284,8 +282,9 @@ object frmInvoiceSel: TfrmInvoiceSel Caption = #24635#37329#39069#24050#21547#31246 DataBinding.FieldName = 'TaxAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DecimalPlaces = 0 + Properties.DisplayFormat = '#,##0' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 114 diff --git a/A09财务通用管理/U_InvoiceSel.pas b/A09财务通用管理/U_InvoiceSel.pas index 332d1fa..818f2f4 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; + cxMaskEdit, dxSkinWXI, cxCurrencyEdit; type TfrmInvoiceSel = class(TForm) diff --git a/A09财务通用管理/U_PayList.dfm b/A09财务通用管理/U_PayList.dfm index 9d1ecb9..d445722 100644 --- a/A09财务通用管理/U_PayList.dfm +++ b/A09财务通用管理/U_PayList.dfm @@ -160,7 +160,6 @@ inherited frmPayList: TfrmPayList Color = clWhite ParentBackground = False TabOrder = 5 - ExplicitTop = 24 object Label3: TLabel Left = 252 Top = 8 @@ -534,7 +533,6 @@ inherited frmPayList: TfrmPayList #20840#37096) LookAndFeel.Kind = lfUltraFlat OnChange = cxTabControl1Change - ExplicitTop = 95 ClientRectRight = 0 ClientRectTop = 0 end diff --git a/A09财务通用管理/U_PayList.pas b/A09财务通用管理/U_PayList.pas index 5860ed4..825d158 100644 --- a/A09财务通用管理/U_PayList.pas +++ b/A09财务通用管理/U_PayList.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 TfrmPayList = class(TfrmBaseList) diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index 45080f8..cd2de54 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -19,7 +19,7 @@ inherited frmReceivableList: TfrmReceivableList Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_Financial.cxImageList_bar @@ -37,7 +37,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = TBRafreshClick end object btnAdd: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #26032#22686 @@ -45,7 +45,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = btnAddClick end object ToolButton6: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #25209#37327#26032#22686 @@ -53,7 +53,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton6Click end object btnEdit: TToolButton - Left = 213 + Left = 245 Top = 0 AutoSize = True Caption = #20462#25913 @@ -61,7 +61,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = btnEditClick end object ToolButton1: TToolButton - Left = 276 + Left = 316 Top = 0 AutoSize = True Caption = #21333#20215#20462#25913 @@ -69,7 +69,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton1Click end object btnDel: TToolButton - Left = 363 + Left = 419 Top = 0 AutoSize = True Caption = #21024#38500 @@ -77,7 +77,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = btnDelClick end object btnChk: TToolButton - Left = 426 + Left = 490 Top = 0 AutoSize = True Caption = #23457#26680 @@ -85,7 +85,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = btnChkClick end object btnReChk: TToolButton - Left = 489 + Left = 561 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -93,7 +93,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = btnReChkClick end object ToolButton2: TToolButton - Left = 576 + Left = 664 Top = 0 AutoSize = True Caption = #23548#20837 @@ -101,7 +101,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton2Click end object ToolButton4: TToolButton - Left = 639 + Left = 735 Top = 0 AutoSize = True Caption = #23548#20986 @@ -109,7 +109,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton4Click end object ToolButton3: TToolButton - Left = 702 + Left = 806 Top = 0 AutoSize = True Caption = #38468#20214 @@ -117,7 +117,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton3Click end object ToolButton5: TToolButton - Left = 765 + Left = 877 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -125,7 +125,7 @@ inherited frmReceivableList: TfrmReceivableList OnClick = ToolButton5Click end object TBClose: TToolButton - Left = 852 + Left = 980 Top = 0 AutoSize = True Caption = #20851#38381 @@ -299,8 +299,6 @@ inherited frmReceivableList: TfrmReceivableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 5 - ExplicitLeft = -107 - ExplicitTop = 147 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 7ffee63..1edae39 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.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 TfrmReceivableList = class(TfrmBaseList) diff --git a/A09财务通用管理/testDll.res b/A09财务通用管理/testDll.res index 2465ca0..e116c48 100644 Binary files a/A09财务通用管理/testDll.res and b/A09财务通用管理/testDll.res differ