diff --git a/A09财务通用管理/Financial.dpr b/A09财务通用管理/Financial.dpr
index c79cb74..5b454b8 100644
--- a/A09财务通用管理/Financial.dpr
+++ b/A09财务通用管理/Financial.dpr
@@ -50,7 +50,8 @@ uses
U_GETableBatchInput in 'U_GETableBatchInput.pas' {frmGetableBatchInput},
U_FinPurchasePlanSel in 'U_FinPurchasePlanSel.pas' {frmFinPurchasePlanSel},
U_CollectInput2 in 'U_CollectInput2.pas' {frmCollectInput2},
- U_InvoiceOutSel in 'U_InvoiceOutSel.pas' {frmInvoiceOutSel};
+ U_InvoiceOutSel in 'U_InvoiceOutSel.pas' {frmInvoiceOutSel},
+ U_CollectImport in 'U_CollectImport.pas' {frmCollectImport};
{$R *.res}
diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj
index d4682f6..7863847 100644
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@@ -233,6 +233,10 @@
dfm
+
+
+ dfm
+
Cfg_2
Base
diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local
index 8cf80eb..75ea5d0 100644
--- a/A09财务通用管理/Financial.dproj.local
+++ b/A09财务通用管理/Financial.dproj.local
@@ -1,70 +1,75 @@
- 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.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.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.pas
- 1899/12/30 00:00:00.000.895,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutList.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.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.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.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.446,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowList.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.052,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CollectList.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.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.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.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.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
- 1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas
+ 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.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.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.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm
- 1899/12/30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas
- 1899/12/30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.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.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
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.dfm=D:\D10V1W\项目代码\D10SZKaiXiYa\A09财务通用管理\U_ExpenseInput.dfm
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 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.pas=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
@@ -153,5 +158,7 @@
+
+
diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache
index cc2bb96..1de30c6 100644
Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ
diff --git a/A09财务通用管理/U_CollectImport.dfm b/A09财务通用管理/U_CollectImport.dfm
index f954532..9001f5f 100644
--- a/A09财务通用管理/U_CollectImport.dfm
+++ b/A09财务通用管理/U_CollectImport.dfm
@@ -83,6 +83,7 @@ object frmCollectImport: TfrmCollectImport
Navigator.Buttons.CustomButtons = <>
Navigator.Buttons.Delete.Enabled = False
Navigator.Buttons.Delete.Visible = False
+ ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DS_1
DataController.Filter.AutoDataSetFilter = True
DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -114,14 +115,10 @@ object frmCollectImport: TfrmCollectImport
OptionsData.DeletingConfirmation = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
- Styles.IncSearch = DataLink_Financial.SHuangSe
- Styles.Footer = DataLink_Financial.Default
- Styles.Header = DataLink_Financial.Default
- Styles.Inactive = DataLink_Financial.SHuangSe
- Styles.Selection = DataLink_Financial.SHuangSe
object v2CRTime: TcxGridDBColumn
Caption = #26085#26399
DataBinding.FieldName = 'FFTime'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxDateEditProperties'
Properties.SaveTime = False
Properties.ShowTime = False
@@ -132,6 +129,7 @@ object frmCollectImport: TfrmCollectImport
object v2Column2: TcxGridDBColumn
Caption = #25105#26041#21333#20301
DataBinding.FieldName = 'OurCoName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -139,6 +137,7 @@ object frmCollectImport: TfrmCollectImport
object v2FactoryName: TcxGridDBColumn
Caption = #23545#26041#21333#20301
DataBinding.FieldName = 'OppCoName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -146,6 +145,7 @@ object frmCollectImport: TfrmCollectImport
object v2OrderNo: TcxGridDBColumn
Caption = #19978#32423#21333#20301
DataBinding.FieldName = 'OppParentCoName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -153,6 +153,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column1: TcxGridDBColumn
Caption = #25105#26041#36134#25143
DataBinding.FieldName = 'OurBankName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -160,6 +161,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column2: TcxGridDBColumn
Caption = #23545#26041#36134#25143
DataBinding.FieldName = 'OppBankName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -167,6 +169,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column3: TcxGridDBColumn
Caption = #20184#27454#26041#24335
DataBinding.FieldName = 'PayMent'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -174,6 +177,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column19: TcxGridDBColumn
Caption = #21512#21516#21495
DataBinding.FieldName = 'ConNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -181,6 +185,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column20: TcxGridDBColumn
Caption = #35745#21010#21333#21495
DataBinding.FieldName = 'OrderNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -188,12 +193,14 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column21: TcxGridDBColumn
Caption = #23458#25143#21333#21495
DataBinding.FieldName = 'BuyConNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 66
end
object Tv1Column4: TcxGridDBColumn
Caption = #25688#35201
DataBinding.FieldName = 'FFAbstract'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -201,6 +208,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column17: TcxGridDBColumn
Caption = #37329#39069
DataBinding.FieldName = 'Amount'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -208,6 +216,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column18: TcxGridDBColumn
Caption = #24065#31181
DataBinding.FieldName = 'Currency'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
@@ -215,6 +224,7 @@ object frmCollectImport: TfrmCollectImport
object Tv1Column6: TcxGridDBColumn
Caption = #22791#27880
DataBinding.FieldName = 'Note'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 66
diff --git a/A09财务通用管理/U_CollectImport.pas b/A09财务通用管理/U_CollectImport.pas
index 685c891..f8cd1ab 100644
--- a/A09财务通用管理/U_CollectImport.pas
+++ b/A09财务通用管理/U_CollectImport.pas
@@ -10,7 +10,8 @@ uses
cxGridDBTableView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB,
DBClient, ExtCtrls, StdCtrls, BtnEdit, cxButtonEdit, cxTextEdit,
cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar,
- dxDateRanges, dxBarBuiltInMenu, ComObj;
+ dxDateRanges, dxBarBuiltInMenu, ComObj, dxSkinsCore, dxSkinWXI,
+ dxScrollbarAnnotations;
type
TfrmCollectImport = class(TForm)
diff --git a/A09财务通用管理/U_CollectInput2.dfm b/A09财务通用管理/U_CollectInput2.dfm
index df9d9a1..62c1e47 100644
--- a/A09财务通用管理/U_CollectInput2.dfm
+++ b/A09财务通用管理/U_CollectInput2.dfm
@@ -2,7 +2,7 @@ object frmCollectInput2: TfrmCollectInput2
Left = 261
Top = 149
Caption = #25910#27454#30331#35760
- ClientHeight = 416
+ ClientHeight = 437
ClientWidth = 884
Color = clWhite
Font.Charset = GB2312_CHARSET
@@ -34,7 +34,6 @@ object frmCollectInput2: TfrmCollectInput2
ParentColor = False
ShowCaptions = True
TabOrder = 0
- ExplicitWidth = 1194
object ToolButton3: TToolButton
Left = 0
Top = 0
@@ -56,7 +55,7 @@ object frmCollectInput2: TfrmCollectInput2
Left = 0
Top = 38
Width = 884
- Height = 378
+ Height = 399
Align = alClient
BevelInner = bvNone
BevelOuter = bvNone
@@ -67,9 +66,7 @@ object frmCollectInput2: TfrmCollectInput2
ParentCtl3D = False
TabOrder = 1
OnClick = ScrollBox1Click
- ExplicitLeft = -8
- ExplicitTop = -42
- ExplicitHeight = 538
+ ExplicitHeight = 378
object Label7: TLabel
Left = 84
Top = 276
@@ -217,10 +214,6 @@ object frmCollectInput2: TfrmCollectInput2
Height = 127
Align = alClient
TabOrder = 0
- ExplicitLeft = -7
- ExplicitTop = -47
- ExplicitWidth = 327
- ExplicitHeight = 199
object Tv1: TcxGridDBTableView
OnDblClick = Tv1DblClick
Navigator.Buttons.CustomButtons = <>
@@ -306,6 +299,7 @@ object frmCollectInput2: TfrmCollectInput2
Kind = bkEllipsis
end>
TabOrder = 12
+ Text = 'DESHINE VIETNAM CO., LTD'
Visible = False
Width = 200
end
diff --git a/A09财务通用管理/U_CollectInput2.pas b/A09财务通用管理/U_CollectInput2.pas
index aa91727..190130d 100644
--- a/A09财务通用管理/U_CollectInput2.pas
+++ b/A09财务通用管理/U_CollectInput2.pas
@@ -381,6 +381,9 @@ begin
FieldByName('Filltime').Value := SGetServerDateTime(ADOQueryTemp);
FieldByName('FFFlag').Value := 'Ӧ';
FieldByName('FFType').Value := 'տǼ';
+ FieldByName('ourShuiNo').Value := '1102083046';
+// FieldByName('OurCoName').Value := 'DESHINE VIETNAM CO., LTD';
+ FieldByName('OurCoNo').Value := 'W0001';
FieldByName('status').Value := '0';
FieldByName('FFQtyFlag').Value := -1;
end
diff --git a/A09财务通用管理/U_CollectList.dfm b/A09财务通用管理/U_CollectList.dfm
index bceac4d..9bfa200 100644
--- a/A09财务通用管理/U_CollectList.dfm
+++ b/A09财务通用管理/U_CollectList.dfm
@@ -19,7 +19,7 @@ inherited frmCollectList: TfrmCollectList
Height = 30
AutoSize = True
ButtonHeight = 30
- ButtonWidth = 83
+ ButtonWidth = 99
Caption = 'ToolBar1'
Color = clSkyBlue
DisabledImages = DataLink_Financial.cxImageList_bar
@@ -37,7 +37,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = TBRafreshClick
end
object btnAdd: TToolButton
- Left = 63
+ Left = 71
Top = 0
AutoSize = True
Caption = #26032#22686
@@ -45,7 +45,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = btnAddClick
end
object btnEdit: TToolButton
- Left = 126
+ Left = 142
Top = 0
AutoSize = True
Caption = #20462#25913
@@ -53,7 +53,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = btnEditClick
end
object btnDel: TToolButton
- Left = 189
+ Left = 213
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -61,7 +61,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = btnDelClick
end
object btnChk: TToolButton
- Left = 252
+ Left = 284
Top = 0
AutoSize = True
Caption = #23457#26680
@@ -69,7 +69,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = btnChkClick
end
object btnReChk: TToolButton
- Left = 315
+ Left = 355
Top = 0
AutoSize = True
Caption = #25764#38144#23457#26680
@@ -77,7 +77,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = btnReChkClick
end
object ToolButton7: TToolButton
- Left = 402
+ Left = 458
Top = 0
AutoSize = True
Caption = #26680#38144
@@ -86,7 +86,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton7Click
end
object ToolButton8: TToolButton
- Left = 465
+ Left = 529
Top = 0
AutoSize = True
Caption = #26680#38144#26085#24535
@@ -95,7 +95,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton8Click
end
object TBInvoice: TToolButton
- Left = 552
+ Left = 632
Top = 0
AutoSize = True
Caption = #20851#32852#21457#31080
@@ -103,7 +103,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = TBInvoiceClick
end
object ToolButton1: TToolButton
- Left = 639
+ Left = 735
Top = 0
AutoSize = True
Caption = #23548#20837
@@ -111,7 +111,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton1Click
end
object ToolButton4: TToolButton
- Left = 702
+ Left = 806
Top = 0
AutoSize = True
Caption = #23548#20986
@@ -119,7 +119,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton4Click
end
object ToolButton9: TToolButton
- Left = 765
+ Left = 877
Top = 0
AutoSize = True
Caption = #38468#20214
@@ -127,7 +127,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton9Click
end
object ToolButton5: TToolButton
- Left = 828
+ Left = 948
Top = 0
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -135,7 +135,7 @@ inherited frmCollectList: TfrmCollectList
OnClick = ToolButton5Click
end
object TBClose: TToolButton
- Left = 915
+ Left = 1051
Top = 0
AutoSize = True
Caption = #20851#38381
@@ -308,14 +308,13 @@ inherited frmCollectList: TfrmCollectList
end
item
Kind = skSum
- Column = Tv1Column17
+ Column = Tv1Amount
end
item
Kind = skSum
end
item
Kind = skSum
- Column = Tv1Column5
end>
DataController.Summary.SummaryGroups = <>
OptionsBehavior.GoToNextCellOnEnter = True
@@ -324,16 +323,16 @@ inherited frmCollectList: TfrmCollectList
OptionsData.DeletingConfirmation = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
- object Tv1Column22: TcxGridDBColumn
+ object Tv1SSel: TcxGridDBColumn
Caption = #36873#25321
DataBinding.FieldName = 'SSel'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxCheckBoxProperties'
Properties.ImmediatePost = True
HeaderAlignmentHorz = taCenter
- Width = 44
+ Width = 66
end
- object v2CRTime: TcxGridDBColumn
+ object Tv1FFTime: TcxGridDBColumn
Tag = 7
Caption = #26085#26399
DataBinding.FieldName = 'FFTime'
@@ -343,127 +342,96 @@ inherited frmCollectList: TfrmCollectList
Properties.ShowTime = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 120
end
- object v2Column2: TcxGridDBColumn
+ object Tv1ourShuiNo: TcxGridDBColumn
+ Caption = #25105#26041#31246#21495
+ DataBinding.FieldName = 'ourShuiNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 120
+ end
+ object Tv1OurCoName: TcxGridDBColumn
Caption = #25105#26041#21333#20301
DataBinding.FieldName = 'OurCoName'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 78
+ Width = 120
end
- object v2FactoryName: TcxGridDBColumn
+ object Tv1oppShuiNo: TcxGridDBColumn
+ Caption = #23545#26041#31246#21495
+ DataBinding.FieldName = 'oppShuiNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 120
+ end
+ object Tv1OppCoName: TcxGridDBColumn
Caption = #23545#26041#21333#20301
DataBinding.FieldName = 'OppCoName'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 73
+ Width = 120
end
- object v2OrderNo: TcxGridDBColumn
- Tag = 7
- Caption = #19978#32423#21333#20301
- DataBinding.FieldName = 'OppParentCoName'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 84
- end
- object Tv1Column1: TcxGridDBColumn
- Caption = #25105#26041#36134#25143
+ object Tv1OurBankName: TcxGridDBColumn
+ Caption = #25910#27454#38134#34892
DataBinding.FieldName = 'OurBankName'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 92
+ Width = 120
end
- object Tv1Column2: TcxGridDBColumn
- Caption = #23545#26041#36134#25143
- DataBinding.FieldName = 'OppBankName'
+ object Tv1OurBankCardNo: TcxGridDBColumn
+ Caption = #25910#27454#36134#25143
+ DataBinding.FieldName = 'OurBankCardNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 96
+ Width = 120
end
- object Tv1Column3: TcxGridDBColumn
- Caption = #20184#27454#26041#24335
- DataBinding.FieldName = 'PayMent'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 69
- end
- object Tv1Column19: TcxGridDBColumn
- Caption = #21512#21516#21495
- DataBinding.FieldName = 'ConNo'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column20: TcxGridDBColumn
- Caption = #35745#21010#21333#21495
- DataBinding.FieldName = 'OrderNo'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 75
- end
- object Tv1Column21: TcxGridDBColumn
- Caption = #23458#25143#21333#21495
- DataBinding.FieldName = 'BuyConNo'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Width = 74
- end
- object Tv1Column4: TcxGridDBColumn
- Caption = #25688#35201
- DataBinding.FieldName = 'FFAbstract'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 72
- end
- object Tv1Column17: TcxGridDBColumn
- Caption = #37329#39069
+ object Tv1Amount: TcxGridDBColumn
+ Caption = #25910#27454#37329#39069
DataBinding.FieldName = 'Amount'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 120
end
- object Tv1Column18: TcxGridDBColumn
+ object Tv1Currency: TcxGridDBColumn
Caption = #24065#31181
DataBinding.FieldName = 'Currency'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 120
end
- object Tv1Column5: TcxGridDBColumn
- Caption = #26680#38144#37329#39069
- DataBinding.FieldName = 'FFWoAmount'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- end
- object Tv1Column6: TcxGridDBColumn
- Caption = #22791#27880
+ object Tv1Note: TcxGridDBColumn
+ Caption = #20132#26131#38468#35328
DataBinding.FieldName = 'Note'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 89
+ Width = 120
end
- object Tv1Column7: TcxGridDBColumn
+ object Tv1FJFlag: TcxGridDBColumn
Caption = #38468#20214
DataBinding.FieldName = 'FJFlag'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxCheckBoxProperties'
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 51
+ Width = 120
+ end
+ object Tv1IVNo: TcxGridDBColumn
+ Caption = #21457#31080#21495
+ DataBinding.FieldName = 'IVNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 120
end
end
object cxGridLevel1: TcxGridLevel
diff --git a/A09财务通用管理/U_CollectList.pas b/A09财务通用管理/U_CollectList.pas
index 9e5d9dd..707aced 100644
--- a/A09财务通用管理/U_CollectList.pas
+++ b/A09财务通用管理/U_CollectList.pas
@@ -34,24 +34,23 @@ type
OppCoName: TcxTextEdit;
cxGrid1: TcxGrid;
Tv1: TcxGridDBTableView;
- v2CRTime: TcxGridDBColumn;
+ Tv1FFTime: TcxGridDBColumn;
cxGridLevel1: TcxGridLevel;
GPM_1: TcxGridPopupMenu;
DS_1: TDataSource;
CDS_1: TClientDataSet;
btnAdd: TToolButton;
- v2FactoryName: TcxGridDBColumn;
+ Tv1OppCoName: TcxGridDBColumn;
F_Name: TcxTextEdit;
Label4: TLabel;
Label6: TLabel;
P_Code: TcxTextEdit;
- v2OrderNo: TcxGridDBColumn;
cxTabControl1: TcxTabControl;
Label10: TLabel;
ConNo: TcxTextEdit;
Label11: TLabel;
BuyConNo: TcxTextEdit;
- v2Column2: TcxGridDBColumn;
+ Tv1OurCoName: TcxGridDBColumn;
btnChk: TToolButton;
btnReChk: TToolButton;
PopupMenu1: TPopupMenu;
@@ -62,29 +61,26 @@ type
ToolButton5: TToolButton;
N2: TMenuItem;
btnEdit: TToolButton;
- Tv1Column1: TcxGridDBColumn;
- Tv1Column2: TcxGridDBColumn;
- Tv1Column3: TcxGridDBColumn;
- Tv1Column17: TcxGridDBColumn;
- Tv1Column18: TcxGridDBColumn;
- Tv1Column19: TcxGridDBColumn;
- Tv1Column20: TcxGridDBColumn;
- Tv1Column21: TcxGridDBColumn;
- Tv1Column22: TcxGridDBColumn;
+ Tv1OurBankName: TcxGridDBColumn;
+ Tv1Amount: TcxGridDBColumn;
+ Tv1Currency: TcxGridDBColumn;
+ Tv1SSel: TcxGridDBColumn;
ToolButton7: TToolButton;
ToolButton8: TToolButton;
- Tv1Column4: TcxGridDBColumn;
- Tv1Column5: TcxGridDBColumn;
ToolButton9: TToolButton;
N3: TMenuItem;
- Tv1Column6: TcxGridDBColumn;
+ Tv1Note: TcxGridDBColumn;
ToolButton1: TToolButton;
- Tv1Column7: TcxGridDBColumn;
+ Tv1FJFlag: TcxGridDBColumn;
Label1: TLabel;
begdate: TcxDateEdit;
Enddate: TcxDateEdit;
CheckBox1: TcxCheckBox;
TBInvoice: TToolButton;
+ Tv1ourShuiNo: TcxGridDBColumn;
+ Tv1oppShuiNo: TcxGridDBColumn;
+ Tv1OurBankCardNo: TcxGridDBColumn;
+ Tv1IVNo: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure btnDelClick(Sender: TObject);
diff --git a/A09财务通用管理/U_CustStatement.dfm b/A09财务通用管理/U_CustStatement.dfm
index 48fd15c..8b0baa6 100644
--- a/A09财务通用管理/U_CustStatement.dfm
+++ b/A09财务通用管理/U_CustStatement.dfm
@@ -252,11 +252,9 @@ inherited frmCustStatement: TfrmCustStatement
end
item
Kind = skSum
- Column = Tv2Column1
end
item
Kind = skSum
- Column = Tv2Column2
end>
DataController.Summary.SummaryGroups = <>
OptionsCustomize.ColumnFiltering = False
@@ -266,6 +264,14 @@ inherited frmCustStatement: TfrmCustStatement
OptionsSelection.CellSelect = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
+ object Tv2oppshuino: TcxGridDBColumn
+ Caption = #31246#21495
+ DataBinding.FieldName = 'oppshuino'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 120
+ end
object v2Column6: TcxGridDBColumn
Caption = #23545#26041#21333#20301
DataBinding.FieldName = 'OppCoName'
@@ -316,22 +322,6 @@ inherited frmCustStatement: TfrmCustStatement
HeaderGlyphAlignmentHorz = taCenter
Width = 104
end
- object Tv2Column1: TcxGridDBColumn
- Caption = #26412#26399#27424#31080
- DataBinding.FieldName = 'BQWKTaxAmount'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 81
- end
- object Tv2Column2: TcxGridDBColumn
- Caption = #26412#26399#24320#31080
- DataBinding.FieldName = 'BQYKTaxAmount'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 77
- end
end
object cxGridLevel1: TcxGridLevel
GridView = Tv2
@@ -346,17 +336,21 @@ inherited frmCustStatement: TfrmCustStatement
TabOrder = 3
Properties.CustomButtons.Buttons = <>
Properties.Style = 11
- Properties.TabIndex = 1
+ Properties.TabIndex = 0
Properties.Tabs.Strings = (
- ' $ '
- ' '#65509' '
- ' '#8364' ')
+ ' USD '
+ ' CNY '
+ ' VND ')
LookAndFeel.Kind = lfUltraFlat
OnChange = cxTabControl1Change
ClientRectRight = 0
ClientRectTop = 0
end
inherited cxProgressBar2: TcxProgressBar
+ Left = 280
+ Top = 128
+ ExplicitLeft = 280
+ ExplicitTop = 128
ExplicitHeight = 29
end
inherited ADOQueryBaseCmd: TADOQuery
diff --git a/A09财务通用管理/U_CustStatement.pas b/A09财务通用管理/U_CustStatement.pas
index 904ad95..a95ce74 100644
--- a/A09财务通用管理/U_CustStatement.pas
+++ b/A09财务通用管理/U_CustStatement.pas
@@ -48,14 +48,13 @@ type
ADOQueryPrint: TADOQuery;
cxTabControl1: TcxTabControl;
ToolButton1: TToolButton;
- Tv2Column1: TcxGridDBColumn;
- Tv2Column2: TcxGridDBColumn;
ToolButton5: TToolButton;
ToolButton6: TToolButton;
Label2: TLabel;
begdate: TcxDateEdit;
Enddate: TcxDateEdit;
Label4: TLabel;
+ Tv2oppshuino: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
@@ -109,10 +108,9 @@ begin
end;
2:
begin
- sql.Add(' ,@Currency=''EUR'' ');
+ sql.Add(' ,@Currency=''VND'' ');
end;
end;
-
Open;
end;
SCreateCDS(ADOQueryMain, CDS_HZ);
@@ -202,7 +200,7 @@ begin
end;
2:
begin
- FCurrency := 'EUR';
+ FCurrency := 'VND';
end;
end;
show;
diff --git a/A09财务通用管理/U_FtyStatement.dfm b/A09财务通用管理/U_FtyStatement.dfm
index e87d92e..f7f11be 100644
--- a/A09财务通用管理/U_FtyStatement.dfm
+++ b/A09财务通用管理/U_FtyStatement.dfm
@@ -341,13 +341,14 @@ inherited frmFtyStatement: TfrmFtyStatement
TabOrder = 3
Properties.CustomButtons.Buttons = <>
Properties.Style = 11
- Properties.TabIndex = 1
+ Properties.TabIndex = 0
Properties.Tabs.Strings = (
' USD '
' CNY '
' VND ')
LookAndFeel.Kind = lfUltraFlat
OnChange = cxTabControl1Change
+ ExplicitTop = 78
ClientRectRight = 0
ClientRectTop = 0
end
diff --git a/A09财务通用管理/U_GETableBatchInput.pas b/A09财务通用管理/U_GETableBatchInput.pas
index 1263522..2a4c139 100644
--- a/A09财务通用管理/U_GETableBatchInput.pas
+++ b/A09财务通用管理/U_GETableBatchInput.pas
@@ -220,6 +220,7 @@ begin
FieldByName('FFID').Value := Maxno;
FieldByName('FFFlag').Value := 'Ӧ';
FieldByName('FFType').Value := 'ӦտǼ';
+ FieldByName('FFQtyFlag').Value := 1;
FieldByName('CheckStatus').Value := 'δ';
diff --git a/A09财务通用管理/U_GetableSel.dfm b/A09财务通用管理/U_GetableSel.dfm
index faccd1a..56fc2e8 100644
--- a/A09财务通用管理/U_GetableSel.dfm
+++ b/A09财务通用管理/U_GetableSel.dfm
@@ -9,6 +9,7 @@ inherited frmGetableSel: TfrmGetableSel
Font.Height = -16
Position = poMainFormCenter
OnClose = FormClose
+ ExplicitLeft = -89
ExplicitWidth = 1422
ExplicitHeight = 611
PixelsPerInch = 96
@@ -141,15 +142,12 @@ inherited frmGetableSel: TfrmGetableSel
end
item
Kind = skSum
- Column = Tv1Column15
end
item
Kind = skSum
- Column = Tv1Column16
end
item
Kind = skSum
- Column = Tv1Column17
end
item
Kind = skSum
@@ -157,7 +155,6 @@ inherited frmGetableSel: TfrmGetableSel
end
item
Kind = skSum
- Column = Tv1Column25
end>
DataController.Summary.SummaryGroups = <>
OptionsBehavior.GoToNextCellOnEnter = True
@@ -185,7 +182,7 @@ inherited frmGetableSel: TfrmGetableSel
Properties.ShowTime = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 82
+ Width = 100
end
object v2OurCoName: TcxGridDBColumn
Caption = #25105#26041#21333#20301
@@ -201,14 +198,14 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 79
+ Width = 100
end
object Tv1BuyConNo: TcxGridDBColumn
Caption = #38754#26009#21512#21516#21495
DataBinding.FieldName = 'BuyConNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 117
+ Width = 100
end
object Tv1ConNo: TcxGridDBColumn
Caption = #22383#24067#21512#21516#21495
@@ -216,7 +213,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 98
+ Width = 100
end
object Tv1OrderNo: TcxGridDBColumn
Caption = #32455#36896#21333#21495
@@ -224,7 +221,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 82
+ Width = 100
end
object Tv1F_Code: TcxGridDBColumn
Caption = #32534#21495
@@ -232,7 +229,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1F_Name: TcxGridDBColumn
Caption = #21697#21517
@@ -240,7 +237,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1F_Width: TcxGridDBColumn
Caption = #38376#24133
@@ -248,7 +245,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1F_GramWeight: TcxGridDBColumn
Caption = #20811#37325
@@ -256,7 +253,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1F_Color: TcxGridDBColumn
Caption = #39068#33394
@@ -264,7 +261,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1F_ColorNo: TcxGridDBColumn
Caption = #33394#21495
@@ -272,7 +269,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1Piece: TcxGridDBColumn
Caption = #21305#25968
@@ -280,7 +277,7 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
object Tv1Qty: TcxGridDBColumn
Caption = #25968#37327
@@ -288,133 +285,79 @@ inherited frmGetableSel: TfrmGetableSel
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
- object v2FactoryName: TcxGridDBColumn
- Caption = #23545#26041#21333#20301
- DataBinding.FieldName = 'OppCoName'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 102
- end
- object v2OrderNo: TcxGridDBColumn
- Tag = 7
- Caption = #19978#32423#21333#20301
- DataBinding.FieldName = 'OppParentCoName'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 92
- end
- object Tv1Column3: TcxGridDBColumn
- Caption = #20184#27454#26041#24335
- DataBinding.FieldName = 'PayMent'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 91
- end
- object Tv1Column6: TcxGridDBColumn
- Caption = #33457#22411
- DataBinding.FieldName = 'F_Pattern'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column28: TcxGridDBColumn
- Caption = #27454#21495
- DataBinding.FieldName = 'F_StyleNo'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 72
- end
- object Tv1Column27: TcxGridDBColumn
- Caption = #38468#20214
- DataBinding.FieldName = 'FJFlag'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 48
- end
- object Tv1Column13: TcxGridDBColumn
+ object Tv1QtyUnit: TcxGridDBColumn
Caption = #21333#20301
DataBinding.FieldName = 'QtyUnit'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
- object Tv1Column14: TcxGridDBColumn
- Caption = #21333#20215
- DataBinding.FieldName = 'Price'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column15: TcxGridDBColumn
- Caption = #20854#20182#36153
- DataBinding.FieldName = 'OtherFee'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column16: TcxGridDBColumn
- Caption = #20943#20813
- DataBinding.FieldName = 'Deduction'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column17: TcxGridDBColumn
- Caption = #37329#39069
- DataBinding.FieldName = 'Amount'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 66
- end
- object Tv1Column18: TcxGridDBColumn
+ object Tv1Currency: TcxGridDBColumn
Caption = #24065#31181
DataBinding.FieldName = 'Currency'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 66
+ Width = 100
end
- object Tv1Column25: TcxGridDBColumn
- Caption = #26680#38144#37329#39069
- DataBinding.FieldName = 'FFWoAmount'
+ object Tv1NoTaxPrice: TcxGridDBColumn
+ Caption = #19981#21547#31246#21333#20215
+ DataBinding.FieldName = 'NoTaxPrice'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
+ Width = 100
end
- object Tv1Column26: TcxGridDBColumn
- Caption = #26159#21542#21547#31246
- DataBinding.FieldName = 'IsInvoice'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Width = 78
- end
- object Tv1Column1: TcxGridDBColumn
- Caption = #26469#28304
- DataBinding.FieldName = 'FromID1'
+ object Tv1NoTaxInclude: TcxGridDBColumn
+ Caption = #19981#21547#31246#37329#39069
+ DataBinding.FieldName = 'NoTaxInclude'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 70
+ Width = 100
end
- object Tv1Column2: TcxGridDBColumn
+ object Tv1TaxRate: TcxGridDBColumn
+ Caption = #31246#29575
+ DataBinding.FieldName = 'TaxRate'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 100
+ end
+ object Tv1Tax: TcxGridDBColumn
+ Caption = #31246#39069
+ DataBinding.FieldName = 'Tax'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 100
+ end
+ object Tv1TaxInclude: TcxGridDBColumn
+ Caption = #21547#31246#37329#39069
+ DataBinding.FieldName = 'TaxInclude'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 100
+ end
+ object Tv1Note: TcxGridDBColumn
Caption = #22791#27880
DataBinding.FieldName = 'Note'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
+ Width = 100
+ end
+ object Tv1FromID1: TcxGridDBColumn
+ Caption = #26469#28304
+ DataBinding.FieldName = 'FromID1'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 100
end
end
object cxGridLevel1: TcxGridLevel
diff --git a/A09财务通用管理/U_GetableSel.pas b/A09财务通用管理/U_GetableSel.pas
index 555e99c..3cec584 100644
--- a/A09财务通用管理/U_GetableSel.pas
+++ b/A09财务通用管理/U_GetableSel.pas
@@ -42,35 +42,28 @@ type
Tv1Column22: TcxGridDBColumn;
v2CRTime: TcxGridDBColumn;
v2OurCoName: TcxGridDBColumn;
- v2FactoryName: TcxGridDBColumn;
- v2OrderNo: TcxGridDBColumn;
- Tv1Column3: TcxGridDBColumn;
Tv1ConNo: TcxGridDBColumn;
Tv1FFAbstract: TcxGridDBColumn;
Tv1OrderNo: TcxGridDBColumn;
Tv1BuyConNo: TcxGridDBColumn;
Tv1F_Code: TcxGridDBColumn;
Tv1F_Name: TcxGridDBColumn;
- Tv1Column6: TcxGridDBColumn;
Tv1F_Color: TcxGridDBColumn;
- Tv1Column28: TcxGridDBColumn;
Tv1F_Width: TcxGridDBColumn;
Tv1F_GramWeight: TcxGridDBColumn;
Tv1F_ColorNo: TcxGridDBColumn;
- Tv1Column27: TcxGridDBColumn;
Tv1Piece: TcxGridDBColumn;
Tv1Qty: TcxGridDBColumn;
- Tv1Column13: TcxGridDBColumn;
- Tv1Column14: TcxGridDBColumn;
- Tv1Column15: TcxGridDBColumn;
- Tv1Column16: TcxGridDBColumn;
- Tv1Column17: TcxGridDBColumn;
- Tv1Column18: TcxGridDBColumn;
- Tv1Column25: TcxGridDBColumn;
- Tv1Column26: TcxGridDBColumn;
- Tv1Column1: TcxGridDBColumn;
- Tv1Column2: TcxGridDBColumn;
+ Tv1QtyUnit: TcxGridDBColumn;
+ Tv1Currency: TcxGridDBColumn;
+ Tv1FromID1: TcxGridDBColumn;
+ Tv1Note: TcxGridDBColumn;
cxGridLevel1: TcxGridLevel;
+ Tv1NoTaxPrice: TcxGridDBColumn;
+ Tv1NoTaxInclude: TcxGridDBColumn;
+ Tv1TaxRate: TcxGridDBColumn;
+ Tv1Tax: TcxGridDBColumn;
+ Tv1TaxInclude: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
diff --git a/A09财务通用管理/U_InvoiceInInPut.dfm b/A09财务通用管理/U_InvoiceInInPut.dfm
index b550d14..c3ea363 100644
--- a/A09财务通用管理/U_InvoiceInInPut.dfm
+++ b/A09财务通用管理/U_InvoiceInInPut.dfm
@@ -150,6 +150,20 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
HeaderAlignmentHorz = taCenter
Width = 77
end
+ object Tv1FIAbstract: TcxGridDBColumn
+ Caption = #25688#35201
+ DataBinding.FieldName = 'FIAbstract'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxButtonEditProperties'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ Properties.OnButtonClick = Tv1FIAbstractPropertiesButtonClick
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
object Tv1SupplierShuiNo: TcxGridDBColumn
Caption = #20379#24212#21830#31246#21495
DataBinding.FieldName = 'SupplierShuiNo'
diff --git a/A09财务通用管理/U_InvoiceInInPut.pas b/A09财务通用管理/U_InvoiceInInPut.pas
index 305ba8d..80daa72 100644
--- a/A09财务通用管理/U_InvoiceInInPut.pas
+++ b/A09财务通用管理/U_InvoiceInInPut.pas
@@ -11,7 +11,7 @@ uses
DBClient, ExtCtrls, StdCtrls, BtnEdit, cxButtonEdit, cxTextEdit,
cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar,
dxDateRanges, dxBarBuiltInMenu, ComObj, dxSkinsCore, dxSkinsDefaultPainters,
- dxScrollbarAnnotations, cxCurrencyEdit;
+ dxScrollbarAnnotations, cxCurrencyEdit, dxSkinWXI;
type
TfrmInvoiceInInPut = class(TForm)
@@ -48,6 +48,7 @@ type
Tv1fromFlow: TcxGridDBColumn;
Tv1OurCoNo: TcxGridDBColumn;
Tv1SupplierNo: TcxGridDBColumn;
+ Tv1FIAbstract: TcxGridDBColumn;
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TSaveClick(Sender: TObject);
@@ -68,6 +69,8 @@ type
procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
procedure Tv1AmountPropertiesEditValueChanged(Sender: TObject);
procedure ToolButton5Click(Sender: TObject);
+ procedure Tv1FIAbstractPropertiesButtonClick(Sender: TObject;
+ AButtonIndex: Integer);
private
procedure initGrid();
function SaveDate(): Boolean;
@@ -611,6 +614,28 @@ begin
end;
end;
+procedure TfrmInvoiceInInPut.Tv1FIAbstractPropertiesButtonClick(Sender: TObject;
+ AButtonIndex: Integer);
+begin
+ try
+ frmZDYHelp := TfrmZDYHelp.Create(Application);
+ with frmZDYHelp do
+ begin
+ flag := 'FIAbstract2';
+ flagname := '摘要';
+ if ShowModal = 1 then
+ begin
+ Self.CDS_Invoice.Edit;
+ Self.CDS_Invoice.FieldByName('FIAbstract').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+ Self.CDS_Invoice.Post;
+ end;
+ end;
+ finally
+ frmZDYHelp.Free;
+ end;
+
+end;
+
procedure TfrmInvoiceInInPut.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
begin
try
diff --git a/A09财务通用管理/U_InvoiceInList.dfm b/A09财务通用管理/U_InvoiceInList.dfm
index 2451947..7bb13f6 100644
--- a/A09财务通用管理/U_InvoiceInList.dfm
+++ b/A09财务通用管理/U_InvoiceInList.dfm
@@ -339,6 +339,14 @@ inherited frmInvoiceInList: TfrmInvoiceInList
Options.Editing = False
Width = 79
end
+ object Tv1FIAbstract: TcxGridDBColumn
+ Caption = #25688#35201
+ DataBinding.FieldName = 'FIAbstract'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ end
object Tv1SupplierShuiNo: TcxGridDBColumn
Caption = #20379#24212#21830#31246#21495
DataBinding.FieldName = 'SupplierShuiNo'
diff --git a/A09财务通用管理/U_InvoiceInList.pas b/A09财务通用管理/U_InvoiceInList.pas
index 6823ca7..d2e3c4e 100644
--- a/A09财务通用管理/U_InvoiceInList.pas
+++ b/A09财务通用管理/U_InvoiceInList.pas
@@ -88,6 +88,7 @@ type
Tv1PayStatus: TcxGridDBColumn;
Tv1PayTime: TcxGridDBColumn;
TbYFK: TToolButton;
+ Tv1FIAbstract: TcxGridDBColumn;
procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
diff --git a/A09财务通用管理/U_InvoiceOutList.pas b/A09财务通用管理/U_InvoiceOutList.pas
index 0cb79a5..690c145 100644
--- a/A09财务通用管理/U_InvoiceOutList.pas
+++ b/A09财务通用管理/U_InvoiceOutList.pas
@@ -194,6 +194,8 @@ 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 isnull(A.Status,''0'')=''0'' THEN ''δ'' WHEN A.Status=''9'' THEN '''' ELSE '''' END');
+ sql.Add(',PayStatus=CASE WHEN EXISTS(SELECT 1 FROM Finance_Flow F WHERE F.FFType=''տǼ'' AND F.IVID=A.IVID) THEN ''տ'' ELSE ''δտ'' END');
+ sql.Add(',PayTime=(SELECT F.FFTime FROM Finance_Flow F WHERE F.FFType=''տǼ'' AND F.IVID=A.IVID)');
sql.Add(' from Finance_Invoice A ');
sql.add(' where A.IVDate>=''' + formatdatetime('yyyy-MM-dd', begdate.Date) + ''' ');
sql.Add(' and A.IVDate<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
diff --git a/A09财务通用管理/U_PayableSel.dfm b/A09财务通用管理/U_PayableSel.dfm
index 8bf9745..f989ca1 100644
--- a/A09财务通用管理/U_PayableSel.dfm
+++ b/A09财务通用管理/U_PayableSel.dfm
@@ -157,7 +157,7 @@ inherited frmPayableSel: TfrmPayableSel
PropertiesClassName = 'TcxCheckBoxProperties'
Properties.ImmediatePost = True
HeaderAlignmentHorz = taCenter
- Width = 43
+ Width = 66
end
object Tv1FFTime: TcxGridDBColumn
Caption = #30331#35760#26085#26399
@@ -168,14 +168,14 @@ inherited frmPayableSel: TfrmPayableSel
Properties.ShowTime = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 82
+ Width = 100
end
object TV1OurCoName: TcxGridDBColumn
Caption = #25105#26041#21333#20301
DataBinding.FieldName = 'OurCoName'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 91
+ Width = 100
end
object Tv1OppCoName: TcxGridDBColumn
Caption = #23545#26041#21333#20301
@@ -189,7 +189,7 @@ inherited frmPayableSel: TfrmPayableSel
end>
Properties.OnButtonClick = Tv1OppCoNamePropertiesButtonClick
HeaderAlignmentHorz = taCenter
- Width = 83
+ Width = 100
end
object Tv1FFAbstract: TcxGridDBColumn
Caption = #25688#35201
@@ -203,7 +203,7 @@ inherited frmPayableSel: TfrmPayableSel
end>
Properties.OnButtonClick = Tv1FFAbstractPropertiesButtonClick
HeaderAlignmentHorz = taCenter
- Width = 79
+ Width = 100
end
object Tv1PurNo: TcxGridDBColumn
Caption = #37319#36141#21333#21495
@@ -218,7 +218,7 @@ inherited frmPayableSel: TfrmPayableSel
Properties.ReadOnly = True
Properties.OnButtonClick = Tv1PurNoPropertiesButtonClick
HeaderAlignmentHorz = taCenter
- Width = 81
+ Width = 100
end
object Tv1OrderNo: TcxGridDBColumn
Caption = #32455#36896#21333#21495
@@ -233,21 +233,21 @@ inherited frmPayableSel: TfrmPayableSel
Properties.ReadOnly = True
Properties.OnButtonClick = Tv1OrderNoPropertiesButtonClick
HeaderAlignmentHorz = taCenter
- Width = 91
+ Width = 100
end
object Tv1ConNo: TcxGridDBColumn
Caption = #22383#24067#21512#21516#21495
DataBinding.FieldName = 'ConNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 112
+ Width = 100
end
object Tv1BuyConNo: TcxGridDBColumn
Caption = #38754#26009#21512#21516#21495
DataBinding.FieldName = 'BuyConNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 127
+ Width = 100
end
object Tv1FinType: TcxGridDBColumn
Caption = #31867#22411
@@ -260,49 +260,49 @@ inherited frmPayableSel: TfrmPayableSel
#22383#24067
#26426#29289#26009)
HeaderAlignmentHorz = taCenter
- Width = 80
+ Width = 100
end
object Tv1F_Code: TcxGridDBColumn
Caption = #32534#21495
DataBinding.FieldName = 'F_Code'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 79
+ Width = 100
end
object Tv1F_Name: TcxGridDBColumn
Caption = #21697#21517
DataBinding.FieldName = 'F_Name'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 85
+ Width = 100
end
object Tv1F_Width: TcxGridDBColumn
Caption = #38376#24133
DataBinding.FieldName = 'F_Width'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 88
+ Width = 100
end
object Tv1F_GramWeight: TcxGridDBColumn
Caption = #20811#37325
DataBinding.FieldName = 'F_GramWeight'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 66
+ Width = 100
end
object Tv1F_Color: TcxGridDBColumn
Caption = #39068#33394
DataBinding.FieldName = 'F_Color'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 66
+ Width = 100
end
object Tv1Piece: TcxGridDBColumn
Caption = #21305#25968
DataBinding.FieldName = 'Piece'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 65
+ Width = 100
end
object Tv1Qty: TcxGridDBColumn
Caption = #25968#37327
@@ -311,14 +311,14 @@ inherited frmPayableSel: TfrmPayableSel
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = Tv1TaxRatePropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
- Width = 76
+ Width = 100
end
object Tv1QtyUnit: TcxGridDBColumn
Caption = #21333#20301
DataBinding.FieldName = 'QtyUnit'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 63
+ Width = 100
end
object Tv1Currency: TcxGridDBColumn
Caption = #24065#31181
@@ -332,7 +332,7 @@ inherited frmPayableSel: TfrmPayableSel
'VND')
Properties.OnChange = Tv1CurrencyPropertiesChange
HeaderAlignmentHorz = taCenter
- Width = 66
+ Width = 100
end
object Tv1NoTaxPrice: TcxGridDBColumn
Caption = #19981#21547#31246#21333#20215
@@ -341,14 +341,14 @@ inherited frmPayableSel: TfrmPayableSel
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = Tv1TaxRatePropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
- Width = 99
+ Width = 100
end
object Tv1NoTaxInclude: TcxGridDBColumn
Caption = #19981#21547#31246#37329#39069
DataBinding.FieldName = 'NoTaxInclude'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 108
+ Width = 100
end
object Tv1TaxRate: TcxGridDBColumn
Caption = #31246#29575
@@ -357,7 +357,7 @@ inherited frmPayableSel: TfrmPayableSel
PropertiesClassName = 'TcxTextEditProperties'
Properties.OnEditValueChanged = Tv1TaxRatePropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
- Width = 80
+ Width = 100
end
object Tv1Tax: TcxGridDBColumn
Caption = #31246#39069
@@ -365,28 +365,28 @@ inherited frmPayableSel: TfrmPayableSel
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
HeaderAlignmentHorz = taCenter
- Width = 85
+ Width = 100
end
object Tv1TaxInclude: TcxGridDBColumn
Caption = #21547#31246#37329#39069
DataBinding.FieldName = 'TaxInclude'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 96
+ Width = 100
end
object Tv1Note: TcxGridDBColumn
Caption = #22791#27880
DataBinding.FieldName = 'Note'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 78
+ Width = 100
end
object Tv1FromID1: TcxGridDBColumn
Caption = #26469#28304
DataBinding.FieldName = 'FromID1'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 70
+ Width = 100
end
end
object cxGridLevel1: TcxGridLevel
diff --git a/A09财务通用管理/U_SingleCustStatement.dfm b/A09财务通用管理/U_SingleCustStatement.dfm
index cb08e9b..f56d392 100644
--- a/A09财务通用管理/U_SingleCustStatement.dfm
+++ b/A09财务通用管理/U_SingleCustStatement.dfm
@@ -209,7 +209,6 @@ object frmSingleCustStatement: TfrmSingleCustStatement
end
item
Kind = skSum
- Column = V1Column7
end
item
Kind = skSum
@@ -225,15 +224,14 @@ object frmSingleCustStatement: TfrmSingleCustStatement
end
item
Kind = skSum
- Column = V1Column12
+ Column = Tv1BQSKAmount
end
item
Kind = skSum
- Column = V1Column9
+ Column = Tv1BQYSAmount
end
item
Kind = skSum
- Column = V1Column16
end>
DataController.Summary.SummaryGroups = <>
OptionsCustomize.ColumnFiltering = False
@@ -243,105 +241,14 @@ object frmSingleCustStatement: TfrmSingleCustStatement
OptionsView.GroupByBox = False
Bands = <
item
+ Width = 944
end
item
Caption = #23545#36134#20449#24687
- Width = 396
- end
- item
- Caption = #24320#31080#20449#24687
- Width = 287
- end
- item
- Caption = #35814#32454#20449#24687
- Width = 941
+ Width = 474
end>
- object V1Column2: TcxGridDBBandedColumn
- Caption = #23545#36134#26085#26399
- DataBinding.FieldName = 'ReconciliationDate'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 79
- Position.BandIndex = 0
- Position.ColIndex = 1
- Position.RowIndex = 0
- end
- object V1Column4: TcxGridDBBandedColumn
- Caption = #32534#21495
- DataBinding.FieldName = 'F_Code'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 87
- Position.BandIndex = 3
- Position.ColIndex = 3
- Position.RowIndex = 0
- end
- object V1Column5: TcxGridDBBandedColumn
- Caption = #21697#21517
- DataBinding.FieldName = 'F_Name'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 91
- Position.BandIndex = 3
- Position.ColIndex = 4
- Position.RowIndex = 0
- end
- object V1Column6: TcxGridDBBandedColumn
- Caption = #35268#26684
- DataBinding.FieldName = 'F_Spec'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 92
- Position.BandIndex = 3
- Position.ColIndex = 5
- Position.RowIndex = 0
- end
- object V1Column7: TcxGridDBBandedColumn
- Caption = #25968#37327
- DataBinding.FieldName = 'Qty'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 77
- Position.BandIndex = 3
- Position.ColIndex = 8
- Position.RowIndex = 0
- end
- object V1Column8: TcxGridDBBandedColumn
- Caption = #21333#20215
- DataBinding.FieldName = 'Price'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 84
- Position.BandIndex = 3
- Position.ColIndex = 10
- Position.RowIndex = 0
- end
- object V1Column9: TcxGridDBBandedColumn
- Caption = #24212#25910#37329#39069
+ object Tv1BQYSAmount: TcxGridDBBandedColumn
+ Caption = #24635#37329#39069#24050#21547#31246
DataBinding.FieldName = 'BQYSAmount'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
@@ -354,7 +261,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = 0
Position.RowIndex = 0
end
- object V1Column12: TcxGridDBBandedColumn
+ object Tv1BQSKAmount: TcxGridDBBandedColumn
Caption = #25910#27454#37329#39069
DataBinding.FieldName = 'BQSKAmount'
DataBinding.IsNullValueType = True
@@ -368,8 +275,8 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = 1
Position.RowIndex = 0
end
- object V1Column15: TcxGridDBBandedColumn
- Caption = #32047#35745#20313#39069
+ object Tv1BQJYAmount: TcxGridDBBandedColumn
+ Caption = #20313#39069
DataBinding.FieldName = 'BQJYAmount'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
@@ -382,35 +289,6 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = 2
Position.RowIndex = 0
end
- object V1Column3: TcxGridDBBandedColumn
- Caption = #25688#35201
- DataBinding.FieldName = 'FFAbstract'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 129
- Position.BandIndex = 3
- Position.ColIndex = 1
- Position.RowIndex = 0
- end
- object V1Column10: TcxGridDBBandedColumn
- DataBinding.FieldName = 'CWID'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- Visible = False
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- VisibleForCustomization = False
- Width = 45
- Position.BandIndex = 3
- Position.ColIndex = 0
- Position.RowIndex = 0
- end
object V1Column14: TcxGridDBBandedColumn
Caption = #24207#21495
DataBinding.FieldName = 'keyNO'
@@ -425,36 +303,8 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = 0
Position.RowIndex = 0
end
- object V1Column16: TcxGridDBBandedColumn
- Caption = #24320#31080#37329#39069
- DataBinding.FieldName = 'BQKPAmount'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 72
- Position.BandIndex = 2
- Position.ColIndex = 1
- Position.RowIndex = 0
- end
- object V1Column17: TcxGridDBBandedColumn
- Caption = #32047#35745#27424#31080
- DataBinding.FieldName = 'BQWKPAmount'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 119
- Position.BandIndex = 2
- Position.ColIndex = 2
- Position.RowIndex = 0
- end
- object V1Column20: TcxGridDBBandedColumn
- Caption = #31080#21495
+ object Tv1IVNo: TcxGridDBBandedColumn
+ Caption = #21457#31080#21495#30721
DataBinding.FieldName = 'IVNo'
DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
@@ -463,52 +313,10 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Options.Editing = False
Options.Moving = False
Width = 91
- Position.BandIndex = 2
- Position.ColIndex = 0
- Position.RowIndex = 0
- end
- object V1Column21: TcxGridDBBandedColumn
- Caption = #35745#21010#21333#21495
- DataBinding.FieldName = 'OrderNo'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 68
- Position.BandIndex = 3
+ Position.BandIndex = 0
Position.ColIndex = 2
Position.RowIndex = 0
end
- object V1Column22: TcxGridDBBandedColumn
- Caption = #21305#25968
- DataBinding.FieldName = 'Piece'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 71
- Position.BandIndex = 3
- Position.ColIndex = 7
- Position.RowIndex = 0
- end
- object V1Column23: TcxGridDBBandedColumn
- Caption = #39068#33394
- DataBinding.FieldName = 'P_Color'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 64
- Position.BandIndex = 3
- Position.ColIndex = 6
- Position.RowIndex = 0
- end
object V1Column25: TcxGridDBBandedColumn
Caption = #22791#27880
DataBinding.FieldName = 'MxNote'
@@ -522,32 +330,6 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = -1
Position.RowIndex = -1
end
- object V1Column26: TcxGridDBBandedColumn
- Caption = #22791#27880
- DataBinding.FieldName = 'YMxNote'
- DataBinding.IsNullValueType = True
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Horz = taCenter
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 58
- Position.BandIndex = 3
- Position.ColIndex = 9
- Position.RowIndex = 0
- end
- object V1Column33: TcxGridDBBandedColumn
- Caption = #20854#20182#36153
- DataBinding.FieldName = 'OtherFee'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Options.Moving = False
- Width = 83
- Position.BandIndex = 3
- Position.ColIndex = 11
- Position.RowIndex = 0
- end
object V1Column34: TcxGridDBBandedColumn
Caption = #36135#27454
DataBinding.FieldName = 'HKMONEY'
@@ -560,16 +342,70 @@ object frmSingleCustStatement: TfrmSingleCustStatement
Position.ColIndex = -1
Position.RowIndex = -1
end
- object TV1Column1: TcxGridDBBandedColumn
- Caption = #20943#20813#37329#39069
- DataBinding.FieldName = 'Deduction'
+ object TV1ReconciliationDate: TcxGridDBBandedColumn
+ Caption = #21457#31080#26085#26399
+ DataBinding.FieldName = 'ReconciliationDate'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Filtering = False
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 1
+ Position.RowIndex = 0
+ end
+ object TV1BGDNum: TcxGridDBBandedColumn
+ Caption = #25253#20851#21333#21495#30721
+ DataBinding.FieldName = 'BGDNum'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Options.Moving = False
- Width = 78
- Position.BandIndex = 3
- Position.ColIndex = 12
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 3
+ Position.RowIndex = 0
+ end
+ object TV1BankSlipNumber: TcxGridDBBandedColumn
+ Caption = #27700#21333#32534#21495
+ DataBinding.FieldName = 'BankSlipNumber'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 4
+ Position.RowIndex = 0
+ end
+ object TV1oppShuiNo: TcxGridDBBandedColumn
+ Caption = #31246#21495
+ DataBinding.FieldName = 'oppShuiNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 5
+ Position.RowIndex = 0
+ end
+ object TV1oppconame: TcxGridDBBandedColumn
+ Caption = #23458#25143#21517#31216
+ DataBinding.FieldName = 'oppconame'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 6
+ Position.RowIndex = 0
+ end
+ object TV1Currency: TcxGridDBBandedColumn
+ Caption = #24065#31181
+ DataBinding.FieldName = 'Currency'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ Position.BandIndex = 0
+ Position.ColIndex = 7
Position.RowIndex = 0
end
end
diff --git a/A09财务通用管理/U_SingleCustStatement.pas b/A09财务通用管理/U_SingleCustStatement.pas
index a9b44a4..821f402 100644
--- a/A09财务通用管理/U_SingleCustStatement.pas
+++ b/A09财务通用管理/U_SingleCustStatement.pas
@@ -49,31 +49,21 @@ type
RMXLSExport1: TRMXLSExport;
ADOQueryPrint: TADOQuery;
TV1: TcxGridDBBandedTableView;
- V1Column2: TcxGridDBBandedColumn;
- V1Column4: TcxGridDBBandedColumn;
- V1Column5: TcxGridDBBandedColumn;
- V1Column6: TcxGridDBBandedColumn;
- V1Column7: TcxGridDBBandedColumn;
- V1Column8: TcxGridDBBandedColumn;
- V1Column9: TcxGridDBBandedColumn;
- V1Column12: TcxGridDBBandedColumn;
- V1Column15: TcxGridDBBandedColumn;
- V1Column3: TcxGridDBBandedColumn;
- V1Column10: TcxGridDBBandedColumn;
+ Tv1BQYSAmount: TcxGridDBBandedColumn;
+ Tv1BQSKAmount: TcxGridDBBandedColumn;
+ Tv1BQJYAmount: TcxGridDBBandedColumn;
V1Column14: TcxGridDBBandedColumn;
- V1Column16: TcxGridDBBandedColumn;
- V1Column17: TcxGridDBBandedColumn;
- V1Column20: TcxGridDBBandedColumn;
- V1Column21: TcxGridDBBandedColumn;
- V1Column22: TcxGridDBBandedColumn;
- V1Column23: TcxGridDBBandedColumn;
+ Tv1IVNo: TcxGridDBBandedColumn;
V1Column25: TcxGridDBBandedColumn;
- V1Column26: TcxGridDBBandedColumn;
- V1Column33: TcxGridDBBandedColumn;
V1Column34: TcxGridDBBandedColumn;
OppCoName: TEdit;
ToolButton2: TToolButton;
- TV1Column1: TcxGridDBBandedColumn;
+ TV1ReconciliationDate: TcxGridDBBandedColumn;
+ TV1BGDNum: TcxGridDBBandedColumn;
+ TV1BankSlipNumber: TcxGridDBBandedColumn;
+ TV1oppShuiNo: TcxGridDBBandedColumn;
+ TV1oppconame: TcxGridDBBandedColumn;
+ TV1Currency: TcxGridDBBandedColumn;
procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
diff --git a/A09财务通用管理/U_SingleFtyStatement.dfm b/A09财务通用管理/U_SingleFtyStatement.dfm
index 3f01395..8569a6d 100644
--- a/A09财务通用管理/U_SingleFtyStatement.dfm
+++ b/A09财务通用管理/U_SingleFtyStatement.dfm
@@ -378,7 +378,7 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
Position.ColIndex = 0
Position.RowIndex = 0
end
- object V1Column20: TcxGridDBBandedColumn
+ object Tv1IVNo: TcxGridDBBandedColumn
Caption = #21457#31080#21495#30721
DataBinding.FieldName = 'IVNo'
DataBinding.IsNullValueType = True
diff --git a/A09财务通用管理/U_SingleFtyStatement.pas b/A09财务通用管理/U_SingleFtyStatement.pas
index 95b64e3..9ff1cb3 100644
--- a/A09财务通用管理/U_SingleFtyStatement.pas
+++ b/A09财务通用管理/U_SingleFtyStatement.pas
@@ -56,7 +56,7 @@ type
V1Column15: TcxGridDBBandedColumn;
V1Column10: TcxGridDBBandedColumn;
V1Column14: TcxGridDBBandedColumn;
- V1Column20: TcxGridDBBandedColumn;
+ Tv1IVNo: TcxGridDBBandedColumn;
V1Column25: TcxGridDBBandedColumn;
V1Column34: TcxGridDBBandedColumn;
OppCoName: TEdit;