diff --git a/A00通用窗体/U_AttachmentUpload.pas b/A00通用窗体/U_AttachmentUpload.pas index b7d0141..a1d03ec 100644 --- a/A00通用窗体/U_AttachmentUpload.pas +++ b/A00通用窗体/U_AttachmentUpload.pas @@ -27,7 +27,7 @@ uses - dxScrollbarAnnotations, cxImageList; + dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters; type TfrmAttachmentUpload = class(TfrmBaseHelp) diff --git a/A00通用窗体/U_TatClothInfoSel.dfm b/A00通用窗体/U_TatClothInfoSel.dfm index 91c5e5c..156ab38 100644 --- a/A00通用窗体/U_TatClothInfoSel.dfm +++ b/A00通用窗体/U_TatClothInfoSel.dfm @@ -111,6 +111,8 @@ inherited frmTatClothInfoSel: TfrmTatClothInfoSel Height = 508 Align = alClient TabOrder = 0 + ExplicitLeft = 17 + ExplicitTop = 37 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/A00通用窗体/U_YarnInfoSel.dfm b/A00通用窗体/U_YarnInfoSel.dfm index 29f38fc..6226d51 100644 --- a/A00通用窗体/U_YarnInfoSel.dfm +++ b/A00通用窗体/U_YarnInfoSel.dfm @@ -3,14 +3,14 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Top = 106 Caption = #32433#32447#21517#31216#36873#25321 ClientHeight = 558 - ClientWidth = 1584 + ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -16 Font.Name = #24494#36719#38597#40657 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 1600 + ExplicitWidth = 1556 ExplicitHeight = 597 PixelsPerInch = 96 TextHeight = 21 @@ -18,7 +18,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 1 Left = 0 Top = 0 - Width = 1584 + Width = 1540 Height = 30 AutoSize = True ButtonHeight = 30 @@ -73,7 +73,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1584 + Width = 1540 Height = 44 Align = alTop BevelInner = bvRaised @@ -113,11 +113,12 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object cxGrid1: TcxGrid [2] Left = 0 Top = 74 - Width = 1584 + Width = 1540 Height = 484 Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitLeft = 1 object Tv1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/A01基础公司管理/Company.dproj.local b/A01基础公司管理/Company.dproj.local index c066df0..422bed6 100644 --- a/A01基础公司管理/Company.dproj.local +++ b/A01基础公司管理/Company.dproj.local @@ -1,44 +1,44 @@  - 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas + 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm - 1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm + 1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas + 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm 1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas + 1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas 1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.pas 1899-12-30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.175,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas 1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.dfm 1899-12-30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas 1899-12-30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas + 1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas - 1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas + 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= 1899-12-30 00:00:00.000.069,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas 1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.pas 1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas + 1899-12-30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm - 1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas 1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.dfm 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm - 1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas + 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm + 1899-12-30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas 1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas - 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= - 2025-04-23 09:44:21.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm - 2025-04-23 09:44:21.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas + 1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas + 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm + 1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas @@ -69,7 +69,7 @@ - + diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache index da2ec6e..38254fb 100644 Binary files a/A01基础公司管理/Company.identcache and b/A01基础公司管理/Company.identcache differ diff --git a/A01基础公司管理/U_Factory.dfm b/A01基础公司管理/U_Factory.dfm index ffaadf8..72e19ed 100644 --- a/A01基础公司管理/U_Factory.dfm +++ b/A01基础公司管理/U_Factory.dfm @@ -20,7 +20,7 @@ inherited frmFactory: TfrmFactory Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 115 + ButtonWidth = 83 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_Company.cxImageList_bar @@ -38,7 +38,7 @@ inherited frmFactory: TfrmFactory OnClick = TBRafreshClick end object TBFind: TToolButton - Left = 71 + Left = 63 Top = 0 AutoSize = True Caption = #36807#28388 @@ -46,7 +46,7 @@ inherited frmFactory: TfrmFactory OnClick = TBFindClick end object btnAdd: TToolButton - Left = 142 + Left = 126 Top = 0 AutoSize = True Caption = #26032#22686 @@ -54,7 +54,7 @@ inherited frmFactory: TfrmFactory OnClick = btnAddClick end object btnEdit: TToolButton - Left = 213 + Left = 189 Top = 0 AutoSize = True Caption = #20462#25913 @@ -62,23 +62,15 @@ inherited frmFactory: TfrmFactory OnClick = btnEditClick end object TBDel: TToolButton - Left = 284 + Left = 252 Top = 0 AutoSize = True Caption = #21024#38500 ImageIndex = 5 OnClick = TBDelClick end - object btnFollower: TToolButton - Left = 355 - Top = 0 - AutoSize = True - Caption = #25351#23450#36319#21333#21592 - ImageIndex = 15 - OnClick = btnFollowerClick - end object btnChk: TToolButton - Left = 474 + Left = 315 Top = 0 AutoSize = True Caption = #23457#26680 @@ -86,7 +78,7 @@ inherited frmFactory: TfrmFactory OnClick = btnChkClick end object btnReChk: TToolButton - Left = 545 + Left = 378 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -94,7 +86,7 @@ inherited frmFactory: TfrmFactory OnClick = btnReChkClick end object ToolButton8: TToolButton - Left = 648 + Left = 465 Top = 0 AutoSize = True Caption = #38468#20214 @@ -102,7 +94,7 @@ inherited frmFactory: TfrmFactory OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 719 + Left = 528 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -110,7 +102,7 @@ inherited frmFactory: TfrmFactory OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 822 + Left = 615 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/A01基础公司管理/U_Factory.pas b/A01基础公司管理/U_Factory.pas index 3e95658..d55f552 100644 --- a/A01基础公司管理/U_Factory.pas +++ b/A01基础公司管理/U_Factory.pas @@ -44,7 +44,6 @@ type DS_2: TDataSource; v2Column3: TcxGridDBColumn; v2Column4: TcxGridDBColumn; - btnFollower: TToolButton; Panel2: TPanel; GPM_1: TcxGridPopupMenu; cxGrid2: TcxGrid; @@ -112,7 +111,7 @@ uses procedure TfrmFactory.SetStatus(); begin - btnFollower.Visible := false; //ָ + //btnFollower.Visible := false; //ָ btnChk.Visible := false; // btnReChk.Visible := false; // @@ -133,7 +132,7 @@ begin if Trim(FAuthority) = '' then begin - btnFollower.Visible := true; + //btnFollower.Visible := true; btnAdd.Visible := true; ToolButton8.Visible := true; diff --git a/A02基础产品管理/ClothInfo.dproj b/A02基础产品管理/ClothInfo.dproj index 3c32212..c2b5bfc 100644 --- a/A02基础产品管理/ClothInfo.dproj +++ b/A02基础产品管理/ClothInfo.dproj @@ -124,7 +124,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\A02基础产品管理\testDll.exe + D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\testDll.exe diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 8d4d91e..863071d 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -46,9 +46,9 @@ 1899-12-30 00:00:00.000.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas 1899-12-30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas 1899-12-30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas + 1899-12-30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas - 1899-12-30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.pas 1899-12-30 00:00:00.000.217,=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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas @@ -58,7 +58,7 @@ 1899-12-30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm 1899-12-30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.pas 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj @@ -69,8 +69,8 @@ 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas diff --git a/A02基础产品管理/U_ClothInfoImport.dfm b/A02基础产品管理/U_ClothInfoImport.dfm index 930423a..380753c 100644 --- a/A02基础产品管理/U_ClothInfoImport.dfm +++ b/A02基础产品管理/U_ClothInfoImport.dfm @@ -90,11 +90,11 @@ inherited frmClothInfoImport: TfrmClothInfoImport Font.Style = [] ParentFont = False TabOrder = 1 - ExplicitTop = 37 object Tv1: TcxGridDBTableView 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] @@ -105,21 +105,18 @@ inherited frmClothInfoImport: TfrmClothInfoImport OptionsData.Deleting = False OptionsData.DeletingConfirmation = False OptionsView.GroupByBox = False - Styles.IncSearch = DataLink_ClothInfo.SHuangSe - Styles.Header = DataLink_ClothInfo.Default - Styles.Inactive = DataLink_ClothInfo.SHuangSe - Styles.Selection = DataLink_ClothInfo.SHuangSe object v1CYNo: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Styles.Header = DataLink_ClothInfo.Default Width = 92 end object v1Column9: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 96 @@ -127,6 +124,7 @@ inherited frmClothInfoImport: TfrmClothInfoImport object Tv1Column11: TcxGridDBColumn Caption = #33521#25991#21697#21517 DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -134,14 +132,15 @@ inherited frmClothInfoImport: TfrmClothInfoImport object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Styles.Header = DataLink_ClothInfo.Default Width = 66 end object v1Column1: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 @@ -149,6 +148,7 @@ inherited frmClothInfoImport: TfrmClothInfoImport object Tv1Column2: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -156,6 +156,7 @@ inherited frmClothInfoImport: TfrmClothInfoImport object Tv1Column1: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 94 @@ -163,18 +164,21 @@ inherited frmClothInfoImport: TfrmClothInfoImport object Tv1Column3: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 76 end object Tv1Column5: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 105 end object Tv1Column4: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'CINote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end diff --git a/A02基础产品管理/U_ClothInfoImport.pas b/A02基础产品管理/U_ClothInfoImport.pas index 9b27f85..32392c2 100644 --- a/A02基础产品管理/U_ClothInfoImport.pas +++ b/A02基础产品管理/U_ClothInfoImport.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxDropDownEdit, cxPC, U_BaseHelp, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, ComObj, U_BaseList, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, dxSkinsCore, dxSkinsDefaultPainters, dxScrollbarAnnotations; type TfrmClothInfoImport = class(TfrmBaseHelp) diff --git a/A02基础产品管理/U_GetDllForm.pas b/A02基础产品管理/U_GetDllForm.pas index 8d9409f..a62d270 100644 --- a/A02基础产品管理/U_GetDllForm.pas +++ b/A02基础产品管理/U_GetDllForm.pas @@ -71,10 +71,10 @@ begin if trim(DataBaseStr) = '' then begin - server := '101.132.143.144,7781'; + server := '150.109.121.232,7781'; dtbase := 'KaiXiYadata'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; + user := 'kaixiyasa'; + pswd := 'rightsoft,.KXY@YN'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DParameters1:='Ȩ'; diff --git a/A02基础产品管理/U_TatClothInfo.dfm b/A02基础产品管理/U_TatClothInfo.dfm index f6961a7..10af202 100644 --- a/A02基础产品管理/U_TatClothInfo.dfm +++ b/A02基础产品管理/U_TatClothInfo.dfm @@ -181,7 +181,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo Color = clWhite ParentBackground = False TabOrder = 6 - ExplicitTop = 34 object Label11: TLabel Left = 1072 Top = 107 @@ -728,8 +727,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo Height = 337 Align = alClient TabOrder = 1 - ExplicitLeft = 4 - ExplicitTop = 2 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -900,6 +897,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo object cxTabSheet2: TcxTabSheet Caption = #32428#19997#32452#21512 ImageIndex = 1 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object cxGrid4: TcxGrid Left = 0 Top = 0 @@ -1080,6 +1080,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo object cxTabSheet3: TcxTabSheet Caption = #26679#21697#22270#29255 ImageIndex = 2 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object GroupBox1: TGroupBox Left = 0 Top = 0 @@ -1103,6 +1106,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo object cxTabSheet4: TcxTabSheet Caption = #36215#32508#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object QZF: TMemo Tag = 2 Left = 0 @@ -1124,6 +1130,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo object cxTabSheet5: TcxTabSheet Caption = #31359#32508#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object CZF: TMemo Tag = 2 Left = 0 @@ -1145,6 +1154,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo object cxTabSheet6: TcxTabSheet Caption = #31359#31576#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object CKF: TMemo Tag = 2 Left = 0 diff --git a/A02基础产品管理/U_TatClothInfoInput.dfm b/A02基础产品管理/U_TatClothInfoInput.dfm index 966aedd..436c6ff 100644 --- a/A02基础产品管理/U_TatClothInfoInput.dfm +++ b/A02基础产品管理/U_TatClothInfoInput.dfm @@ -4,19 +4,19 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Anchors = [] Caption = #26797#32455#20135#21697#20449#24687#24405#20837 ClientHeight = 737 - ClientWidth = 1546 + ClientWidth = 1404 Color = clWhite Font.Height = -16 OldCreateOrder = True Position = poScreenCenter - ExplicitWidth = 1562 + ExplicitWidth = 1420 ExplicitHeight = 776 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] Left = 0 Top = 0 - Width = 1546 + Width = 1404 Height = 30 AutoSize = True ButtonHeight = 30 @@ -66,7 +66,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object ScrollBox1: TScrollBox [1] Left = 0 Top = 30 - Width = 1546 + Width = 1404 Height = 245 Align = alTop BevelInner = bvNone @@ -318,7 +318,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object C_ReedWidth: TcxTextEdit Tag = 2 Left = 870 - Top = 23 + Top = 24 ParentColor = True Properties.OnEditValueChanged = C_ReedWidthPropertiesEditValueChanged TabOrder = 7 @@ -449,11 +449,20 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput TabOrder = 21 Width = 220 end + object cxComboBox1: TcxComboBox + Left = 1031 + Top = 24 + Properties.Items.Strings = ( + 'CM' + 'INCH') + TabOrder = 22 + Width = 63 + end end object cxPageControl3: TcxPageControl [2] Left = 0 Top = 275 - Width = 1546 + Width = 1404 Height = 462 Align = alClient TabOrder = 2 @@ -461,7 +470,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Properties.CustomButtons.Buttons = <> Properties.Style = 9 ClientRectBottom = 462 - ClientRectRight = 1546 + ClientRectRight = 1404 ClientRectTop = 28 object cxTabSheet1: TcxTabSheet Caption = #32463#19997#32452#21512 @@ -469,7 +478,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object GroupBox1: TGroupBox Left = 931 Top = 0 - Width = 615 + Width = 473 Height = 434 Align = alClient Caption = #32463#25490#21015 @@ -484,7 +493,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Tag = 2 Left = 2 Top = 31 - Width = 611 + Width = 469 Height = 401 Align = alClient TabOrder = 0 @@ -704,7 +713,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object GroupBox2: TGroupBox Left = 961 Top = 0 - Width = 585 + Width = 443 Height = 434 Align = alClient Caption = #32428#25490#21015 @@ -719,7 +728,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Tag = 2 Left = 2 Top = 31 - Width = 581 + Width = 439 Height = 401 Align = alClient TabOrder = 0 @@ -939,7 +948,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object Panel8: TPanel Left = 0 Top = 0 - Width = 1546 + Width = 1404 Height = 32 Align = alTop TabOrder = 0 @@ -1009,7 +1018,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Tag = 2 Left = 0 Top = 32 - Width = 1546 + Width = 1404 Height = 402 Align = alClient ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 @@ -1026,7 +1035,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Tag = 2 Left = 0 Top = 0 - Width = 1546 + Width = 1404 Height = 434 Align = alClient ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 @@ -1043,7 +1052,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Tag = 2 Left = 0 Top = 0 - Width = 1546 + Width = 1404 Height = 434 Align = alClient ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 diff --git a/A02基础产品管理/U_TatClothInfoInput.pas b/A02基础产品管理/U_TatClothInfoInput.pas index a5ddda9..8654797 100644 --- a/A02基础产品管理/U_TatClothInfoInput.pas +++ b/A02基础产品管理/U_TatClothInfoInput.pas @@ -35,7 +35,7 @@ uses dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI, - dxSkinXmas2008Blue, Vcl.Menus; + dxSkinXmas2008Blue, Vcl.Menus, cxDropDownEdit; type TfrmTatClothInfoInput = class(TfrmBaseInput) @@ -172,6 +172,7 @@ type PM_2: TPopupMenu; MenuItem1: TMenuItem; QZF: TMemo; + cxComboBox1: TcxComboBox; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); diff --git a/A05基础资料管理/BaseInfo.dproj.local b/A05基础资料管理/BaseInfo.dproj.local index 2919d95..878072e 100644 --- a/A05基础资料管理/BaseInfo.dproj.local +++ b/A05基础资料管理/BaseInfo.dproj.local @@ -1,32 +1,32 @@  - 1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_MachineManage.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.dfm - 1899-12-30 00:00:00.000.144,=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.pas - 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas - 1899-12-30 00:00:00.000.251,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.pas - 1899-12-30 00:00:00.000.987,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.pas - 1899-12-30 00:00:00.000.185,D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_PositionInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.dfm - 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas - 1899-12-30 00:00:00.000.824,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.987,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.dfm + 1899-12-30 00:00:00.000.185,D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_PositionInPut.dfm + 1899-12-30 00:00:00.000.657,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_MachineManage.pas + 1899-12-30 00:00:00.000.987,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.pas + 1899-12-30 00:00:00.000.471,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKDRtInPut.pas + 1899-12-30 00:00:00.000.446,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas 1899-12-30 00:00:00.000.467,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas 1899-12-30 00:00:00.000.888,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_MachineManage.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.pas - 1899-12-30 00:00:00.000.185,D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_PositionInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.pas - 1899-12-30 00:00:00.000.471,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKDRtInPut.pas - 1899-12-30 00:00:00.000.657,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.116,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKDRList.pas - 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm - 1899-12-30 00:00:00.000.293,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm - 1899-12-30 00:00:00.000.409,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.013,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.500,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKInput.pas - 1899-12-30 00:00:00.000.987,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.dfm - 1899-12-30 00:00:00.000.369,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_Sel.dfm - 1899-12-30 00:00:00.000.446,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899-12-30 00:00:00.000.369,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_Sel.pas 1899-12-30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.251,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.dfm + 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm + 1899-12-30 00:00:00.000.824,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.251,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.pas + 1899-12-30 00:00:00.000.013,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_MachineManage.dfm + 1899-12-30 00:00:00.000.251,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_HLManage.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage.dfm + 1899-12-30 00:00:00.000.144,=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.pas + 1899-12-30 00:00:00.000.185,D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_MachineInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A05基础资料管理\U_PositionInPut.pas + 1899-12-30 00:00:00.000.409,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.116,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKDRList.pas + 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.369,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_Sel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.pas + 1899-12-30 00:00:00.000.500,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKInput.pas + 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm + 1899-12-30 00:00:00.000.293,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas + 1899-12-30 00:00:00.000.369,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_Sel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A05基础资料管理\U_GKManage_CX.dfm diff --git a/A05基础资料管理/BaseInfo.identcache b/A05基础资料管理/BaseInfo.identcache index db7c231..c2a79f5 100644 Binary files a/A05基础资料管理/BaseInfo.identcache and b/A05基础资料管理/BaseInfo.identcache differ diff --git a/A05基础资料管理/testDll.identcache b/A05基础资料管理/testDll.identcache index 81b161d..4a2f71c 100644 Binary files a/A05基础资料管理/testDll.identcache and b/A05基础资料管理/testDll.identcache differ diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index 539d28c..a4e4f0c 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -3,44 +3,45 @@ 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.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.987,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableInput.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.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.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.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.728,=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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.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.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.052,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CollectList.pas - 1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.381,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableInput.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.765,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowTotalList.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.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.659,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatement.pas + 1899-12-30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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 @@ -51,10 +52,9 @@ 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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 2025-03-01 00:27:28.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas @@ -85,7 +85,7 @@ - + diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index 810d5a7..f728346 100644 Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ diff --git a/A09财务通用管理/U_BankFlowList.dfm b/A09财务通用管理/U_BankFlowList.dfm index 1830eba..19b65de 100644 --- a/A09财务通用管理/U_BankFlowList.dfm +++ b/A09财务通用管理/U_BankFlowList.dfm @@ -5,7 +5,6 @@ inherited frmBankFlowList: TfrmBankFlowList ClientHeight = 487 ClientWidth = 1180 Font.Height = -16 - Font.Name = #24494#36719#38597#40657 FormStyle = fsMDIChild Visible = True ExplicitWidth = 1196 @@ -33,7 +32,7 @@ inherited frmBankFlowList: TfrmBankFlowList ParentColor = False ParentFont = False ShowCaptions = True - TabOrder = 0 + TabOrder = 3 object TINIT: TToolButton Left = 0 Top = 0 @@ -117,7 +116,7 @@ inherited frmBankFlowList: TfrmBankFlowList BevelOuter = bvLowered Color = clWhite ParentBackground = False - TabOrder = 1 + TabOrder = 4 object Label1: TLabel Left = 14 Top = 8 @@ -249,6 +248,7 @@ inherited frmBankFlowList: TfrmBankFlowList TabOrder = 0 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -269,10 +269,10 @@ inherited frmBankFlowList: TfrmBankFlowList OptionsView.GroupByBox = False OptionsView.Indicator = True OptionsView.IndicatorWidth = 15 - Styles.Selection = DataLink_Financial.SHuangSe object V1Column1: TcxGridDBColumn Caption = #27969#27700#21495 DataBinding.FieldName = 'BFID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Sorting = False @@ -281,6 +281,7 @@ inherited frmBankFlowList: TfrmBankFlowList object V1CRTime: TcxGridDBColumn Caption = #26085#26399 DataBinding.FieldName = 'BFTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' HeaderAlignmentHorz = taCenter Options.Sorting = False @@ -289,18 +290,21 @@ inherited frmBankFlowList: TfrmBankFlowList object V1Column2: TcxGridDBColumn Caption = #23545#26041#36134#25143 DataBinding.FieldName = 'OppBKName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 109 end object V1Column3: TcxGridDBColumn Caption = #23545#26041#21333#20301 DataBinding.FieldName = 'OppCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 85 end object V1CRType: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'BFType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Sorting = False Width = 100 @@ -308,27 +312,24 @@ inherited frmBankFlowList: TfrmBankFlowList object V1InMoney: TcxGridDBColumn Caption = #20511#26041 DataBinding.FieldName = 'InAmount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Sorting = False - Styles.Content = DataLink_Financial.FontBlue - Styles.Footer = DataLink_Financial.FontBlue - Styles.Header = DataLink_Financial.FontBlue Width = 100 end object V1OutMoney: TcxGridDBColumn Caption = #36151#26041 DataBinding.FieldName = 'OutAmount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Sorting = False - Styles.Content = DataLink_Financial.FoneRed - Styles.Footer = DataLink_Financial.FoneRed - Styles.Header = DataLink_Financial.FoneRed Width = 100 end object V1YEMoney: TcxGridDBColumn Caption = #20313#39069 DataBinding.FieldName = 'YEAmount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCurrencyEditProperties' Properties.AssignedValues.DisplayFormat = True HeaderAlignmentHorz = taCenter @@ -338,6 +339,7 @@ inherited frmBankFlowList: TfrmBankFlowList object V1NOTE: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'NOTE' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Sorting = False Width = 188 @@ -345,6 +347,7 @@ inherited frmBankFlowList: TfrmBankFlowList object V1Column4: TcxGridDBColumn Caption = #30331#35760#20154 DataBinding.FieldName = 'filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -352,6 +355,7 @@ inherited frmBankFlowList: TfrmBankFlowList object V1Column5: TcxGridDBColumn Caption = #30331#35760#26102#38388 DataBinding.FieldName = 'filltime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 56 @@ -359,6 +363,7 @@ inherited frmBankFlowList: TfrmBankFlowList object TV1Column1: TcxGridDBColumn Caption = #26469#28304 DataBinding.FieldName = 'fromID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 diff --git a/A09财务通用管理/U_BankFlowList.pas b/A09财务通用管理/U_BankFlowList.pas index 930beae..d1a5185 100644 --- a/A09财务通用管理/U_BankFlowList.pas +++ b/A09财务通用管理/U_BankFlowList.pas @@ -11,7 +11,8 @@ uses cxGrid, ToolWin, cxCalendar, cxCurrencyEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, - cxContainer, dxCore, cxDateUtils, cxMaskEdit, cxDropDownEdit; + cxContainer, dxCore, cxDateUtils, cxMaskEdit, cxDropDownEdit, dxSkinsCore, + dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar; type TfrmBankFlowList = class(TfrmBaseList) diff --git a/A09财务通用管理/U_BankFlowTotalList.dfm b/A09财务通用管理/U_BankFlowTotalList.dfm index 57c20a3..5b9c288 100644 --- a/A09财务通用管理/U_BankFlowTotalList.dfm +++ b/A09财务通用管理/U_BankFlowTotalList.dfm @@ -9,7 +9,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList ExplicitWidth = 1196 ExplicitHeight = 541 PixelsPerInch = 96 - TextHeight = 12 + TextHeight = 17 object ToolBar1: TToolBar [0] Tag = 1 Left = 0 @@ -31,7 +31,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList ParentColor = False ParentFont = False ShowCaptions = True - TabOrder = 0 + TabOrder = 3 object TINIT: TToolButton Left = 0 Top = 0 @@ -71,11 +71,10 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList Width = 1180 Height = 427 Align = alClient - TabOrder = 1 - ExplicitTop = 83 - ExplicitHeight = 419 + TabOrder = 4 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -110,6 +109,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList object TV1Column2: TcxGridDBColumn Caption = #24065#31181 DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -118,6 +118,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList object V1Column9: TcxGridDBColumn Caption = #36134#25143 DataBinding.FieldName = 'BKName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -126,6 +127,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList object V1YEMoney: TcxGridDBColumn Caption = #20313#39069 DataBinding.FieldName = 'YE' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Sorting = False @@ -134,9 +136,8 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList object TV1Column3: TcxGridDBColumn Caption = #20154#27665#24065#20313#39069 DataBinding.FieldName = 'RMBYE' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Styles.Content = DataLink_Financial.FontBlue - Styles.Header = DataLink_Financial.FontBlue Width = 91 end end @@ -155,7 +156,6 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList Color = clWhite ParentBackground = False TabOrder = 2 - ExplicitTop = 38 object Label2: TLabel Left = 205 Top = 13 @@ -199,7 +199,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList Left = 234 Top = 9 Width = 100 - Height = 20 + Height = 25 ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 TabOrder = 0 OnChange = GSTaiTouChange @@ -209,7 +209,7 @@ inherited frmBankFlowTotalList: TfrmBankFlowTotalList Left = 442 Top = 9 Width = 100 - Height = 20 + Height = 25 ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 TabOrder = 1 OnKeyPress = Edit1KeyPress diff --git a/A09财务通用管理/U_BankFlowTotalList.pas b/A09财务通用管理/U_BankFlowTotalList.pas index 4f18209..7ddfc90 100644 --- a/A09财务通用管理/U_BankFlowTotalList.pas +++ b/A09财务通用管理/U_BankFlowTotalList.pas @@ -10,7 +10,8 @@ uses cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ToolWin, cxCalendar, cxCurrencyEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxDateRanges, dxBarBuiltInMenu, U_BaseList; + dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxSkinsCore, + dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar; type TfrmBankFlowTotalList = class(TfrmBaseList) diff --git a/A09财务通用管理/U_InvoiceInInPut.dfm b/A09财务通用管理/U_InvoiceInInPut.dfm index 54bb701..592b2d4 100644 --- a/A09财务通用管理/U_InvoiceInInPut.dfm +++ b/A09财务通用管理/U_InvoiceInInPut.dfm @@ -24,14 +24,13 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' DisabledImages = DataLink_Financial.cxImageList_bar Images = DataLink_Financial.cxImageList_bar List = True ShowCaptions = True TabOrder = 0 - ExplicitTop = -6 object TSave: TToolButton Left = 0 Top = 0 @@ -41,7 +40,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OnClick = TSaveClick end object ToolButton1: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #22686#34892 @@ -49,7 +48,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OnClick = ToolButton1Click end object ToolButton2: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #21024#34892 @@ -57,7 +56,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OnClick = ToolButton2Click end object ToolButton4: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #23548#20837 @@ -65,7 +64,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OnClick = ToolButton4Click end object ToolButton3: TToolButton - Left = 252 + Left = 284 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -73,7 +72,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OnClick = ToolButton3Click end object TBClose: TToolButton - Left = 339 + Left = 387 Top = 0 AutoSize = True Caption = #20851#38381 @@ -88,11 +87,11 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut Height = 474 Align = alClient TabOrder = 1 - ExplicitTop = 29 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -122,11 +121,10 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut OptionsView.Footer = True OptionsView.GroupByBox = False OptionsView.Indicator = True - Styles.Footer = DataLink_Financial.Default - Styles.Header = DataLink_Financial.Default object Tv1Column5: TcxGridDBColumn Caption = #21457#31080#26085#26399 DataBinding.FieldName = 'IVDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' HeaderAlignmentHorz = taCenter Width = 77 @@ -134,12 +132,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object Tv1Column1: TcxGridDBColumn Caption = #21457#31080#21495#30721 DataBinding.FieldName = 'IVNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 77 end object Tv1Column2: TcxGridDBColumn Caption = #25105#26041#21333#20301 DataBinding.FieldName = 'OurCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -149,12 +149,12 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column2PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FontBlue Width = 82 end object Tv1Column4: TcxGridDBColumn Caption = #23545#26041#21333#20301 DataBinding.FieldName = 'OppCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -164,12 +164,12 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column4PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FoneClMaroon Width = 86 end object Tv1Column6: TcxGridDBColumn Caption = #19978#32423#21333#20301 DataBinding.FieldName = 'OppParentCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -179,12 +179,12 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column6PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FoneClMaroon Width = 86 end object Tv1Column3: TcxGridDBColumn Caption = #21457#31080#31867#22411 DataBinding.FieldName = 'IVType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -198,12 +198,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Column1: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object v1P_CodeName: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'F_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -217,12 +219,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1P_Spec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'F_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 103 end object v1Qty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -231,6 +235,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1QtyUnit: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -244,6 +249,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Price: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -252,6 +258,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Money: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'Amount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -260,6 +267,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Column3: TcxGridDBColumn Caption = #31246#29575'(%)' DataBinding.FieldName = 'tax' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -268,6 +276,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Column5: TcxGridDBColumn Caption = #31246#39069 DataBinding.FieldName = 'TaxFee' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 53 @@ -275,6 +284,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object v1Column4: TcxGridDBColumn Caption = #21547#31246#37329#39069 DataBinding.FieldName = 'TaxAmount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -283,6 +293,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object Tv1Column8: TcxGridDBColumn Caption = #24065#31181 DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -294,6 +305,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut object Tv1Column7: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/A09财务通用管理/U_InvoiceInInPut.pas b/A09财务通用管理/U_InvoiceInInPut.pas index d30e1cf..0d512f1 100644 --- a/A09财务通用管理/U_InvoiceInInPut.pas +++ b/A09财务通用管理/U_InvoiceInInPut.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, dxSkinsDefaultPainters, + dxScrollbarAnnotations; type TfrmInvoiceInInPut = class(TForm) diff --git a/A09财务通用管理/U_InvoiceOutInPut.dfm b/A09财务通用管理/U_InvoiceOutInPut.dfm index 7081d5f..6eef86c 100644 --- a/A09财务通用管理/U_InvoiceOutInPut.dfm +++ b/A09财务通用管理/U_InvoiceOutInPut.dfm @@ -87,12 +87,11 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut Height = 474 Align = alClient TabOrder = 1 - ExplicitTop = 38 - ExplicitHeight = 466 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -122,11 +121,10 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut OptionsView.Footer = True OptionsView.GroupByBox = False OptionsView.Indicator = True - Styles.Footer = DataLink_Financial.Default - Styles.Header = DataLink_Financial.Default object Tv1Column5: TcxGridDBColumn Caption = #21457#31080#26085#26399 DataBinding.FieldName = 'IVDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' HeaderAlignmentHorz = taCenter Width = 77 @@ -134,12 +132,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object Tv1Column1: TcxGridDBColumn Caption = #21457#31080#21495#30721 DataBinding.FieldName = 'IVNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 77 end object Tv1Column2: TcxGridDBColumn Caption = #25105#26041#21333#20301 DataBinding.FieldName = 'OurCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -149,12 +149,12 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column2PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FontBlue Width = 82 end object Tv1Column4: TcxGridDBColumn Caption = #23545#26041#21333#20301 DataBinding.FieldName = 'OppCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -164,12 +164,12 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column4PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FoneClMaroon Width = 86 end object Tv1Column6: TcxGridDBColumn Caption = #19978#32423#21333#20301 DataBinding.FieldName = 'OppParentCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -179,12 +179,12 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column6PropertiesButtonClick HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_Financial.FoneClMaroon Width = 86 end object Tv1Column3: TcxGridDBColumn Caption = #21457#31080#31867#22411 DataBinding.FieldName = 'IVType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -198,12 +198,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Column1: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object v1P_CodeName: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'F_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -217,12 +219,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1P_Spec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'F_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 103 end object v1Qty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -231,6 +235,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1QtyUnit: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -244,6 +249,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Price: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -252,6 +258,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Money: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'Amount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -260,6 +267,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Column3: TcxGridDBColumn Caption = #31246#29575'(%)' DataBinding.FieldName = 'tax' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -268,6 +276,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Column5: TcxGridDBColumn Caption = #31246#39069 DataBinding.FieldName = 'TaxFee' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 53 @@ -275,6 +284,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object v1Column4: TcxGridDBColumn Caption = #21547#31246#37329#39069 DataBinding.FieldName = 'TaxAmount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -283,6 +293,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object Tv1Column8: TcxGridDBColumn Caption = #24065#31181 DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -294,6 +305,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut object Tv1Column7: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/A09财务通用管理/U_InvoiceOutInPut.pas b/A09财务通用管理/U_InvoiceOutInPut.pas index a8f3957..c663eb0 100644 --- a/A09财务通用管理/U_InvoiceOutInPut.pas +++ b/A09财务通用管理/U_InvoiceOutInPut.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, dxSkinsDefaultPainters, + dxScrollbarAnnotations; type TfrmInvoiceOutInPut = class(TForm) diff --git a/A09财务通用管理/U_PayInput.dfm b/A09财务通用管理/U_PayInput.dfm index 2b209f3..23f6b6e 100644 --- a/A09财务通用管理/U_PayInput.dfm +++ b/A09财务通用管理/U_PayInput.dfm @@ -34,7 +34,6 @@ object frmPayInput: TfrmPayInput ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 919 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -66,9 +65,6 @@ object frmPayInput: TfrmPayInput ParentColor = False ParentCtl3D = False TabOrder = 1 - ExplicitLeft = 8 - ExplicitTop = 36 - ExplicitWidth = 1227 object Label2: TLabel Left = 283 Top = 21 diff --git a/A09财务通用管理/U_PayInput.pas b/A09财务通用管理/U_PayInput.pas index 28db2a5..f852f5f 100644 --- a/A09财务通用管理/U_PayInput.pas +++ b/A09财务通用管理/U_PayInput.pas @@ -14,7 +14,8 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, - dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit; + dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinsCore, + dxSkinsDefaultPainters; type TfrmPayInput = class(TForm) diff --git a/A09财务通用管理/U_PayableInput.dfm b/A09财务通用管理/U_PayableInput.dfm index 328fad3..9d65f6e 100644 --- a/A09财务通用管理/U_PayableInput.dfm +++ b/A09财务通用管理/U_PayableInput.dfm @@ -66,8 +66,6 @@ object frmPayableInput: TfrmPayableInput ParentCtl3D = False TabOrder = 1 OnClick = ScrollBox1Click - ExplicitTop = 37 - ExplicitHeight = 324 object Label2: TLabel Left = 266 Top = 18 diff --git a/A09财务通用管理/U_PayableInput.pas b/A09财务通用管理/U_PayableInput.pas index 5cfda85..0acf531 100644 --- a/A09财务通用管理/U_PayableInput.pas +++ b/A09财务通用管理/U_PayableInput.pas @@ -14,7 +14,8 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, - dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit; + dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinsCore, + dxSkinsDefaultPainters; type TfrmPayableInput = class(TForm) diff --git a/A09财务通用管理/testDll.identcache b/A09财务通用管理/testDll.identcache index 1929fd1..96b7346 100644 Binary files a/A09财务通用管理/testDll.identcache and b/A09财务通用管理/testDll.identcache differ diff --git a/B01基础合同管理/Contract.dproj.local b/B01基础合同管理/Contract.dproj.local index c2818d8..9a644bd 100644 --- a/B01基础合同管理/Contract.dproj.local +++ b/B01基础合同管理/Contract.dproj.local @@ -41,15 +41,15 @@ 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas= - 1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= + 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= - 1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= + 1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas= @@ -60,7 +60,7 @@ 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas - 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas @@ -110,7 +110,7 @@ - + diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index f4c05e9..7509c69 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -201,7 +201,7 @@ var IniFile: TIniFile; begin try - IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SYSTEMSET.INI'); + IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + '.INI'); PicSvr := IniFile.ReadString('SERVER', 'ַ', '127.0.0.1'); UserDataFlag := IniFile.ReadString('SERVER', 'ַ', '-1'); finally diff --git a/B01基础合同管理/U_PurchaseContractList.dfm b/B01基础合同管理/U_PurchaseContractList.dfm index 443cfe1..b739fe2 100644 --- a/B01基础合同管理/U_PurchaseContractList.dfm +++ b/B01基础合同管理/U_PurchaseContractList.dfm @@ -784,7 +784,7 @@ inherited frmPurchaseContractList: TfrmPurchaseContractList Width = 70 end object v1Column6: TcxGridDBColumn - Caption = #19978#26426#38376#24133 + Caption = #38376#24133 DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm index ff39010..238b87c 100644 --- a/B01基础合同管理/U_SalesConInPut.dfm +++ b/B01基础合同管理/U_SalesConInPut.dfm @@ -70,6 +70,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut ParentColor = False ParentCtl3D = False TabOrder = 1 + ExplicitLeft = 1 object Label3: TLabel Left = 330 Top = 118 @@ -920,30 +921,16 @@ inherited frmSalesConInPut: TfrmSalesConInPut Width = 77 end object v1Column6: TcxGridDBColumn - Caption = #19978#26426#38376#24133 + Caption = #38376#24133 DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = v1Column6PropertiesButtonClick HeaderAlignmentHorz = taCenter - Width = 86 + Width = 66 end object v1Column7: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = v1Column7PropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 70 end @@ -974,8 +961,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut Caption = #21333#20215 DataBinding.FieldName = 'ConPrice' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = ',0.00;-,0.00' HeaderAlignmentHorz = taCenter Options.Sorting = False Width = 70 @@ -984,7 +971,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut Caption = #37329#39069 DataBinding.FieldName = 'ConTotalAmount' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = ',0.00;-,0.00' HeaderAlignmentHorz = taCenter Width = 84 end @@ -1066,8 +1054,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut end object DS_1: TDataSource DataSet = Order_Sub - Left = 764 - Top = 452 + Left = 695 + Top = 395 end object Order_Sub: TClientDataSet Aggregates = <> diff --git a/B01基础合同管理/U_SalesConInPut.pas b/B01基础合同管理/U_SalesConInPut.pas index 3dba27d..6ecf9d6 100644 --- a/B01基础合同管理/U_SalesConInPut.pas +++ b/B01基础合同管理/U_SalesConInPut.pas @@ -31,7 +31,7 @@ uses dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue, dxScrollbarAnnotations, - dxCore, cxDateUtils, cxImageList; + dxCore, cxDateUtils, cxImageList, cxCurrencyEdit; type TfrmSalesConInPut = class(TfrmBaseInput) @@ -317,8 +317,6 @@ begin raise Exception.Create('ԷλΪգ'); if Trim(ConType.Text) = '' then raise Exception.Create('ͲΪգ'); - if Order_Sub.IsEmpty then - raise Exception.Create('ϸΪգ'); if Order_Sub.Locate('C_Code', null, []) then raise Exception.Create('ƷŲΪգ'); if Order_Sub.Locate('C_Code', '', []) then @@ -865,7 +863,7 @@ begin end; end; -procedure TfrmSalesConInPut.ToolButton1Click(Sender: TObject); +procedure TfrmSalesConInPut.ToolButton1Click(Sender: TObject);// var i: Integer; maxno: string; @@ -1269,7 +1267,7 @@ begin Order_Sub.fieldbyname('C_Pattern').Value := frmTatClothInfoSel.CDS_1.fieldbyname('C_Pattern').asstring; Order_Sub.fieldbyname('C_StyleNo').Value := frmTatClothInfoSel.CDS_1.fieldbyname('C_StyleNo').asstring; - Order_Sub.fieldbyname('C_Width').Value := frmTatClothInfoSel.CDS_1.fieldbyname('C_Width').asstring; + Order_Sub.fieldbyname('C_Width').Value := frmTatClothInfoSel.CDS_1.fieldbyname('C_ReedWidth').asstring; Order_Sub.fieldbyname('C_GramWeight').Value := frmTatClothInfoSel.CDS_1.fieldbyname('C_GramWeight').asstring; Order_Sub.fieldbyname('AttName').Value := frmTatClothInfoSel.CDS_1.fieldbyname('AttName').asstring; diff --git a/B01基础合同管理/U_SalesContractList.dfm b/B01基础合同管理/U_SalesContractList.dfm index d6f935b..74acebe 100644 --- a/B01基础合同管理/U_SalesContractList.dfm +++ b/B01基础合同管理/U_SalesContractList.dfm @@ -3,12 +3,12 @@ inherited frmSalesContractList: TfrmSalesContractList Top = 116 Caption = #38144#21806#21512#21516 ClientHeight = 771 - ClientWidth = 1784 + ClientWidth = 1540 Font.Height = -16 FormStyle = fsMDIChild Visible = True - ExplicitLeft = -210 - ExplicitWidth = 1800 + ExplicitLeft = -118 + ExplicitWidth = 1556 ExplicitHeight = 810 PixelsPerInch = 96 TextHeight = 21 @@ -16,9 +16,8 @@ inherited frmSalesContractList: TfrmSalesContractList Tag = 1 Left = 0 Top = 0 - Width = 1784 + Width = 1540 Height = 30 - AutoSize = True ButtonHeight = 30 ButtonWidth = 107 Caption = 'ToolBar1' @@ -183,13 +182,11 @@ inherited frmSalesContractList: TfrmSalesContractList object cxGrid1: TcxGrid [1] Left = 0 Top = 157 - Width = 1784 + Width = 1540 Height = 336 Align = alClient PopupMenu = pm1 TabOrder = 3 - ExplicitLeft = -1 - ExplicitTop = 159 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -461,7 +458,7 @@ inherited frmSalesContractList: TfrmSalesContractList object Panel1: TPanel [2] Left = 0 Top = 30 - Width = 1784 + Width = 1540 Height = 91 Align = alTop BevelInner = bvRaised @@ -565,7 +562,7 @@ inherited frmSalesContractList: TfrmSalesContractList object cxTabControl1: TcxTabControl [3] Left = 0 Top = 121 - Width = 1784 + Width = 1540 Height = 36 Align = alTop TabOrder = 2 @@ -583,13 +580,13 @@ inherited frmSalesContractList: TfrmSalesContractList OnChange = cxTabControl1Change ClientRectBottom = 34 ClientRectLeft = 2 - ClientRectRight = 1782 + ClientRectRight = 1538 ClientRectTop = 30 end object cxSplitter1: TcxSplitter [4] Left = 0 Top = 493 - Width = 1784 + Width = 1540 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -597,7 +594,7 @@ inherited frmSalesContractList: TfrmSalesContractList object Panel2: TPanel [5] Left = 0 Top = 501 - Width = 1784 + Width = 1540 Height = 270 Align = alBottom Caption = 'Panel2' @@ -605,7 +602,7 @@ inherited frmSalesContractList: TfrmSalesContractList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 1527 + Width = 1283 Height = 268 Align = alClient BorderStyle = cxcbsNone @@ -742,7 +739,7 @@ inherited frmSalesContractList: TfrmSalesContractList Width = 70 end object v1Column6: TcxGridDBColumn - Caption = #19978#26426#38376#24133 + Caption = #38376#24133 DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' @@ -753,7 +750,7 @@ inherited frmSalesContractList: TfrmSalesContractList end> HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 106 + Width = 71 end object v1Column7: TcxGridDBColumn Caption = #20811#37325 @@ -849,7 +846,7 @@ inherited frmSalesContractList: TfrmSalesContractList end end object Picture4: TcxDBImage - Left = 1528 + Left = 1284 Top = 1 Hint = 'FileName' Align = alRight @@ -989,4 +986,11 @@ inherited frmSalesContractList: TfrmSalesContractList Left = 1271 Top = 209 end + object Order_Sub: TClientDataSet + Aggregates = <> + IndexFieldNames = 'SerialNo' + Params = <> + Left = 748 + Top = 524 + end end diff --git a/B01基础合同管理/U_SalesContractList.pas b/B01基础合同管理/U_SalesContractList.pas index 941317a..73394fb 100644 --- a/B01基础合同管理/U_SalesContractList.pas +++ b/B01基础合同管理/U_SalesContractList.pas @@ -142,6 +142,7 @@ type Tv1Column13: TcxGridDBColumn; Tv1Column15: TcxGridDBColumn; Tv1Column16: TcxGridDBColumn; + Order_Sub: TClientDataSet; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -1062,6 +1063,8 @@ begin application.MessageBox('ѡ', 'ʾ'); Exit; end; + if Order_Sub.IsEmpty then + raise Exception.Create('ϸΪգ'); with CDS_1 do begin DisableControls; diff --git a/B02基础纱线仓库/ProjectGroup1.groupproj.local b/B02基础纱线仓库/ProjectGroup1.groupproj.local index 1c43418..2df6bec 100644 --- a/B02基础纱线仓库/ProjectGroup1.groupproj.local +++ b/B02基础纱线仓库/ProjectGroup1.groupproj.local @@ -2,6 +2,6 @@ - + diff --git a/B02基础纱线仓库/U_YarnInEdit.dfm b/B02基础纱线仓库/U_YarnInEdit.dfm index 5add6f2..a967ac7 100644 --- a/B02基础纱线仓库/U_YarnInEdit.dfm +++ b/B02基础纱线仓库/U_YarnInEdit.dfm @@ -3,13 +3,13 @@ inherited frmYarnInEdit: TfrmYarnInEdit Top = 126 Caption = #32433#32447#20837#24211 ClientHeight = 463 - ClientWidth = 1595 + ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 1611 + ExplicitWidth = 1556 ExplicitHeight = 502 PixelsPerInch = 96 TextHeight = 21 @@ -17,7 +17,7 @@ inherited frmYarnInEdit: TfrmYarnInEdit Tag = 2 Left = 0 Top = 30 - Width = 1595 + Width = 1540 Height = 433 Align = alClient TabOrder = 0 @@ -113,7 +113,7 @@ inherited frmYarnInEdit: TfrmYarnInEdit Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column10PropertiesButtonClick HeaderAlignmentHorz = taCenter - Width = 149 + Width = 130 end object Tv1Column1: TcxGridDBColumn Caption = #23384#25918#21333#20301 @@ -277,7 +277,7 @@ inherited frmYarnInEdit: TfrmYarnInEdit Tag = 1 Left = 0 Top = 0 - Width = 1595 + Width = 1540 Height = 30 AutoSize = True ButtonHeight = 30 diff --git a/B02基础纱线仓库/U_YarnInList.dfm b/B02基础纱线仓库/U_YarnInList.dfm index b96ef2a..6e3dab6 100644 --- a/B02基础纱线仓库/U_YarnInList.dfm +++ b/B02基础纱线仓库/U_YarnInList.dfm @@ -3,10 +3,9 @@ inherited frmYarnInList: TfrmYarnInList Top = 111 Caption = #32433#32447#20837#24211#21015#34920 ClientHeight = 640 - ClientWidth = 1855 + ClientWidth = 1540 Font.Height = -16 - ExplicitLeft = -385 - ExplicitWidth = 1871 + ExplicitWidth = 1556 ExplicitHeight = 679 PixelsPerInch = 96 TextHeight = 21 @@ -14,9 +13,8 @@ inherited frmYarnInList: TfrmYarnInList Tag = 1 Left = 0 Top = 0 - Width = 1855 + Width = 1540 Height = 30 - AutoSize = True ButtonHeight = 30 ButtonWidth = 131 Caption = 'ToolBar1' @@ -83,9 +81,16 @@ inherited frmYarnInList: TfrmYarnInList Visible = False OnClick = ToolButton5Click end - object ToolButton3: TToolButton + object ToolButton6: TToolButton Left = 474 Top = 0 + Caption = #38468#20214 + ImageIndex = 22 + OnClick = ToolButton6Click + end + object ToolButton3: TToolButton + Left = 605 + Top = 0 AutoSize = True Caption = #23454#27979'D'#25968 ImageIndex = 3 @@ -93,7 +98,7 @@ inherited frmYarnInList: TfrmYarnInList OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 555 + Left = 686 Top = 0 AutoSize = True Caption = #25171#21360 @@ -101,7 +106,7 @@ inherited frmYarnInList: TfrmYarnInList OnClick = ToolButton2Click end object TBDel: TToolButton - Left = 618 + Left = 749 Top = 0 AutoSize = True Caption = #21024#38500 @@ -109,7 +114,7 @@ inherited frmYarnInList: TfrmYarnInList OnClick = TBDelClick end object TBExport: TToolButton - Left = 681 + Left = 812 Top = 0 AutoSize = True Caption = #23548#20986 @@ -117,7 +122,7 @@ inherited frmYarnInList: TfrmYarnInList OnClick = TBExportClick end object ToolButton1: TToolButton - Left = 744 + Left = 875 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -125,7 +130,7 @@ inherited frmYarnInList: TfrmYarnInList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 831 + Left = 962 Top = 0 AutoSize = True Caption = #20851#38381 @@ -136,7 +141,7 @@ inherited frmYarnInList: TfrmYarnInList object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1855 + Width = 1540 Height = 118 Align = alTop BevelInner = bvRaised @@ -259,7 +264,7 @@ inherited frmYarnInList: TfrmYarnInList inline Frame11: TfrmFrameDateSel Left = 2 Top = 2 - Width = 1851 + Width = 1536 Height = 37 Align = alTop Color = clWhite @@ -268,7 +273,7 @@ inherited frmYarnInList: TfrmYarnInList TabOrder = 6 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 1851 + ExplicitWidth = 1536 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -302,13 +307,11 @@ inherited frmYarnInList: TfrmYarnInList object cxGrid1: TcxGrid [2] Left = 0 Top = 148 - Width = 1855 + Width = 1540 Height = 492 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitLeft = -2 - ExplicitTop = 143 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -581,16 +584,16 @@ inherited frmYarnInList: TfrmYarnInList end end inherited loadProcess: TPanel - Left = 395 - Top = 255 - ExplicitLeft = 395 - ExplicitTop = 255 + Left = 344 + Top = 267 + ExplicitLeft = 344 + ExplicitTop = 267 end inherited cxProgressBar2: TcxProgressBar - Left = 387 - Top = 314 - ExplicitLeft = 387 - ExplicitTop = 314 + Left = 339 + Top = 335 + ExplicitLeft = 339 + ExplicitTop = 335 ExplicitHeight = 29 end inherited ADOQueryBaseCmd: TADOQuery diff --git a/B02基础纱线仓库/U_YarnInList.pas b/B02基础纱线仓库/U_YarnInList.pas index cb1619d..cd87b98 100644 --- a/B02基础纱线仓库/U_YarnInList.pas +++ b/B02基础纱线仓库/U_YarnInList.pas @@ -101,6 +101,7 @@ type ToolButton5: TToolButton; Tv1Column16: TcxGridDBColumn; Tv1Column17: TcxGridDBColumn; + ToolButton6: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -124,6 +125,7 @@ type procedure ToolButton4Click(Sender: TObject); procedure BYIOIDPropertiesChange(Sender: TObject); procedure ToolButton5Click(Sender: TObject); + procedure ToolButton6Click(Sender: TObject); private canshu1, FStkName, canshu3: string; procedure InitGrid(); @@ -138,7 +140,7 @@ implementation uses U_DataLink, U_RTFun, U_YarnInEdit, U_LabelPrint, U_YarnOutReturnList, - U_YarnOutReturnList1; + U_YarnOutReturnList1, U_AttachmentUpload; {$R *.dfm} procedure TfrmYarnInList.setStatus(); @@ -336,6 +338,27 @@ begin end; +procedure TfrmYarnInList.ToolButton6Click(Sender: TObject); // +begin + try + frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); + with frmAttachmentUpload do + begin + FEditAuthority := True; + fkeyNO := Trim(CDS_Main.fieldbyname('BYIOID').AsString); + fType := 'ɴ'; + if ShowModal = 1 then + begin + + end; + end; + finally + frmAttachmentUpload.Free; + end; + + +end; + procedure TfrmYarnInList.BYIOIDPropertiesChange(Sender: TObject); begin TBFind.Click; diff --git a/B02基础纱线仓库/U_YarnInfoInPut.dfm b/B02基础纱线仓库/U_YarnInfoInPut.dfm index 142145b..31d5d40 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.dfm +++ b/B02基础纱线仓库/U_YarnInfoInPut.dfm @@ -77,7 +77,6 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentCtl3D = False ParentFont = False TabOrder = 1 - ExplicitTop = 36 object Label2: TLabel Left = 16 Top = 159 @@ -361,6 +360,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut Top = 155 ParentColor = True ParentFont = False + Properties.OnChange = FFPropertiesChange Style.Font.Charset = GB2312_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -16 @@ -391,6 +391,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut Top = 112 ParentColor = True ParentFont = False + Properties.OnChange = ZSPropertiesChange Properties.OnEditValueChanged = ZSPropertiesEditValueChanged Style.Font.Charset = GB2312_CHARSET Style.Font.Color = clWindowText @@ -431,6 +432,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end> Properties.ReadOnly = True Properties.OnButtonClick = ParentCoNamePropertiesButtonClick + Properties.OnChange = Y_ColorPropertiesChange Style.Font.Charset = GB2312_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -16 @@ -479,6 +481,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end> Properties.ReadOnly = True Properties.OnButtonClick = ParentCoNamePropertiesButtonClick + Properties.OnChange = Y_CompositionPropertiesChange Style.Font.Charset = GB2312_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -16 @@ -516,8 +519,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object CJ: TcxButtonEdit Tag = 2 - Left = 68 - Top = 286 + Left = 69 + Top = 288 ParentFont = False Properties.Buttons = < item @@ -526,6 +529,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end> Properties.ReadOnly = True Properties.OnButtonClick = CJPropertiesButtonClick + Properties.OnChange = CJPropertiesChange Style.Font.Charset = GB2312_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -16 diff --git a/B02基础纱线仓库/U_YarnInfoInPut.pas b/B02基础纱线仓库/U_YarnInfoInPut.pas index 4e2194e..593329c 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.pas +++ b/B02基础纱线仓库/U_YarnInfoInPut.pas @@ -88,9 +88,15 @@ type procedure ParentCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Y_ColorDblClick(Sender: TObject); procedure CJPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Y_CompositionPropertiesChange(Sender: TObject); + procedure ZSPropertiesChange(Sender: TObject); + procedure Y_ColorPropertiesChange(Sender: TObject); + procedure FFPropertiesChange(Sender: TObject); + procedure CJPropertiesChange(Sender: TObject); private { Private declarations } function SaveData(): Boolean; + procedure UpdateYarnName; public { Public declarations } FBYIID, FSTKName: string; @@ -116,7 +122,7 @@ begin if ShowModal = 1 then begin - self.CJ.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoName').AsString); + self.CJ.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); end; end; finally @@ -124,6 +130,12 @@ begin end; end; +procedure TfrmYarnInfoInPut.CJPropertiesChange(Sender: TObject); +begin + UpdateYarnName; + +end; + procedure TfrmYarnInfoInPut.DenierClick(Sender: TObject); begin ZS.Style.Color := clMoneyGreen; @@ -139,6 +151,11 @@ begin ZS.text := floattostr(roundfloat(5315.5 / strtofloatdef(Denier.text, 0), 0)); end; +procedure TfrmYarnInfoInPut.FFPropertiesChange(Sender: TObject); //ķ +begin + UpdateYarnName; +end; + procedure TfrmYarnInfoInPut.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -282,6 +299,18 @@ begin TcxButtonEdit(Sender).Properties.LookupItems.Text := ''; end; +procedure TfrmYarnInfoInPut.Y_ColorPropertiesChange(Sender: TObject); //ɫ +begin + UpdateYarnName; + +end; + +procedure TfrmYarnInfoInPut.Y_CompositionPropertiesChange(Sender: TObject); //ɷ +begin + UpdateYarnName; + +end; + procedure TfrmYarnInfoInPut.ParentCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); var fsj: string; @@ -371,10 +400,21 @@ begin Denier.Style.Color := clWhite; end; +procedure TfrmYarnInfoInPut.ZSPropertiesChange(Sender: TObject); +begin + UpdateYarnName; +end; procedure TfrmYarnInfoInPut.ZSPropertiesEditValueChanged(Sender: TObject); begin Denier.text := floattostr(roundfloat(5315.5 / strtofloatdef(ZS.text, 0), 0)); end; + +procedure TfrmYarnInfoInPut.UpdateYarnName; +begin + Y_Name.Text := Trim(Y_Composition.Text) + Trim(ZS.Text) + + Trim(Y_Color.Text) + Trim(FF.Text) + Trim(CJ.Text); +end; + end. diff --git a/B02基础纱线仓库/U_YarnInfoList.dfm b/B02基础纱线仓库/U_YarnInfoList.dfm index 5fea1f3..9ba6100 100644 --- a/B02基础纱线仓库/U_YarnInfoList.dfm +++ b/B02基础纱线仓库/U_YarnInfoList.dfm @@ -31,7 +31,6 @@ inherited frmYarnInfoList: TfrmYarnInfoList ParentFont = False ShowCaptions = True TabOrder = 3 - ExplicitWidth = 1256 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -145,7 +144,6 @@ inherited frmYarnInfoList: TfrmYarnInfoList Color = clWhite ParentBackground = False TabOrder = 4 - ExplicitWidth = 1256 object Label2: TLabel Left = 226 Top = 10 @@ -216,7 +214,7 @@ inherited frmYarnInfoList: TfrmYarnInfoList Height = 483 Align = alClient TabOrder = 2 - ExplicitWidth = 1256 + ExplicitLeft = 1 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/B02基础纱线仓库/U_YarnInfoList.pas b/B02基础纱线仓库/U_YarnInfoList.pas index 6047c11..9cb3f3a 100644 --- a/B02基础纱线仓库/U_YarnInfoList.pas +++ b/B02基础纱线仓库/U_YarnInfoList.pas @@ -333,7 +333,7 @@ begin end; -procedure TfrmYarnInfoList.TBAddClick(Sender: TObject); +procedure TfrmYarnInfoList.TBAddClick(Sender: TObject); // begin try frmYarnInfoInPut := TfrmYarnInfoInPut.Create(Application); diff --git a/B02基础纱线仓库/U_testdll.dfm b/B02基础纱线仓库/U_testdll.dfm index 46765a7..55b5ad1 100644 --- a/B02基础纱线仓库/U_testdll.dfm +++ b/B02基础纱线仓库/U_testdll.dfm @@ -58,16 +58,16 @@ object Form1: TForm1 end end object MainMenu1: TMainMenu - Left = 232 - Top = 40 + Left = 176 + Top = 68 object test1: TMenuItem Caption = 'test' OnClick = test1Click end end object ImageList1: TImageList - Left = 320 - Top = 56 + Left = 239 + Top = 66 Bitmap = { 494C010101000400040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600 0000000000003600000028000000400000001000000001002000000000000010 @@ -214,7 +214,7 @@ object Form1: TForm1 'ID=sa;Initial Catalog=rzdata;Data Source=6GMFFMYKYMJDZW7' LoginPrompt = False Provider = 'SQLOLEDB.1' - Left = 408 - Top = 64 + Left = 330 + Top = 69 end end diff --git a/B02基础纱线仓库/YarnStk.dproj b/B02基础纱线仓库/YarnStk.dproj index f4840d3..7884c41 100644 --- a/B02基础纱线仓库/YarnStk.dproj +++ b/B02基础纱线仓库/YarnStk.dproj @@ -124,7 +124,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\B02基础纱线仓库\testDll.exe + D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\testDll.exe diff --git a/B02基础纱线仓库/YarnStk.dproj.local b/B02基础纱线仓库/YarnStk.dproj.local index d7ab8fc..d873628 100644 --- a/B02基础纱线仓库/YarnStk.dproj.local +++ b/B02基础纱线仓库/YarnStk.dproj.local @@ -1,92 +1,92 @@  - 1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas 1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas - 1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas - 1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm - 1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas= - 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj - 1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas - 1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm - 1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas + 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas + 1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas + 1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas + 1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm + 1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm + 1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm + 1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas= + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas - 1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas - 1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm + 1899-12-30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas= + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas + 1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas 1899-12-30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas 1899-12-30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas - 1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas 1899-12-30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas= + 1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas + 1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas - 1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas - 1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm - 1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm + 1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm + 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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas 1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas - 1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas + 1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas + 1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas + 1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm 1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas - 1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas - 1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas= - 1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas - 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj + 1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm - 1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas - 1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas= + 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas + 1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.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.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas 1899-12-30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas + 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas - 1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm - 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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm + 1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas + 1899-12-30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas + 1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas + 1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm + 1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas + 1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas + 1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas= 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas - 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm - 1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas - 1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas - 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas - 1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm - 1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas + 1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas + 1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas 1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas - 1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas + 1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm + 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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm @@ -117,7 +117,7 @@ - + diff --git a/B02基础纱线仓库/YarnStk.identcache b/B02基础纱线仓库/YarnStk.identcache index e92dcf6..16c8a7b 100644 Binary files a/B02基础纱线仓库/YarnStk.identcache and b/B02基础纱线仓库/YarnStk.identcache differ diff --git a/B04采购计划管理/ProjectGroup1.groupproj b/B04采购计划管理/ProjectGroup1.groupproj index c170817..07054d7 100644 --- a/B04采购计划管理/ProjectGroup1.groupproj +++ b/B04采购计划管理/ProjectGroup1.groupproj @@ -6,6 +6,9 @@ + + + Default.Personality.12 @@ -23,14 +26,23 @@ + + + + + + + + + - + - + - + diff --git a/B04采购计划管理/ProjectGroup1.groupproj.local b/B04采购计划管理/ProjectGroup1.groupproj.local index 9b32477..31d9cff 100644 --- a/B04采购计划管理/ProjectGroup1.groupproj.local +++ b/B04采购计划管理/ProjectGroup1.groupproj.local @@ -1,6 +1,6 @@  - + diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local index b5184a5..f006339 100644 --- a/B04采购计划管理/PurchasePlan.dproj.local +++ b/B04采购计划管理/PurchasePlan.dproj.local @@ -1,51 +1,51 @@  - 1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas - 1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= - 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas + 1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas + 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm + 1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas + 1899-12-30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas - 1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas 1899-12-30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas + 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj + 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.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj - 1899-12-30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 2025-04-23 14:43:20.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas + 1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas @@ -76,7 +76,7 @@ - + diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache index 3d22d0f..64f41b5 100644 Binary files a/B04采购计划管理/PurchasePlan.identcache and b/B04采购计划管理/PurchasePlan.identcache differ diff --git a/B04采购计划管理/U_YarnPurchasePlanDetailList.dfm b/B04采购计划管理/U_YarnPurchasePlanDetailList.dfm index 9a9dbcc..e2db8c4 100644 --- a/B04采购计划管理/U_YarnPurchasePlanDetailList.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanDetailList.dfm @@ -71,7 +71,7 @@ inherited frmYarnPurchasePlanDetailList: TfrmYarnPurchasePlanDetailList BevelOuter = bvLowered Color = clWhite ParentBackground = False - TabOrder = 1 + TabOrder = 5 object Label4: TLabel Left = 452 Top = 45 @@ -137,8 +137,12 @@ inherited frmYarnPurchasePlanDetailList: TfrmYarnPurchasePlanDetailList ExplicitLeft = 2 ExplicitTop = 2 ExplicitWidth = 1360 - inherited cbbType: TcxComboBox - ExplicitHeight = 29 + ExplicitHeight = 37 + inherited lbl2: TLabel + Width = 16 + Height = 21 + ExplicitWidth = 16 + ExplicitHeight = 21 end end object Y_Name: TcxTextEdit @@ -378,7 +382,7 @@ inherited frmYarnPurchasePlanDetailList: TfrmYarnPurchasePlanDetailList Top = 254 ExplicitLeft = 485 ExplicitTop = 254 - ExplicitHeight = 28 + ExplicitHeight = 29 end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_PurchasePlan.ADOLink diff --git a/B04采购计划管理/U_YarnPurchasePlanDetailList.pas b/B04采购计划管理/U_YarnPurchasePlanDetailList.pas index af478f4..9b1d4e3 100644 --- a/B04采购计划管理/U_YarnPurchasePlanDetailList.pas +++ b/B04采购计划管理/U_YarnPurchasePlanDetailList.pas @@ -13,23 +13,8 @@ uses cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd, - dxScrollbarAnnotations, FrameDateSel, cxContainer, - - - - - - - - - - - - - - - - cxProgressBar; + dxScrollbarAnnotations, FrameDateSel, cxContainer, + cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters; type TfrmYarnPurchasePlanDetailList = class(TfrmBaseList) diff --git a/B04采购计划管理/U_YarnPurchasePlanList.dfm b/B04采购计划管理/U_YarnPurchasePlanList.dfm index 50a708c..41d52ba 100644 --- a/B04采购计划管理/U_YarnPurchasePlanList.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanList.dfm @@ -182,7 +182,6 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Align = alClient PopupMenu = pm1 TabOrder = 3 - ExplicitHeight = 297 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -496,7 +495,6 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom - ExplicitTop = 465 end inherited cxProgressBar2: TcxProgressBar Left = 391 @@ -702,6 +700,13 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Options.Editing = False Width = 90 end + object d: TcxGridDBColumn + Caption = #24065#31181 + DataBinding.FieldName = 'currency' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + end object cxGridDBColumn7: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'SDlyDate' diff --git a/B04采购计划管理/U_YarnPurchasePlanList.pas b/B04采购计划管理/U_YarnPurchasePlanList.pas index b09bcd2..661e0a9 100644 --- a/B04采购计划管理/U_YarnPurchasePlanList.pas +++ b/B04采购计划管理/U_YarnPurchasePlanList.pas @@ -112,6 +112,7 @@ type cxGridDBColumn7: TcxGridDBColumn; v1Column2: TcxGridDBColumn; cxGridLevel1: TcxGridLevel; + d: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -998,7 +999,7 @@ begin end; -procedure TfrmYarnPurchasePlanList.ToolButton5Click(Sender: TObject); +procedure TfrmYarnPurchasePlanList.ToolButton5Click(Sender: TObject); // begin if CDS_1.IsEmpty then Exit; diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.dfm b/B04采购计划管理/U_YarnPurchasePlanPut.dfm index d89d98d..c19357c 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanPut.dfm @@ -64,7 +64,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 115 + ButtonWidth = 95 Caption = 'ToolBar1' Color = clBtnFace DisabledImages = DataLink_PurchasePlan.cxImageList_bar @@ -75,6 +75,8 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut ParentColor = False ShowCaptions = True TabOrder = 1 + ExplicitLeft = -2 + ExplicitTop = 157 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -84,15 +86,21 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut OnClick = ToolButton1Click end object ToolButton4: TToolButton - Left = 103 + Left = 87 Top = 0 AutoSize = True Caption = #26426#29289#26009#26723#26696 ImageIndex = 2 OnClick = ToolButton4Click end + object ToolButton5: TToolButton + Left = 186 + Top = 0 + Caption = #38144#21806#21512#21516 + ImageIndex = 2 + end object ToolButton2: TToolButton - Left = 222 + Left = 281 Top = 0 AutoSize = True Caption = #21024#34892 @@ -308,6 +316,17 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Options.Editing = False Width = 90 end + object Tv1Column4: TcxGridDBColumn + Caption = #24065#31181 + DataBinding.FieldName = 'currency' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + 'USD' + 'RMB' + 'VND') + HeaderAlignmentHorz = taCenter + end object Tv1Column3: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'SDlyDate' @@ -689,8 +708,8 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut object CDS_2: TClientDataSet Aggregates = <> Params = <> - Left = 708 - Top = 468 + Left = 824 + Top = 465 end object GPM_2: TcxGridPopupMenu PopupMenus = <> diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.pas b/B04采购计划管理/U_YarnPurchasePlanPut.pas index a9d9769..7d67201 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.pas +++ b/B04采购计划管理/U_YarnPurchasePlanPut.pas @@ -86,6 +86,8 @@ type Label2: TLabel; ShuiLv: TcxTextEdit; ToolButton4: TToolButton; + Tv1Column4: TcxGridDBColumn; + ToolButton5: TToolButton; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/E01梭织生产计划/TatPlan.dproj.local b/E01梭织生产计划/TatPlan.dproj.local index e5c99de..a208ec0 100644 --- a/E01梭织生产计划/TatPlan.dproj.local +++ b/E01梭织生产计划/TatPlan.dproj.local @@ -4,19 +4,19 @@ 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas= 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas 1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm 1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm - 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.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.pas 1899-12-30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj - 1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas= 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas= - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas @@ -36,14 +36,14 @@ 1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas 1899-12-30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas 1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm - 1899-12-30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas 1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm 1899-12-30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas 1899-12-30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas 1899-12-30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas diff --git a/E01梭织生产计划/TatPlan.identcache b/E01梭织生产计划/TatPlan.identcache index 1fc5d7a..7656ab2 100644 Binary files a/E01梭织生产计划/TatPlan.identcache and b/E01梭织生产计划/TatPlan.identcache differ