From 21df23ddfa822d444caabd28acaacf104284795f Mon Sep 17 00:00:00 2001 From: funa <1559646174@qq.com> Date: Sat, 12 Sep 2026 17:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=20=E6=A3=80=E9=AA=8C=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- A01基础公司管理/Company.dpr | 5 +- A01基础公司管理/Company.dproj | 57 +-- A01基础公司管理/Company.res | Bin 1472 -> 1472 bytes A01基础公司管理/U_DataLink.pas | 2 +- A01基础公司管理/U_EmployeeInPut.dfm | 18 +- A01基础公司管理/U_EmployeeInPut.pas | 3 +- A01基础公司管理/U_EmployeeList.dfm | 20 +- A01基础公司管理/U_EmployeeList.pas | 3 +- A01基础公司管理/U_GetDllForm.pas | 26 +- A01基础公司管理/U_SalaryInPut.dfm | 207 +++++++++ A01基础公司管理/U_SalaryInPut.pas | 274 +++++++++++ A01基础公司管理/U_SalaryList.dfm | 509 +++++++++++++++++++++ A01基础公司管理/U_SalaryList.pas | 310 +++++++++++++ A01基础公司管理/testDll.res | Bin 3308 -> 3308 bytes E03梭织坯布检验/TatInspFile.INI | 2 +- E03梭织坯布检验/U_TatMachInsp.dfm | 348 +++++++++----- E03梭织坯布检验/U_TatMachInsp.pas | 51 ++- E04梭织坯布仓库/TatClothStk.dproj | 50 +- E04梭织坯布仓库/TatClothStk.res | Bin 1496 -> 1496 bytes E04梭织坯布仓库/TatClothStk.skincfg | 1 + E04梭织坯布仓库/U_DataLink.pas | 2 +- E04梭织坯布仓库/U_TatClothDROutEdit.dfm | 20 + E04梭织坯布仓库/U_TatClothDROutEdit.pas | 3 +- E04梭织坯布仓库/U_TatClothOutEdit.dfm | 33 +- E04梭织坯布仓库/U_TatClothOutEdit.pas | 2 +- E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm | 47 +- E04梭织坯布仓库/U_TatClothStkHZListSEL.pas | 10 +- E04梭织坯布仓库/U_TatDRList.pas | 2 +- E04梭织坯布仓库/U_TatDRSel.dfm | 29 +- E04梭织坯布仓库/U_TatDRSel.pas | 4 +- E04梭织坯布仓库/U_TatDRtInPut.dfm | 7 + E04梭织坯布仓库/U_TatDRtInPut.pas | 2 +- E04梭织坯布仓库/testDll.res | Bin 3308 -> 3308 bytes 33 files changed, 1786 insertions(+), 261 deletions(-) create mode 100644 A01基础公司管理/U_SalaryInPut.dfm create mode 100644 A01基础公司管理/U_SalaryInPut.pas create mode 100644 A01基础公司管理/U_SalaryList.dfm create mode 100644 A01基础公司管理/U_SalaryList.pas diff --git a/A01基础公司管理/Company.dpr b/A01基础公司管理/Company.dpr index 8c401c4..4c90951 100644 --- a/A01基础公司管理/Company.dpr +++ b/A01基础公司管理/Company.dpr @@ -30,7 +30,10 @@ uses U_LabelMapSet in '..\A00ͨô\U_LabelMapSet.pas' {frmLabelMapSet}, U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint}, U_DataLink in 'U_DataLink.pas' {DataLink_Company: TDataModule}, - U_UserSel in '..\A00ͨô\U_UserSel.pas' {frmUserSel}; + U_UserSel in '..\A00ͨô\U_UserSel.pas' {frmUserSel}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_SalaryInPut in 'U_SalaryInPut.pas' {frmSalaryInPut}, + U_SalaryList in 'U_SalaryList.pas' {frmSalaryList}; {$R *.res} diff --git a/A01基础公司管理/Company.dproj b/A01基础公司管理/Company.dproj index 6fad7bb..ffd13d7 100644 --- a/A01基础公司管理/Company.dproj +++ b/A01基础公司管理/Company.dproj @@ -4,7 +4,7 @@ Company.dpr True Debug - 38017 + 1 Library VCL 19.2 @@ -13,16 +13,6 @@ true - - true - Base - true - - - true - Base - true - true Base @@ -43,24 +33,6 @@ Base true - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - true Cfg_2 @@ -84,13 +56,6 @@ 2052 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - - - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png - System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -113,17 +78,8 @@ false true - - Debug - - - Debug - - - Debug - - D:\Dp10Repo\项目代码\恒燕\A01基础公司管理\testDll.exe + D:\D10W\项目代码\D10szGerun\A01基础公司管理\testDll.exe CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) @@ -199,6 +155,11 @@
frmUserSel
dfm + + +
frmSalaryList
+ dfm + Cfg_2 Base @@ -221,10 +182,6 @@ - True - True - True - True True False diff --git a/A01基础公司管理/Company.res b/A01基础公司管理/Company.res index b3d7ee7ed0f87394c32f8573d7b1cfc2cf9bb63a..543f9420fe719aadf2a2cde77d24f46269efdb36 100644 GIT binary patch delta 12 TcmX@WeSmwz9#$4c1_lNI96|#P delta 12 TcmX@WeSmwz9#)pdDGUq%AN~X( diff --git a/A01基础公司管理/U_DataLink.pas b/A01基础公司管理/U_DataLink.pas index d03eed9..96b273f 100644 --- a/A01基础公司管理/U_DataLink.pas +++ b/A01基础公司管理/U_DataLink.pas @@ -5,7 +5,7 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, dxSkinsCore, - dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs; + dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs, dxSkinWXI; type TMyThread = class(TThread) diff --git a/A01基础公司管理/U_EmployeeInPut.dfm b/A01基础公司管理/U_EmployeeInPut.dfm index 9457453..03fed97 100644 --- a/A01基础公司管理/U_EmployeeInPut.dfm +++ b/A01基础公司管理/U_EmployeeInPut.dfm @@ -40,7 +40,6 @@ object frmYGInPut: TfrmYGInPut ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1144 object TBSave: TToolButton Left = 0 Top = 0 @@ -79,10 +78,9 @@ object frmYGInPut: TfrmYGInPut Height = 494 Align = alClient TabOrder = 1 - ExplicitTop = 44 - ExplicitWidth = 1144 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -95,24 +93,28 @@ object frmYGInPut: TfrmYGInPut object v1RuZhiDate: TcxGridDBColumn Caption = #20837#32844#26085#26399 DataBinding.FieldName = 'EntryDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object v1YGNo: TcxGridDBColumn Caption = #21592#24037#32534#21495 DataBinding.FieldName = 'EECode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1YGName: TcxGridDBColumn Caption = #22995#21517 DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object v1Column1: TcxGridDBColumn Caption = #37096#38376 DataBinding.FieldName = 'Dept' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -120,18 +122,21 @@ object frmYGInPut: TfrmYGInPut object v1GangWei: TcxGridDBColumn Caption = #23703#20301 DataBinding.FieldName = 'Post' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 82 end object v1SFZNo: TcxGridDBColumn Caption = #29983#26085 DataBinding.FieldName = 'Birthday' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object v1YGSex: TcxGridDBColumn Caption = #24615#21035 DataBinding.FieldName = 'Sex' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -143,36 +148,42 @@ object frmYGInPut: TfrmYGInPut object v1Phone: TcxGridDBColumn Caption = #25163#26426 DataBinding.FieldName = 'Phone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end object Tv1Column1: TcxGridDBColumn Caption = #36523#20221#35777 DataBinding.FieldName = 'IdCard' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end object Tv1Column2: TcxGridDBColumn Caption = #36523#20221#35777#21040#26399#26085#26399 DataBinding.FieldName = 'IDCardEndData' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 115 end object Tv1Column3: TcxGridDBColumn Caption = #23478#24237#20303#22336 DataBinding.FieldName = 'HomeAddress' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 104 end object Tv1Column4: TcxGridDBColumn Caption = #25143#21475#25152#22312#22320 DataBinding.FieldName = 'Domicile' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end object Tv1Column5: TcxGridDBColumn Caption = #31038#20445 DataBinding.FieldName = 'SocialSecurity' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.Items.Strings = ( '' @@ -183,6 +194,7 @@ object frmYGInPut: TfrmYGInPut object Tv1Column6: TcxGridDBColumn Caption = #21830#19994#20445#38505 DataBinding.FieldName = 'CommercialInsurance' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.Items.Strings = ( '' diff --git a/A01基础公司管理/U_EmployeeInPut.pas b/A01基础公司管理/U_EmployeeInPut.pas index c3e3d13..358053c 100644 --- a/A01基础公司管理/U_EmployeeInPut.pas +++ b/A01基础公司管理/U_EmployeeInPut.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, Menus, ExtDlgs, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, - dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu; + dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, dxSkinWXI, + dxScrollbarAnnotations; type TfrmYGInPut = class(TForm) diff --git a/A01基础公司管理/U_EmployeeList.dfm b/A01基础公司管理/U_EmployeeList.dfm index b291e61..74885d2 100644 --- a/A01基础公司管理/U_EmployeeList.dfm +++ b/A01基础公司管理/U_EmployeeList.dfm @@ -283,6 +283,7 @@ inherited frmEmployeeList: TfrmEmployeeList OptionsView.CellAutoHeight = True OptionsView.Headers = False RootValue = -1 + ScrollbarAnnotations.CustomAnnotations = <> Styles.Inactive = DataLink_Company.Red Styles.Selection = DataLink_Company.Red Styles.IncSearch = DataLink_Company.Red @@ -348,9 +349,9 @@ inherited frmEmployeeList: TfrmEmployeeList Align = alClient PopupMenu = PopupMenu1 TabOrder = 1 - ExplicitLeft = 6 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -364,6 +365,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column4: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -372,6 +374,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1RuZhiDate: TcxGridDBColumn Caption = #20837#32844#26085#26399 DataBinding.FieldName = 'EntryDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 84 @@ -379,6 +382,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1YGNo: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'EECode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -386,6 +390,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1YGName: TcxGridDBColumn Caption = #22995#21517 DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 88 @@ -393,6 +398,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column1: TcxGridDBColumn Caption = #37096#38376 DataBinding.FieldName = 'Dept' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -406,6 +412,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column2: TcxGridDBColumn Caption = #23703#20301 DataBinding.FieldName = 'Post' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -413,6 +420,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column8: TcxGridDBColumn Caption = #31867#21035 DataBinding.FieldName = 'EEType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 84 @@ -420,6 +428,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1SFZNo: TcxGridDBColumn Caption = #36523#20221#35777#21495 DataBinding.FieldName = 'IdCard' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -427,6 +436,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column6: TcxGridDBColumn Caption = #24615#21035 DataBinding.FieldName = 'Sex' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 89 @@ -434,6 +444,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column29: TcxGridDBColumn Caption = #25163#26426 DataBinding.FieldName = 'Phone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 98 @@ -441,6 +452,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1SJLiZhiDate: TcxGridDBColumn Caption = #31163#32844#26085#26399 DataBinding.FieldName = 'SJLiZhiDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -452,12 +464,14 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column1: TcxGridDBColumn Caption = #31163#32844#26102#38388 DataBinding.FieldName = 'DepartureDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object Tv1Column2: TcxGridDBColumn Caption = #36523#20221#35777#21040#26399#26085#26399 DataBinding.FieldName = 'IDCardEndData' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 126 @@ -465,6 +479,7 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column3: TcxGridDBColumn Caption = #23478#24237#20303#22336 DataBinding.FieldName = 'HomeAddress' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 89 @@ -472,6 +487,7 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column4: TcxGridDBColumn Caption = #25143#21475#25152#22312#22320 DataBinding.FieldName = 'Domicile' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 91 @@ -479,6 +495,7 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column5: TcxGridDBColumn Caption = #31038#20445 DataBinding.FieldName = 'SocialSecurity' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -486,6 +503,7 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column6: TcxGridDBColumn Caption = #21830#19994#20445#38505 DataBinding.FieldName = 'CommercialInsurance' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 74 end diff --git a/A01基础公司管理/U_EmployeeList.pas b/A01基础公司管理/U_EmployeeList.pas index c544358..f5c2254 100644 --- a/A01基础公司管理/U_EmployeeList.pas +++ b/A01基础公司管理/U_EmployeeList.pas @@ -12,7 +12,8 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData, cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu, - cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges; + cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + dxSkinWXI, dxScrollbarAnnotations; type TfrmEmployeeList = class(TfrmBaseList) diff --git a/A01基础公司管理/U_GetDllForm.pas b/A01基础公司管理/U_GetDllForm.pas index c5acd33..d2fda45 100644 --- a/A01基础公司管理/U_GetDllForm.pas +++ b/A01基础公司管理/U_GetDllForm.pas @@ -14,7 +14,7 @@ implementation uses U_DataLink, U_Customer, U_Factory, U_Company, U_EmployeeList, U_SYDept, - U_BankList, U_ModulePromptList; + U_BankList, U_ModulePromptList, U_SalaryList; ///////////////////////////////////////////////////////////////// // ˵:ȡDllеô // @@ -71,10 +71,14 @@ begin if trim(DataBaseStr) = '' then begin - server := '101.132.143.144,7781'; - dtbase := 'HENGYANData'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; +// server := '101.132.143.144,7781'; +// dtbase := 'HENGYANData'; +// user := 'rtsa'; +// pswd := 'rightsoft@5740'; + server := '8.153.99.238,7781'; + dtbase := 'gerunData'; + user := 'rightsoftsa'; + pswd := 'right,.soft@2377'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // Parameters1 := '¼'; @@ -209,6 +213,18 @@ begin end; end; + 215: //ʹ + begin + with TfrmSalaryList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + begin + fFormID := FormID; + FormStyle := mstyle; + WindowState := mstate; + BorderStyle := mborderstyle; + mnewHandle := Handle; + end; + end; + 10000: begin for i := 0 to application.MainForm.MDIChildCount - 1 do diff --git a/A01基础公司管理/U_SalaryInPut.dfm b/A01基础公司管理/U_SalaryInPut.dfm new file mode 100644 index 0000000..49b7118 --- /dev/null +++ b/A01基础公司管理/U_SalaryInPut.dfm @@ -0,0 +1,207 @@ +object frmSalaryInPut: TfrmSalaryInPut + Left = 0 + Top = 0 + Caption = #24037#36164#24405#20837 + ClientHeight = 509 + ClientWidth = 600 + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = '#23435#20307' + Font.Style = [] + OldCreateOrder = False + Position = poScreenCenter + OnShow = FormShow + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar + Tag = 1 + Left = 0 + Top = 0 + Width = 600 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar1' + Color = clBtnFace + DisabledImages = DataLink_Company.ImageList_new32 + EdgeInner = esNone + EdgeOuter = esNone + Images = DataLink_Company.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + object TBSave: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 16 + OnClick = TBSaveClick + end + object TBClose: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object Panel1: TPanel + Left = 0 + Top = 38 + Width = 600 + Height = 43 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + ParentBackground = False + TabOrder = 1 + object Label1: TLabel + Left = 16 + Top = 15 + Width = 24 + Height = 12 + Caption = #26085#26399 + end + object Label2: TLabel + Left = 178 + Top = 15 + Width = 24 + Height = 12 + Caption = #24180#26376 + end + object YMCaption: TLabel + Left = 210 + Top = 15 + Width = 54 + Height = 12 + Caption = 'YMCaption' + end + object Label3: TLabel + Left = 300 + Top = 15 + Width = 24 + Height = 12 + Caption = #21512#35745 + end + object HJCaption: TLabel + Left = 332 + Top = 15 + Width = 63 + Height = 12 + Caption = 'HJCaption' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = '#23435#20307' + Font.Style = [fsBold] + ParentFont = False + end + object DayCombo: TComboBox + Left = 52 + Top = 11 + Width = 110 + Height = 20 + Style = csDropDownList + TabOrder = 0 + OnChange = DayComboChange + end + end + object cxGrid1: TcxGrid + Left = 0 + Top = 81 + Width = 600 + Height = 428 + Align = alClient + TabOrder = 2 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DataSource1 + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsData.Deleting = False + OptionsData.Inserting = False + OptionsView.GroupByBox = False + Styles.Header = DataLink_Company.Default + object v1EEName: TcxGridDBColumn + Caption = #22995#21517 + DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 130 + end + object v1DVal: TcxGridDBColumn + Caption = #24037#26102 + DataBinding.FieldName = 'DVal' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Width = 120 + end + object v1Editer: TcxGridDBColumn + Caption = '#20462#25913#20154' + DataBinding.FieldName = 'Editer' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end + object v1Edittime: TcxGridDBColumn + Caption = '#20462#25913#26102#38388' + DataBinding.FieldName = 'Edittime' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 150 + end + end + object cxGrid1Level1: TcxGridLevel + GridView = Tv1 + end + end + object DataSource1: TDataSource + DataSet = Order_Main + Left = 467 + Top = 211 + end + object Order_Main: TClientDataSet + Aggregates = <> + Params = <> + AfterPost = Order_MainAfterPost + Left = 360 + Top = 208 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 245 + Top = 385 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 347 + Top = 385 + end +end diff --git a/A01基础公司管理/U_SalaryInPut.pas b/A01基础公司管理/U_SalaryInPut.pas new file mode 100644 index 0000000..e74c126 --- /dev/null +++ b/A01基础公司管理/U_SalaryInPut.pas @@ -0,0 +1,274 @@ +unit U_SalaryInPut; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, + cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB, + cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, + cxGridTableView, cxGridDBTableView, cxGrid, DBClient, cxTextEdit, DateUtils, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinWXI, + dxDateRanges, dxScrollbarAnnotations; + +type + TfrmSalaryInPut = class(TForm) + ToolBar1: TToolBar; + TBSave: TToolButton; + TBClose: TToolButton; + Panel1: TPanel; + Label1: TLabel; + DayCombo: TComboBox; + Label2: TLabel; + YMCaption: TLabel; + Label3: TLabel; + HJCaption: TLabel; + cxGrid1: TcxGrid; + Tv1: TcxGridDBTableView; + v1EEName: TcxGridDBColumn; + v1DVal: TcxGridDBColumn; + v1Editer: TcxGridDBColumn; + v1Edittime: TcxGridDBColumn; + cxGrid1Level1: TcxGridLevel; + DataSource1: TDataSource; + Order_Main: TClientDataSet; + ADOQueryCmd: TADOQuery; + ADOQueryTemp: TADOQuery; + procedure FormShow(Sender: TObject); + procedure TBSaveClick(Sender: TObject); + procedure TBCloseClick(Sender: TObject); + procedure DayComboChange(Sender: TObject); + procedure Order_MainAfterPost(DataSet: TDataSet); + private + FDay: Integer; //ǰ¼(1-31) + FDays: Integer; // + FSRDate: TDateTime; //ǰ¼ + FInitFlag: Boolean; + procedure InitDayCombo(); + procedure InitData(); + procedure CalcHJ(); + function SaveData(): Boolean; + { Private declarations } + public + PState: Integer; //0:; 1:޸ + FYMonth: string; //(yyyymm) + FInitDay: Integer; + { Public declarations } + end; + +var + frmSalaryInPut: TfrmSalaryInPut; + +implementation + +uses + U_DataLink, U_RTFun; + +const + CNDayOfWeek: array[1..7] of string = ('', 'һ', '', '', '', '', ''); + +{$R *.dfm} + +procedure TfrmSalaryInPut.FormShow(Sender: TObject); +begin + FInitFlag := True; + YMCaption.Caption := Copy(FYMonth, 1, 4) + '' + Copy(FYMonth, 5, 2) + ''; + if PState = 1 then + Caption := '޸' + else + Caption := '¼'; + InitDayCombo(); + InitData(); + CalcHJ(); + FInitFlag := False; +end; + +procedure TfrmSalaryInPut.InitDayCombo(); +var + i, FY, FM, FDay: Integer; +begin + FY := StrToInt(Copy(FYMonth, 1, 4)); + FM := StrToInt(Copy(FYMonth, 5, 2)); + FDays := DaysInMonth(EncodeDate(FY, FM, 1)); + DayCombo.Items.Clear; + for i := 1 to FDays do + DayCombo.Items.Add(Format('%d(%s)', [i, CNDayOfWeek[DayOfWeek(EncodeDate(FY, FM, i))]])); + //Ĭϵ + if (FInitDay >= 1) and (FInitDay <= FDays) then + FDay := FInitDay + else + begin + FDay := DayOf(SGetServerDate(ADOQueryTemp)); + if FDay > FDays then + FDay := 1; + end; + DayCombo.ItemIndex := FDay - 1; +end; + +procedure TfrmSalaryInPut.InitData(); +begin + if DayCombo.ItemIndex < 0 then + Exit; + FDay := DayCombo.ItemIndex + 1; + FSRDate := EncodeDate(StrToInt(Copy(FYMonth, 1, 4)), StrToInt(Copy(FYMonth, 5, 2)), FDay); + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add(' select E.EEID,E.EECode,E.EEName '); + sql.Add(' ,S.GZS as DVal,S.SALID as SALID,S.Editer as Editer,S.Edittime as Edittime '); + sql.Add(' from SY_Employee E '); + sql.Add(' left join SY_Salary S on S.EEID=E.EEID and S.GZRQ=' + quotedstr(FormatDateTime('yyyy-mm-dd', FSRDate))); + sql.Add(' where isnull(E.EEType,''ʽ'')<>''ְ'' or S.EEID is not null '); + sql.Add(' order by E.EECode '); + Open; + end; + SCreateCDS(ADOQueryTemp, Order_Main); + SInitCDSData(ADOQueryTemp, Order_Main); + TDateTimeField(Order_Main.FieldByName('Edittime')).DisplayFormat := 'mm-dd hh:nn'; + Order_Main.MergeChangeLog; +end; + +procedure TfrmSalaryInPut.DayComboChange(Sender: TObject); +begin + if FInitFlag then + Exit; + if DayCombo.ItemIndex < 0 then + Exit; + if Order_Main.ChangeCount > 0 then + if Application.MessageBox('лڽδ޸ģ', 'ʾ', 32 + 4) <> IDYES then + begin + FInitFlag := True; + DayCombo.ItemIndex := FDay - 1; + FInitFlag := False; + Exit; + end; + InitData(); + CalcHJ(); +end; + +procedure TfrmSalaryInPut.Order_MainAfterPost(DataSet: TDataSet); +begin + CalcHJ(); +end; + +procedure TfrmSalaryInPut.CalcHJ(); +var + FVal, FHJ: Double; + FBm: TBookmark; +begin + FHJ := 0; + with Order_Main do + begin + DisableControls; + FBm := GetBookmark; + First; + while not Eof do + begin + if TryStrToFloat(Trim(fieldbyname('DVal').AsString), FVal) then + FHJ := FHJ + FVal; + Next; + end; + if FBm <> nil then + begin + GotoBookmark(FBm); + FreeBookmark(FBm); + end; + EnableControls; + end; + HJCaption.Caption := FormatFloat('0.##', FHJ); +end; + +function TfrmSalaryInPut.SaveData(): Boolean; +var + mval: string; +begin + Result := False; + if Order_Main.IsEmpty then + Exit; + if Order_Main.State in [dsEdit, dsInsert] then + Order_Main.Post; + try + ADOQueryCmd.Connection.BeginTrans; + with Order_Main do + begin + DisableControls; + First; + while not Eof do + begin + mval := Trim(fieldbyname('DVal').AsString); + if Trim(fieldbyname('SALID').AsString) = '' then + begin + //޼¼¼ֵ -> һ + if mval <> '' then + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('insert into SY_Salary(GZRQ,EEID,GZS,Filler,Filltime) values('); + sql.Add(quotedstr(FormatDateTime('yyyy-mm-dd', FSRDate)) + ',' + quotedstr(Trim(Order_Main.fieldbyname('EEID').AsString))); + sql.Add(',' + quotedstr(mval) + ',' + quotedstr(Trim(DName)) + ',getdate())'); + ExecSQL; + end; + end + else + begin +// if mval = '' then +// begin +// // -> ɾ¼ +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add('delete SY_Salary where SALID=' + Trim(Order_Main.fieldbyname('SALID').AsString)); +// ExecSQL; +// end; +// end +// else +// begin + //޸Ĺʱ -> ²¼޸ + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('update SY_Salary set GZS=' + quotedstr(mval)); + sql.Add(',Editer=' + quotedstr(Trim(DName)) + ',Edittime=getdate()'); + sql.Add(' where SALID=' + Trim(Order_Main.fieldbyname('SALID').AsString)); + ExecSQL; + end; +// end; + end; + Next; + end; + First; + EnableControls; + end; + ADOQueryCmd.Connection.CommitTrans; + Order_Main.MergeChangeLog; + Result := True; + except + ADOQueryCmd.Connection.RollbackTrans; + Order_Main.EnableControls; + Application.MessageBox('ʧܣ', 'ʾ', 0); + end; +end; + +procedure TfrmSalaryInPut.TBSaveClick(Sender: TObject); +begin + ToolBar1.SetFocus; + if SaveData() then + begin + Application.MessageBox('ɹ', 'ʾ', 0); + ModalResult := 1; + end; +end; + +procedure TfrmSalaryInPut.TBCloseClick(Sender: TObject); +begin + if Order_Main.ChangeCount > 0 then + if Application.MessageBox('δ޸ģȷر', 'ʾ', 32 + 4) <> IDYES then + Exit; + Close; +end; + +end. diff --git a/A01基础公司管理/U_SalaryList.dfm b/A01基础公司管理/U_SalaryList.dfm new file mode 100644 index 0000000..f2577c0 --- /dev/null +++ b/A01基础公司管理/U_SalaryList.dfm @@ -0,0 +1,509 @@ +inherited frmSalaryList: TfrmSalaryList + Top = 39 + Caption = #24037#36164#31649#29702 + ClientHeight = 509 + ClientWidth = 1200 + ExplicitWidth = 1216 + ExplicitHeight = 548 + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1200 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar1' + Color = clSkyBlue + DisabledImages = DataLink_Company.ImageList_new32 + Images = DataLink_Company.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + object TBRafresh: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21047#26032 + ImageIndex = 1 + OnClick = TBRafreshClick + end + object TBAdd: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #24405#20837 + ImageIndex = 9 + OnClick = TBAddClick + end + object TBEdit: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + OnClick = TBEditClick + end + object TBExport: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #23548#20986 + ImageIndex = 20 + OnClick = TBExportClick + end + object TBClose: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object Panel1: TPanel [1] + Left = 0 + Top = 38 + Width = 1200 + Height = 43 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + ParentBackground = False + TabOrder = 1 + object Label1: TLabel + Left = 24 + Top = 14 + Width = 24 + Height = 12 + Caption = #24180#26376 + end + object YMDate: TDateTimePicker + Left = 60 + Top = 11 + Width = 90 + Height = 20 + Date = 46235.000000000000000000 + Format = 'yyyy-MM' + Time = 46235.000000000000000000 + TabOrder = 0 + OnChange = YMDateChange + end + end + object cxGrid1: TcxGrid [2] + Left = 0 + Top = 81 + Width = 1200 + Height = 428 + Align = alClient + TabOrder = 2 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> + OnCellDblClick = Tv1CellDblClick + DataController.DataSource = DataSource1 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Format = '0.##' + Kind = skSum + Column = v1DHJ + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsData.Deleting = False + OptionsData.Editing = False + OptionsData.Inserting = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + Styles.Header = DataLink_Company.Default + object v1EEName: TcxGridDBColumn + Caption = #22995#21517 + DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end + object v1D01: TcxGridDBColumn + Caption = '1' + DataBinding.FieldName = 'D01' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D02: TcxGridDBColumn + Caption = '2' + DataBinding.FieldName = 'D02' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D03: TcxGridDBColumn + Caption = '3' + DataBinding.FieldName = 'D03' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D04: TcxGridDBColumn + Caption = '4' + DataBinding.FieldName = 'D04' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D05: TcxGridDBColumn + Caption = '5' + DataBinding.FieldName = 'D05' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D06: TcxGridDBColumn + Caption = '6' + DataBinding.FieldName = 'D06' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D07: TcxGridDBColumn + Caption = '7' + DataBinding.FieldName = 'D07' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D08: TcxGridDBColumn + Caption = '8' + DataBinding.FieldName = 'D08' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D09: TcxGridDBColumn + Caption = '9' + DataBinding.FieldName = 'D09' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D10: TcxGridDBColumn + Caption = '10' + DataBinding.FieldName = 'D10' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D11: TcxGridDBColumn + Caption = '11' + DataBinding.FieldName = 'D11' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D12: TcxGridDBColumn + Caption = '12' + DataBinding.FieldName = 'D12' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D13: TcxGridDBColumn + Caption = '13' + DataBinding.FieldName = 'D13' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D14: TcxGridDBColumn + Caption = '14' + DataBinding.FieldName = 'D14' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D15: TcxGridDBColumn + Caption = '15' + DataBinding.FieldName = 'D15' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D16: TcxGridDBColumn + Caption = '16' + DataBinding.FieldName = 'D16' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D17: TcxGridDBColumn + Caption = '17' + DataBinding.FieldName = 'D17' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D18: TcxGridDBColumn + Caption = '18' + DataBinding.FieldName = 'D18' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D19: TcxGridDBColumn + Caption = '19' + DataBinding.FieldName = 'D19' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D20: TcxGridDBColumn + Caption = '20' + DataBinding.FieldName = 'D20' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D21: TcxGridDBColumn + Caption = '21' + DataBinding.FieldName = 'D21' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D22: TcxGridDBColumn + Caption = '22' + DataBinding.FieldName = 'D22' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D23: TcxGridDBColumn + Caption = '23' + DataBinding.FieldName = 'D23' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D24: TcxGridDBColumn + Caption = '24' + DataBinding.FieldName = 'D24' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D25: TcxGridDBColumn + Caption = '25' + DataBinding.FieldName = 'D25' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D26: TcxGridDBColumn + Caption = '26' + DataBinding.FieldName = 'D26' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D27: TcxGridDBColumn + Caption = '27' + DataBinding.FieldName = 'D27' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D28: TcxGridDBColumn + Caption = '28' + DataBinding.FieldName = 'D28' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D29: TcxGridDBColumn + Caption = '29' + DataBinding.FieldName = 'D29' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D30: TcxGridDBColumn + Caption = '30' + DataBinding.FieldName = 'D30' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1D31: TcxGridDBColumn + Caption = '31' + DataBinding.FieldName = 'D31' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 34 + end + object v1DHJ: TcxGridDBColumn + Caption = #23567#35745 + DataBinding.FieldName = 'DHJ' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + end + object cxGrid1Level1: TcxGridLevel + GridView = Tv1 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 233 + Top = 208 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 81 + Top = 209 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 149 + Top = 385 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 245 + Top = 385 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 347 + Top = 385 + end + object DataSource1: TDataSource + DataSet = Order_Main + Left = 467 + Top = 211 + end + object Order_Main: TClientDataSet + Aggregates = <> + Params = <> + Left = 360 + Top = 208 + end + object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid1 + PopupMenus = <> + Left = 552 + Top = 224 + end +end diff --git a/A01基础公司管理/U_SalaryList.pas b/A01基础公司管理/U_SalaryList.pas new file mode 100644 index 0000000..cba417b --- /dev/null +++ b/A01基础公司管理/U_SalaryList.pas @@ -0,0 +1,310 @@ +unit U_SalaryList; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, + cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB, + cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls, + cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, + cxGrid, DBClient, cxTextEdit, DateUtils, cxLookAndFeels, + cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore, + dxSkinsDefaultPainters, dxDateRanges, dxSkinWXI, dxScrollbarAnnotations, + dxBarBuiltInMenu; + +type + TfrmSalaryList = class(TfrmBaseList) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TBAdd: TToolButton; + TBEdit: TToolButton; + TBExport: TToolButton; + TBClose: TToolButton; + cxGridPopupMenu1: TcxGridPopupMenu; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ADOQueryTemp: TADOQuery; + DataSource1: TDataSource; + Order_Main: TClientDataSet; + Panel1: TPanel; + Label1: TLabel; + YMDate: TDateTimePicker; + cxGrid1: TcxGrid; + Tv1: TcxGridDBTableView; + v1EEName: TcxGridDBColumn; + v1D01: TcxGridDBColumn; + v1D02: TcxGridDBColumn; + v1D03: TcxGridDBColumn; + v1D04: TcxGridDBColumn; + v1D05: TcxGridDBColumn; + v1D06: TcxGridDBColumn; + v1D07: TcxGridDBColumn; + v1D08: TcxGridDBColumn; + v1D09: TcxGridDBColumn; + v1D10: TcxGridDBColumn; + v1D11: TcxGridDBColumn; + v1D12: TcxGridDBColumn; + v1D13: TcxGridDBColumn; + v1D14: TcxGridDBColumn; + v1D15: TcxGridDBColumn; + v1D16: TcxGridDBColumn; + v1D17: TcxGridDBColumn; + v1D18: TcxGridDBColumn; + v1D19: TcxGridDBColumn; + v1D20: TcxGridDBColumn; + v1D21: TcxGridDBColumn; + v1D22: TcxGridDBColumn; + v1D23: TcxGridDBColumn; + v1D24: TcxGridDBColumn; + v1D25: TcxGridDBColumn; + v1D26: TcxGridDBColumn; + v1D27: TcxGridDBColumn; + v1D28: TcxGridDBColumn; + v1D29: TcxGridDBColumn; + v1D30: TcxGridDBColumn; + v1D31: TcxGridDBColumn; + v1DHJ: TcxGridDBColumn; + cxGrid1Level1: TcxGridLevel; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure FormCreate(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBCloseClick(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure TBAddClick(Sender: TObject); + procedure TBEditClick(Sender: TObject); + procedure TBExportClick(Sender: TObject); + procedure YMDateChange(Sender: TObject); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + private + FYMonth: string; //ǰ(yyyymm) + FInitFlag: Boolean; + procedure InitGrid(); + function DayField(i: Integer): string; + function CalcRowHJ(): Double; + function GetFocusedDay(): Integer; + { Private declarations } + public + { Public declarations } + end; + +var + frmSalaryList: TfrmSalaryList; + +implementation + +uses + U_DataLink, U_RTFun, U_SalaryInPut; + +{$R *.dfm} +function TfrmSalaryList.GetFocusedDay(): Integer; +var + FCol: TcxGridColumn; + FFieldName: string; +begin + Result := 0; + if Tv1.Controller = nil then + Exit; + FCol := Tv1.Controller.FocusedColumn; + if FCol = nil then + Exit; + if not (FCol is TcxGridDBColumn) then + Exit; + FFieldName := TcxGridDBColumn(FCol).DataBinding.FieldName; + if Length(FFieldName) <> 3 then + Exit; + if FFieldName[1] <> 'D' then + Exit; + if not TryStrToInt(Copy(FFieldName, 2, 2), Result) then + begin + Result := 0; + Exit; + end; + if (Result < 1) or (Result > 31) then + Result := 0; +end; + +procedure TfrmSalaryList.FormCreate(Sender: TObject); +begin + inherited; + FInitFlag := True; + YMDate.Date := SGetServerDate(ADOQueryTemp); + FInitFlag := False; +end; + +procedure TfrmSalaryList.FormDestroy(Sender: TObject); +begin + inherited; + frmSalaryList := nil; +end; + +procedure TfrmSalaryList.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmSalaryList.FormShow(Sender: TObject); +begin + inherited; + ReadCxGrid(Trim(Self.Caption), Tv1, 'OA'); + InitGrid(); +end; + +procedure TfrmSalaryList.TBCloseClick(Sender: TObject); +begin + Close; + WriteCxGrid(Trim(Self.Caption), Tv1, 'OA'); +end; + +procedure TfrmSalaryList.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmSalaryList.TBAddClick(Sender: TObject); +var + FDay: Integer; +begin + FDay := GetFocusedDay(); + if FDay = 0 then + FDay := DayOf(YMDate.Date); + try + frmSalaryInPut := TfrmSalaryInPut.Create(Application); + with frmSalaryInPut do + begin + PState := 0; + FYMonth := Self.FYMonth; + FInitDay := FDay; + if ShowModal = 1 then + InitGrid(); + end; + finally + frmSalaryInPut.Free; + end; +end; + +procedure TfrmSalaryList.TBEditClick(Sender: TObject); +var + FDay: Integer; +begin + FDay := GetFocusedDay(); + if FDay = 0 then + FDay := DayOf(YMDate.Date); + try + frmSalaryInPut := TfrmSalaryInPut.Create(Application); + with frmSalaryInPut do + begin + PState := 1; + FYMonth := Self.FYMonth; + FInitDay := FDay; + if ShowModal = 1 then + InitGrid(); + end; + finally + frmSalaryInPut.Free; + end; +end; + +procedure TfrmSalaryList.TBExportClick(Sender: TObject); +begin + if ADOQueryMain.IsEmpty then + Exit; + TcxGridToExcel(Trim(Self.Caption), cxGrid1); +end; + +procedure TfrmSalaryList.YMDateChange(Sender: TObject); +begin + if FInitFlag then + Exit; + InitGrid(); +end; + +procedure TfrmSalaryList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +begin + if Order_Main.IsEmpty then + Exit; + TBEdit.Click; +end; + +function TfrmSalaryList.DayField(i: Integer): string; +begin + Result := 'D' + Format('%.2d', [i]); +end; + +procedure TfrmSalaryList.InitGrid(); +var + i, FDays: Integer; + FCol: TcxGridDBColumn; + FDateStart: TDateTime; +begin + FYMonth := FormatDateTime('yyyymm', YMDate.Date); + FDays := DaysInMonth(YMDate.Date); + FDateStart := EncodeDate(StrToInt(Copy(FYMonth, 1, 4)), StrToInt(Copy(FYMonth, 5, 2)), 1); + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Filtered := False; + Close; + SQL.Clear; + SQL.Add(' select E.EEID,E.EECode,E.EEName,E.Dept '); + for i := 1 to 31 do + SQL.Add(' ,max(case when day(S.GZRQ)=' + IntToStr(i) + ' then S.GZS end) as ' + DayField(i) + ' '); + SQL.Add(' from SY_Employee E '); + SQL.Add(' left join SY_Salary S on S.EEID=E.EEID '); + SQL.Add(' and S.GZRQ>=' + quotedstr(FormatDateTime('yyyy-mm-dd', FDateStart))); + SQL.Add(' and S.GZRQ<' + quotedstr(FormatDateTime('yyyy-mm-dd', IncMonth(FDateStart, 1)))); + SQL.Add(' where isnull(E.EEType,''ʽ'')<>''ְ'' or S.EEID is not null '); + SQL.Add(' group by E.EEID,E.EECode,E.EEName,E.Dept '); + SQL.Add(' order by E.EECode '); + Open; + end; + SCreateCDS(ADOQueryMain, Order_Main); + Order_Main.Close; + Order_Main.FieldDefs.Add('DHJ', ftFloat); + Order_Main.CreateDataSet; + TFloatField(Order_Main.FieldByName('DHJ')).DisplayFormat := '0.##'; + SInitCDSData(ADOQueryMain, Order_Main); + //С + with Order_Main do + begin + DisableControls; + First; + while not Eof do + begin + Edit; + FieldByName('DHJ').Value := CalcRowHJ(); + Post; + Next; + end; + First; + EnableControls; + end; + //ʾ + for i := 1 to 31 do + begin + FCol := Tv1.GetColumnByFieldName(DayField(i)); + if FCol <> nil then + FCol.Visible := (i <= FDays); + end; + finally + ADOQueryMain.EnableControls; + end; +end; + +function TfrmSalaryList.CalcRowHJ(): Double; +var + i: Integer; + FVal: Double; +begin + Result := 0; + for i := 1 to 31 do + begin + if TryStrToFloat(Trim(Order_Main.fieldbyname(DayField(i)).AsString), FVal) then + Result := Result + FVal; + end; +end; + +end. diff --git a/A01基础公司管理/testDll.res b/A01基础公司管理/testDll.res index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644 GIT binary patch delta 12 TcmaDO`9^ZX3mz6m1_lNIB7g(5 delta 12 TcmaDO`9^ZX3m%rnDGUq%COibl diff --git a/E03梭织坯布检验/TatInspFile.INI b/E03梭织坯布检验/TatInspFile.INI index c9c7f3d..8c041bb 100644 --- a/E03梭织坯布检验/TatInspFile.INI +++ b/E03梭织坯布检验/TatInspFile.INI @@ -5,7 +5,7 @@ ӳӵDllļ= õӳDllļ=0 Dllļ= -Dllļ=0 +Dllļ=1 λ=0 ǩ= =1 diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm index 2ddbc17..6c55a87 100644 --- a/E03梭织坯布检验/U_TatMachInsp.dfm +++ b/E03梭织坯布检验/U_TatMachInsp.dfm @@ -7,6 +7,7 @@ FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitTop = -129 ExplicitWidth = 1556 ExplicitHeight = 807 PixelsPerInch = 96 @@ -20,7 +21,6 @@ Color = clWhite ParentBackground = False TabOrder = 2 - ExplicitHeight = 772 object Panel2: TPanel Left = 1 Top = 129 @@ -38,7 +38,6 @@ ParentBackground = False ParentFont = False TabOrder = 0 - ExplicitHeight = 642 object lblLenUnit: TLabel Left = 190 Top = 9 @@ -158,32 +157,30 @@ ParentFont = False end object Label4: TLabel - Left = 241 - Top = 504 - Width = 44 - Height = 34 + Left = 190 + Top = 243 + Width = 31 + Height = 24 Caption = 'KG' Font.Charset = ANSI_CHARSET Font.Color = clBlack - Font.Height = -29 + Font.Height = -21 Font.Name = 'Arial' Font.Style = [fsBold] ParentFont = False - Visible = False end object Label11: TLabel - Left = 15 - Top = 504 - Width = 62 - Height = 34 + Left = 22 + Top = 240 + Width = 42 + Height = 24 Caption = #37325#37327 Font.Charset = ANSI_CHARSET - Font.Color = clRed - Font.Height = -29 + Font.Color = clBlack + Font.Height = -20 Font.Name = 'Arial' Font.Style = [fsBold] ParentFont = False - Visible = False end object Label3: TLabel Left = 39 @@ -266,8 +263,8 @@ ParentFont = False end object Label42: TLabel - Left = 14 - Top = 235 + Left = 295 + Top = 541 Width = 52 Height = 23 Caption = #25377#36710'5' @@ -277,10 +274,11 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False end object Label43: TLabel - Left = 193 - Top = 234 + Left = 392 + Top = 537 Width = 42 Height = 23 Caption = #31859#25968 @@ -290,10 +288,11 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False end object Label46: TLabel - Left = 14 - Top = 277 + Left = 295 + Top = 570 Width = 52 Height = 23 Caption = #25377#36710'6' @@ -303,10 +302,11 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False end object Label47: TLabel - Left = 193 - Top = 276 + Left = 392 + Top = 566 Width = 42 Height = 23 Caption = #31859#25968 @@ -316,10 +316,11 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False end object Label48: TLabel - Left = 15 - Top = 319 + Left = 295 + Top = 599 Width = 52 Height = 23 Caption = #25377#36710'7' @@ -329,10 +330,11 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False end object Label51: TLabel - Left = 193 - Top = 318 + Left = 392 + Top = 598 Width = 42 Height = 23 Caption = #31859#25968 @@ -342,6 +344,46 @@ Font.Name = 'Times New Roman' Font.Style = [fsBold] ParentFont = False + Visible = False + end + object Label54: TLabel + Left = 22 + Top = 294 + Width = 42 + Height = 24 + Caption = #38376#24133 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -20 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False + end + object Label55: TLabel + Left = 181 + Top = 294 + Width = 42 + Height = 24 + Caption = #20811#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -20 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False + end + object Label56: TLabel + Left = 22 + Top = 338 + Width = 84 + Height = 24 + Caption = #30721#34920#38271#24230 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -20 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False end object InputLen: TEdit Left = 70 @@ -516,7 +558,7 @@ end object OutPutQty2: TEdit Left = 241 - Top = 104 + Top = 103 Width = 72 Height = 29 Font.Charset = ANSI_CHARSET @@ -532,17 +574,16 @@ end object InputWeight: TEdit Left = 70 - Top = 501 - Width = 100 - Height = 41 + Top = 239 + Width = 103 + Height = 29 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -32 + Font.Height = -21 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False TabOrder = 11 - Visible = False OnClick = CIFBegClick OnKeyPress = MJstr3KeyPress end @@ -651,8 +692,8 @@ OnMouseDown = OutPutQty4MouseDown end object JBSCPerson5: TcxButtonEdit - Left = 71 - Top = 233 + Left = 311 + Top = 535 ParentFont = False Properties.Buttons = < item @@ -667,12 +708,13 @@ Style.Font.Style = [fsBold] Style.IsFontAssigned = True TabOrder = 18 + Visible = False OnClick = JBSCPerson5Click Width = 102 end object OutPutQty5: TEdit - Left = 241 - Top = 232 + Left = 433 + Top = 531 Width = 72 Height = 29 Font.Charset = ANSI_CHARSET @@ -682,6 +724,7 @@ Font.Style = [fsBold] ParentFont = False TabOrder = 19 + Visible = False OnClick = CIFBegClick OnKeyPress = MJstr3KeyPress OnMouseDown = OutPutQty5MouseDown @@ -702,8 +745,8 @@ OnClick = Button7Click end object JBSCPerson6: TcxButtonEdit - Left = 71 - Top = 275 + Left = 311 + Top = 563 ParentFont = False Properties.Buttons = < item @@ -718,12 +761,13 @@ Style.Font.Style = [fsBold] Style.IsFontAssigned = True TabOrder = 21 + Visible = False OnClick = JBSCPerson6Click Width = 102 end object OutPutQty6: TEdit - Left = 241 - Top = 273 + Left = 433 + Top = 563 Width = 72 Height = 29 Font.Charset = ANSI_CHARSET @@ -733,13 +777,14 @@ Font.Style = [fsBold] ParentFont = False TabOrder = 22 + Visible = False OnClick = CIFBegClick OnKeyPress = MJstr3KeyPress OnMouseDown = OutPutQty6MouseDown end object JBSCPerson7: TcxButtonEdit - Left = 71 - Top = 316 + Left = 311 + Top = 596 ParentFont = False Properties.Buttons = < item @@ -754,12 +799,13 @@ Style.Font.Style = [fsBold] Style.IsFontAssigned = True TabOrder = 23 + Visible = False OnClick = JBSCPerson7Click Width = 102 end object OutPutQty7: TEdit - Left = 242 - Top = 315 + Left = 433 + Top = 595 Width = 72 Height = 29 Font.Charset = ANSI_CHARSET @@ -769,6 +815,7 @@ Font.Style = [fsBold] ParentFont = False TabOrder = 24 + Visible = False OnClick = CIFBegClick OnKeyPress = MJstr3KeyPress OnMouseDown = OutPutQty7MouseDown @@ -788,6 +835,45 @@ TabOrder = 25 OnClick = Button3Click end + object MF: TEdit + Left = 70 + Top = 291 + Width = 102 + Height = 32 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = 'Arial' + Font.Style = [] + ParentFont = False + TabOrder = 26 + end + object KZ: TEdit + Left = 229 + Top = 291 + Width = 100 + Height = 32 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = 'Arial' + Font.Style = [] + ParentFont = False + TabOrder = 27 + end + object code_table_length: TEdit + Left = 112 + Top = 335 + Width = 114 + Height = 32 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = 'Arial' + Font.Style = [] + ParentFont = False + TabOrder = 28 + end end object Panel10: TPanel Left = 1 @@ -1001,7 +1087,7 @@ Left = 32 Top = 4 Width = 32 - Height = 19 + Height = 68 Font.Charset = ANSI_CHARSET Font.Color = clBlack Font.Height = -53 @@ -1059,36 +1145,6 @@ TabOrder = 6 Visible = False end - object MF: TEdit - Left = 36 - Top = 201 - Width = 144 - Height = 24 - Font.Charset = ANSI_CHARSET - Font.Color = clBlack - Font.Height = -14 - Font.Name = 'Arial' - Font.Style = [] - ParentFont = False - ReadOnly = True - TabOrder = 7 - Visible = False - end - object KZ: TEdit - Left = 230 - Top = 174 - Width = 144 - Height = 24 - Font.Charset = ANSI_CHARSET - Font.Color = clBlack - Font.Height = -14 - Font.Name = 'Arial' - Font.Style = [] - ParentFont = False - ReadOnly = True - TabOrder = 8 - Visible = False - end object Button5: TButton Left = 380 Top = 176 @@ -1101,7 +1157,7 @@ Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 9 + TabOrder = 7 Visible = False OnClick = Button5Click end @@ -1117,7 +1173,7 @@ Font.Style = [] ParentFont = False ReadOnly = True - TabOrder = 10 + TabOrder = 8 OnClick = codeClick OnExit = codeExit end @@ -1133,7 +1189,7 @@ Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 11 + TabOrder = 9 OnClick = Button9Click end object carno: TEdit @@ -1147,7 +1203,7 @@ Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 12 + TabOrder = 10 OnClick = CIFBegClick end object Button10: TButton @@ -1162,7 +1218,7 @@ Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 13 + TabOrder = 11 OnClick = Button10Click end end @@ -1175,7 +1231,6 @@ Align = alLeft TabOrder = 0 Visible = False - ExplicitHeight = 772 object SpeedButton13: TSpeedButton Left = 7 Top = 3 @@ -2247,7 +2302,7 @@ end object Label52: TLabel Left = 59 - Top = 122 + Top = 125 Width = 60 Height = 19 Caption = #25377#36710#24037 @@ -2287,8 +2342,8 @@ OnClick = CIFBegClick end object Button1: TButton - Left = 166 - Top = 272 + Left = 171 + Top = 277 Width = 66 Height = 43 Caption = #30830#23450 @@ -2399,9 +2454,9 @@ TabOrder = 7 OnClick = CIFBegClick end - object Edit1: TEdit + object points: TEdit Left = 136 - Top = 118 + Top = 173 Width = 169 Height = 32 Font.Charset = GB2312_CHARSET @@ -2413,19 +2468,25 @@ TabOrder = 8 OnClick = CIFBegClick end - object Edit2: TEdit - Left = 136 - Top = 173 - Width = 169 - Height = 32 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -24 - Font.Name = #23435#20307 - Font.Style = [fsBold] + object weaver_name: TcxButtonEdit + Left = 137 + Top = 119 ParentFont = False + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = cxButtonEdit1PropertiesButtonClick + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -24 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True TabOrder = 9 - OnClick = CIFBegClick + OnClick = weaver_nameClick + Width = 168 end end end @@ -2437,7 +2498,6 @@ Align = alClient Caption = 'Panel4' TabOrder = 1 - ExplicitHeight = 772 object cxGrid3: TcxGrid Left = 1 Top = 129 @@ -2445,7 +2505,8 @@ Height = 445 Align = alClient TabOrder = 0 - ExplicitHeight = 449 + ExplicitLeft = 0 + ExplicitTop = 123 object Tv3: TcxGridDBTableView OnMouseDown = Tv3MouseDown Navigator.Buttons.CustomButtons = <> @@ -2557,6 +2618,14 @@ Options.Sorting = False Width = 113 end + object Tv3code_table_length: TcxGridDBColumn + Caption = #23454#38469#31859#25968 + DataBinding.FieldName = 'code_table_length' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end end object cxGridLevel2: TcxGridLevel GridView = Tv3 @@ -2571,7 +2640,6 @@ TabOrder = 1 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> - ExplicitTop = 578 ClientRectBottom = 191 ClientRectLeft = 2 ClientRectRight = 439 @@ -2671,9 +2739,10 @@ Width = 60 end object v2Column3: TcxGridDBColumn - Caption = #25187#20998 + Caption = #25187#20998'1' DataBinding.FieldName = 'CIFPoints' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 54 @@ -2686,6 +2755,25 @@ Options.Editing = False Width = 36 end + object Tv2weaver_name: TcxGridDBColumn + Caption = #25377#36710#24037 + DataBinding.FieldName = 'weaver_name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 65 + end + object Tv2points: TcxGridDBColumn + Caption = #25187#20998 + DataBinding.FieldName = 'points' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 65 + end + object Tv2weaver_code: TcxGridDBColumn + DataBinding.FieldName = 'weaver_code' + DataBinding.IsNullValueType = True + Visible = False + end end object cxGridLevel1: TcxGridLevel GridView = Tv2 @@ -2787,9 +2875,10 @@ Width = 60 end object cxGridDBColumn8: TcxGridDBColumn - Caption = #25187#20998 + Caption = #25187#20998'1' DataBinding.FieldName = 'CIFPoints' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 54 @@ -2802,6 +2891,22 @@ Options.Editing = False Width = 36 end + object TV1weaver_name: TcxGridDBColumn + Caption = #25377#36710#24037 + DataBinding.FieldName = 'weaver_name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end + object TV1points: TcxGridDBColumn + Caption = #25187#20998 + DataBinding.FieldName = 'points' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end end object cxGridLevel3: TcxGridLevel GridView = TV1 @@ -2849,34 +2954,34 @@ ImageIndex = 5 OnClick = ToolButton5Click end - object ToolButton6: TToolButton + object ToolButton4: TToolButton Left = 142 Top = 0 AutoSize = True + Caption = #30133#28857#31649#29702 + ImageIndex = 2 + OnClick = ToolButton4Click + end + object ToolButton7: TToolButton + Left = 237 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton7Click + end + object ToolButton6: TToolButton + Left = 332 + Top = 0 + AutoSize = True Caption = #20462#25913 ImageIndex = 3 Wrap = True Visible = False OnClick = ToolButton6Click end - object ToolButton4: TToolButton - Left = 0 - Top = 38 - AutoSize = True - Caption = #30133#28857#31649#29702 - ImageIndex = 2 - OnClick = ToolButton4Click - end - object ToolButton7: TToolButton - Left = 95 - Top = 38 - AutoSize = True - Caption = #20445#23384#26684#24335 - ImageIndex = 16 - OnClick = ToolButton7Click - end object ToolButton8: TToolButton - Left = 190 + Left = 0 Top = 38 AutoSize = True Caption = #20851#38381 @@ -2931,7 +3036,6 @@ ParentBackground = False TabOrder = 3 Visible = False - ExplicitHeight = 772 object Label35: TLabel Left = 27 Top = 55 diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas index 267a0f9..d889c4f 100644 --- a/E03梭织坯布检验/U_TatMachInsp.pas +++ b/E03梭织坯布检验/U_TatMachInsp.pas @@ -321,10 +321,20 @@ type OutPutQty7: TEdit; Button3: TButton; Button10: TButton; - Edit1: TEdit; - Edit2: TEdit; + points: TEdit; Label52: TLabel; Label53: TLabel; + weaver_name: TcxButtonEdit; + Tv2weaver_name: TcxGridDBColumn; + Tv2points: TcxGridDBColumn; + TV1weaver_name: TcxGridDBColumn; + TV1points: TcxGridDBColumn; + Tv2weaver_code: TcxGridDBColumn; + Label54: TLabel; + Label55: TLabel; + code_table_length: TEdit; + Label56: TLabel; + Tv3code_table_length: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -386,6 +396,7 @@ type procedure Button10Click(Sender: TObject); procedure codeClick(Sender: TObject); procedure codeExit(Sender: TObject); + procedure weaver_nameClick(Sender: TObject); private { Private declarations } FCIID, FOperationStatus, FCIFName, FWorkshop: string; @@ -679,6 +690,7 @@ begin // AOrdDefNote1.Text := ''; Tare.Text := ''; InputWeight.Text := ''; + code_table_length.Text := ''; FLenUnit := ''; FLoom := ''; end; @@ -1193,6 +1205,7 @@ begin if (trim(edtMaBiao.Text) = '') then begin InputLen.Text := format('%.1f', [i1 / 100000]); + code_table_length.Text := InputLen.Text; end; if (trim(edtMBDW.Text) = '') then begin @@ -1478,6 +1491,9 @@ begin FieldByName('Meter').Value := MMeter; FieldByName('Yardage').Value := MYardage; FieldByName('LenUnit').Value := TRIM(lblLenUnit.Caption); + + FieldByName('code_table_length').Value := + StrToFloatdef(Trim(code_table_length.Text), 0); ///////////////////////// 泤 ///////////////////////// FieldByName('Coefficient').Value := StrToFloatdef(Coefficient.text, 0); @@ -1676,7 +1692,8 @@ var mvalue: Double; i: Integer; begin - CodeName.SetFocus; +// CodeName.SetFocus; + Code.SetFocus; if CheckData('ύ') = False then exit; @@ -1684,6 +1701,7 @@ begin begin InputLen.Text := ''; InputWeight.Text := ''; + code_table_length.Text := ''; if Trim(Edit6.Text) = '' then begin PrtData(FCIID); @@ -1808,6 +1826,24 @@ begin end; +procedure TfrmTatMachInsp.weaver_nameClick(Sender: TObject); +begin + try + frmEmployeeSel := TfrmEmployeeSel.Create(self); + with frmEmployeeSel do + begin + FPost := ''; + if ShowModal = 1 then + begin + weaver_name.Text := frmEmployeeSel.FRName; + weaver_name.Hint := frmEmployeeSel.FRCode; + end; + end; + finally + frmEmployeeSel.Free; + end; +end; + procedure TfrmTatMachInsp.cxButtonEdit1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try @@ -1959,6 +1995,15 @@ begin end; FieldByName('CIFQty').Value := StrToFloatdef(trim(CIFQty.Text), 0); + if FindField('weaver_code') <> nil then + FieldByName('weaver_code').AsString := Trim(Self.weaver_name.Hint); + + if FindField('weaver_name') <> nil then + FieldByName('weaver_name').AsString := Trim(Self.weaver_name.Text); + + if FindField('points') <> nil then + FieldByName('points').AsFloat := StrToFloatDef(Trim(Self.points.Text), 0); + Post; end; CIFBeg.Text := ''; diff --git a/E04梭织坯布仓库/TatClothStk.dproj b/E04梭织坯布仓库/TatClothStk.dproj index d966b12..e56f606 100644 --- a/E04梭织坯布仓库/TatClothStk.dproj +++ b/E04梭织坯布仓库/TatClothStk.dproj @@ -4,7 +4,7 @@ TatClothStk.dpr True Debug - 38017 + 1 Library VCL 19.2 @@ -13,16 +13,6 @@ true - - true - Base - true - - - true - Base - true - true Base @@ -43,24 +33,6 @@ Base true - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - true Cfg_2 @@ -84,13 +56,6 @@ 2052 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - - - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png - System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -113,15 +78,6 @@ false true - - Debug - - - Debug - - - Debug - 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:\D10W\项目代码\D10szGerun\E04梭织坯布仓库\testDll.exe @@ -232,10 +188,6 @@ - True - True - True - True True False diff --git a/E04梭织坯布仓库/TatClothStk.res b/E04梭织坯布仓库/TatClothStk.res index 0e05ae137104df437425da6752fdcdd5c6dd0bae..3a6735bab685663aaa09021889d865d6cb882654 100644 GIT binary patch delta 12 Tcmcb?eS>?$6;>8T1_lNI9{K}S delta 12 Tcmcb?eS>?$6;_tUDGUq%BDMr+ diff --git a/E04梭织坯布仓库/TatClothStk.skincfg b/E04梭织坯布仓库/TatClothStk.skincfg index c0891d9..57e02f9 100644 --- a/E04梭织坯布仓库/TatClothStk.skincfg +++ b/E04梭织坯布仓库/TatClothStk.skincfg @@ -3,3 +3,4 @@ Default=1 ShowNotifications=1 Enabled=1 dxSkinsDefaultPainters=1 +dxSkinWXI=1 diff --git a/E04梭织坯布仓库/U_DataLink.pas b/E04梭织坯布仓库/U_DataLink.pas index 0b5d349..ca0ccf2 100644 --- a/E04梭织坯布仓库/U_DataLink.pas +++ b/E04梭织坯布仓库/U_DataLink.pas @@ -5,7 +5,7 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, - dxSkinsCore, dxSkinsDefaultPainters, System.ImageList; + dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinWXI; type TMyThread = class(TThread) diff --git a/E04梭织坯布仓库/U_TatClothDROutEdit.dfm b/E04梭织坯布仓库/U_TatClothDROutEdit.dfm index 54cc4dd..60768fd 100644 --- a/E04梭织坯布仓库/U_TatClothDROutEdit.dfm +++ b/E04梭织坯布仓库/U_TatClothDROutEdit.dfm @@ -242,6 +242,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_MainSel DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -283,6 +284,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object VC_MJXH: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 95 @@ -290,6 +292,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object v3Column2: TcxGridDBColumn Caption = #26465#30721 DataBinding.FieldName = 'jyid' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.ReadOnly = True HeaderAlignmentHorz = taCenter @@ -298,29 +301,34 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object Tv3Column2: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'PacketNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv3Column3: TcxGridDBColumn Caption = #21253#26465#30721 DataBinding.FieldName = 'PacketId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 92 end object cv3Column3: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 98 end object cv3Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'P_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 92 end object v3Column1: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -328,6 +336,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object Tv3Column1: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -335,6 +344,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object Tv3Column4: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 @@ -354,6 +364,7 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object TV4: TcxGridDBTableView OnMouseDown = TV4MouseDown Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = ds2 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -380,18 +391,21 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object cCXCONNO: TcxGridDBColumn Caption = #35745#21010#21333 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 119 end object TV4Column1: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 98 end object cCXCOLOR: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 95 @@ -399,18 +413,21 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object cV4Column1: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end object TV4Column2: TcxGridDBColumn Caption = #30003#35831#21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 113 end object VC_SQQTY: TcxGridDBColumn Caption = #30003#35831#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 111 @@ -418,18 +435,21 @@ inherited frmTatClothDROutEdit: TfrmTatClothDROutEdit object TV4Column5: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 109 end object TV4Column3: TcxGridDBColumn Caption = #21457#36135#21305#25968 DataBinding.FieldName = 'DlyPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 123 end object cCXFHPS: TcxGridDBColumn Caption = #21457#36135#25968#37327 DataBinding.FieldName = 'DlyQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.ReadOnly = True HeaderAlignmentHorz = taCenter diff --git a/E04梭织坯布仓库/U_TatClothDROutEdit.pas b/E04梭织坯布仓库/U_TatClothDROutEdit.pas index a531715..b940c26 100644 --- a/E04梭织坯布仓库/U_TatClothDROutEdit.pas +++ b/E04梭织坯布仓库/U_TatClothDROutEdit.pas @@ -11,7 +11,8 @@ uses cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, RM_e_Xls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTatClothDROutEdit = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothOutEdit.dfm b/E04梭织坯布仓库/U_TatClothOutEdit.dfm index c91ba0b..2cb1979 100644 --- a/E04梭织坯布仓库/U_TatClothOutEdit.dfm +++ b/E04梭织坯布仓库/U_TatClothOutEdit.dfm @@ -23,6 +23,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Summary.DefaultGroupSummaryItems = <> @@ -58,6 +59,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1Column6: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter @@ -68,6 +70,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -76,12 +79,14 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1Column11: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1Column5: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -90,6 +95,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -98,12 +104,14 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object Tv1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v1Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 41 @@ -111,6 +119,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v2Column6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -119,6 +128,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v2Column5: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -202,8 +212,6 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 0 - ExplicitLeft = 88 - ExplicitTop = 8 object cxGrid2: TcxGrid Left = 2 Top = 2 @@ -211,10 +219,9 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit Height = 165 Align = alLeft TabOrder = 0 - ExplicitLeft = -3 - ExplicitTop = -1 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv2CellDblClick DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True @@ -231,6 +238,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -239,6 +247,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 123 @@ -246,6 +255,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -254,6 +264,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -262,12 +273,14 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object Tv2Column2: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'ORDPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 48 end object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'ORDQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 51 @@ -275,6 +288,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1PRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -283,6 +297,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v1PRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -456,6 +471,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -485,6 +501,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v3Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -495,6 +512,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object cxGridDBColumn1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 90 @@ -502,6 +520,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object cxGridDBColumn4: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 52 @@ -509,6 +528,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v3MJID: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -516,6 +536,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v3Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -523,12 +544,14 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object Tv3Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object v3Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 65 @@ -536,6 +559,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object cxGridDBColumn6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -544,6 +568,7 @@ inherited frmTatClothOutEdit: TfrmTatClothOutEdit object v3Column1: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 59 diff --git a/E04梭织坯布仓库/U_TatClothOutEdit.pas b/E04梭织坯布仓库/U_TatClothOutEdit.pas index 83a3d9a..4a62d1c 100644 --- a/E04梭织坯布仓库/U_TatClothOutEdit.pas +++ b/E04梭织坯布仓库/U_TatClothOutEdit.pas @@ -11,7 +11,7 @@ uses cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class, - RM_GridReport, RM_Dataset, Vcl.ToolWin; + RM_GridReport, RM_Dataset, Vcl.ToolWin, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatClothOutEdit = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm b/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm index e9f8e19..97a68ab 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm +++ b/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm @@ -9,7 +9,7 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 - TextHeight = 12 + TextHeight = 13 object ToolBar1: TToolBar [0] Tag = 1 Left = 0 @@ -84,12 +84,11 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 44 object Label2: TLabel Left = 70 Top = 36 Width = 12 - Height = 12 + Height = 13 Caption = #33267 end object Label5: TLabel @@ -106,6 +105,20 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL Font.Style = [fsBold] ParentFont = False end + object Label1: TLabel + Left = 181 + Top = 36 + Width = 52 + Height = 12 + Hint = '0' + Caption = #20135#21697#32534#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object BegDate: TDateTimePicker Left = 88 Top = 6 @@ -166,11 +179,21 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL Left = 237 Top = 6 Width = 100 - Height = 20 + Height = 21 Hint = '0' TabOrder = 5 OnKeyPress = C_NameKeyPress end + object C_code: TEdit + Tag = 2 + Left = 237 + Top = 33 + Width = 100 + Height = 21 + Hint = '0' + TabOrder = 6 + OnKeyPress = C_NameKeyPress + end end object cxGrid1: TcxGrid [2] Left = 0 @@ -187,10 +210,9 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL ParentFont = False PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 132 - ExplicitHeight = 468 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -258,6 +280,7 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL object v1Column22: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -265,9 +288,18 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL Options.Sorting = False Width = 66 end + object Tv1C_code: TcxGridDBColumn + Caption = #20135#21697#32534#21495 + DataBinding.FieldName = 'C_code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object Tv1Column3: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -275,6 +307,7 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL object v1Column23: TcxGridDBColumn Caption = #21367#25968 DataBinding.FieldName = 'js' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -282,6 +315,7 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'stkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -289,6 +323,7 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL object Tv1Column1: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'StkYardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end diff --git a/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas b/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas index bc0a8c8..dcf17de 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas +++ b/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas @@ -13,7 +13,8 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, cxPC, - System.StrUtils, U_BaseList; + System.StrUtils, U_BaseList, dxSkinWXI, dxScrollbarAnnotations, + System.ImageList, Vcl.ImgList; type TfrmTatClothStkHZListSEL = class(TfrmBaseHELP) @@ -49,6 +50,9 @@ type N1: TMenuItem; Tv1Column1: TcxGridDBColumn; ToolButton1: TToolButton; + C_code: TEdit; + Label1: TLabel; + Tv1C_code: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -136,8 +140,8 @@ begin Close; sql.Clear; - sql.Add('select C_NAME,COUNT(*)JS,SUM(stkMeter)stkMeter,SUM(StkYardage)StkYardage from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); - sql.Add('group by C_NAME'); + sql.Add('select C_NAME,C_code,COUNT(*)JS,SUM(stkMeter)stkMeter,SUM(StkYardage)StkYardage from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); + sql.Add('group by C_NAME,C_code'); // showmessage(sql.text); Open; diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas index 64155ba..4cb31cd 100644 --- a/E04梭织坯布仓库/U_TatDRList.pas +++ b/E04梭织坯布仓库/U_TatDRList.pas @@ -13,7 +13,7 @@ uses cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseList, dxDateRanges, dxScrollbarAnnotations, IdBaseComponent, IdComponent, - IdTCPConnection, IdTCPClient, IdHTTP; + IdTCPConnection, IdTCPClient, IdHTTP, dxSkinWXI; type TfrmTatDRList = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatDRSel.dfm b/E04梭织坯布仓库/U_TatDRSel.dfm index 95daa58..49bf8a0 100644 --- a/E04梭织坯布仓库/U_TatDRSel.dfm +++ b/E04梭织坯布仓库/U_TatDRSel.dfm @@ -34,8 +34,6 @@ inherited frmTatDRSel: TfrmTatDRSel ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitLeft = 8 - ExplicitTop = 5 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -84,9 +82,9 @@ inherited frmTatDRSel: TfrmTatDRSel Height = 218 Align = alClient TabOrder = 3 - ExplicitTop = 104 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -150,12 +148,14 @@ inherited frmTatDRSel: TfrmTatDRSel object v1Column8: TcxGridDBColumn Caption = #30003#35831#21333#21495 DataBinding.FieldName = 'DRMID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 93 end object v1OrdDate: TcxGridDBColumn Caption = #30331#35760#26085#26399 DataBinding.FieldName = 'Filltime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -165,36 +165,42 @@ inherited frmTatDRSel: TfrmTatDRSel object v1Column27: TcxGridDBColumn Caption = #21457#36135#26085#26399 DataBinding.FieldName = 'fhDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end object v1Column10: TcxGridDBColumn Caption = #25910#36135#21333#20301 DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 124 end object v1Column1: TcxGridDBColumn Caption = #30003#35831#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object v1Column13: TcxGridDBColumn Caption = #23457#26680#20154 DataBinding.FieldName = 'Chker' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 65 end object v1Column17: TcxGridDBColumn Caption = #23457#26680#26085#26399 DataBinding.FieldName = 'ChkTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object v1Column7: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1Column7PropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -305,7 +311,7 @@ inherited frmTatDRSel: TfrmTatDRSel Height = 20 Date = 40675.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.464761099538009200 + Time = 0.464761099538009100 TabOrder = 1 end object ToCoName: TEdit @@ -401,6 +407,7 @@ inherited frmTatDRSel: TfrmTatDRSel TabOrder = 5 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_2 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = < @@ -441,6 +448,7 @@ inherited frmTatDRSel: TfrmTatDRSel object cxGridDBColumn1: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'SCConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -448,24 +456,28 @@ inherited frmTatDRSel: TfrmTatDRSel object cxGridDBColumn2: TcxGridDBColumn Caption = #23458#25143#35746#21333#21495 DataBinding.FieldName = 'KHConno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 94 end object cxGridDBColumn3: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object v1Column6: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object cxGridDBColumn4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -473,24 +485,28 @@ inherited frmTatDRSel: TfrmTatDRSel object cxGridDBColumn5: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 60 end object cxGridDBColumn6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object cxGridDBColumn7: TcxGridDBColumn Caption = #30003#35831#21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 end object cv1Column3: TcxGridDBColumn Caption = #30003#35831#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 90 @@ -498,16 +514,19 @@ inherited frmTatDRSel: TfrmTatDRSel object TV2Column1: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True end object TV2Column2: TcxGridDBColumn Caption = #21457#36135#21305#25968 DataBinding.FieldName = 'DlyPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object TV2Column3: TcxGridDBColumn Caption = #21457#36135#25968#37327 DataBinding.FieldName = 'DlyQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end @@ -517,10 +536,12 @@ inherited frmTatDRSel: TfrmTatDRSel end end inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_TatClothStk.ADOLink Left = 73 Top = 224 end inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_TatClothStk.ADOLink Left = 73 Top = 161 end diff --git a/E04梭织坯布仓库/U_TatDRSel.pas b/E04梭织坯布仓库/U_TatDRSel.pas index c546fe1..32d7391 100644 --- a/E04梭织坯布仓库/U_TatDRSel.pas +++ b/E04梭织坯布仓库/U_TatDRSel.pas @@ -12,7 +12,8 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit, cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseHelp, - dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList; + dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTatDRSel = class(TfrmBaseHelp) @@ -162,6 +163,7 @@ begin sql.Add(' and isnull(A.Filler,'''')=''' + Trim(DName) + ''''); end; sql.Add(' order by Filltime desc '); +// showmessage(sql.text); Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm index 519f80f..bd90486 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.dfm +++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm @@ -296,6 +296,7 @@ object frmTatDRtInPut: TfrmTatDRtInPut TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = < @@ -330,12 +331,14 @@ object frmTatDRtInPut: TfrmTatDRtInPut object v1Column6: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object v1Column1: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -343,12 +346,14 @@ object frmTatDRtInPut: TfrmTatDRtInPut object Tv1Column2: TcxGridDBColumn Caption = #30003#35831#21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 end object cv1Column3: TcxGridDBColumn Caption = #30003#35831#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 90 @@ -356,12 +361,14 @@ object frmTatDRtInPut: TfrmTatDRtInPut object Tv1Column3: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object Tv1Column5: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'conno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index 5a7860d..9de1307 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -11,7 +11,7 @@ uses StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, - dxDateRanges, dxBarBuiltInMenu, U_BaseList; + dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatDRtInPut = class(Tform) diff --git a/E04梭织坯布仓库/testDll.res b/E04梭织坯布仓库/testDll.res index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644 GIT binary patch delta 12 TcmaDO`9^ZX3mz6m1_lNIB7g(5 delta 12 TcmaDO`9^ZX3m%rnDGUq%COibl