diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache index fe0e675..dcc2b3f 100644 Binary files a/A01基础公司管理/Company.identcache and b/A01基础公司管理/Company.identcache differ diff --git a/A01基础公司管理/U_Factory.dfm b/A01基础公司管理/U_Factory.dfm index 4129ddd..dd30a1c 100644 --- a/A01基础公司管理/U_Factory.dfm +++ b/A01基础公司管理/U_Factory.dfm @@ -7,8 +7,6 @@ inherited frmFactory: TfrmFactory FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -132 - ExplicitTop = -231 ExplicitWidth = 1382 ExplicitHeight = 840 PixelsPerInch = 96 @@ -215,12 +213,11 @@ inherited frmFactory: TfrmFactory Height = 364 Align = alClient TabOrder = 2 - ExplicitLeft = 1 - ExplicitTop = 100 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DS_1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -247,6 +244,7 @@ inherited frmFactory: TfrmFactory object v2Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -255,6 +253,7 @@ inherited frmFactory: TfrmFactory object v2Column2: TcxGridDBColumn Caption = #20379#24212#21830#32534#21495 DataBinding.FieldName = 'CoCode' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -263,6 +262,7 @@ inherited frmFactory: TfrmFactory object v2Column6: TcxGridDBColumn Caption = #20379#24212#21830#20840#31216 DataBinding.FieldName = 'CoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 127 @@ -270,6 +270,7 @@ inherited frmFactory: TfrmFactory object v2Column15: TcxGridDBColumn Caption = #20379#24212#21830#31616#31216 DataBinding.FieldName = 'CoAbbrName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 100 @@ -277,12 +278,14 @@ inherited frmFactory: TfrmFactory object Tv1Column2: TcxGridDBColumn Caption = #20379#24212#21830#31867#21035 DataBinding.FieldName = 'category' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object v2Column3: TcxGridDBColumn Caption = #20379#24212#21830#31867#22411 DataBinding.FieldName = 'CoBusinessType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -290,12 +293,14 @@ inherited frmFactory: TfrmFactory object Tv1Column3: TcxGridDBColumn Caption = #38468#20214 DataBinding.FieldName = 'IsFj' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 38 end object v2Column1: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'CONote' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -304,6 +309,7 @@ inherited frmFactory: TfrmFactory object v2Column12: TcxGridDBColumn Caption = #25805#20316#21592 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -311,6 +317,7 @@ inherited frmFactory: TfrmFactory object v2Column4: TcxGridDBColumn Caption = #36319#21333#21592 DataBinding.FieldName = 'Follower' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -318,6 +325,7 @@ inherited frmFactory: TfrmFactory object Tv1Column1: TcxGridDBColumn Caption = #19978#32423#21333#20301 DataBinding.FieldName = 'ParentCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 108 @@ -346,6 +354,7 @@ inherited frmFactory: TfrmFactory Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_2 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -369,6 +378,7 @@ inherited frmFactory: TfrmFactory object v3Column3: TcxGridDBColumn Caption = #40664#35748 DataBinding.FieldName = 'IsDefault' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -377,12 +387,14 @@ inherited frmFactory: TfrmFactory object Tv2Column4: TcxGridDBColumn Caption = #32844#21153 DataBinding.FieldName = 'position' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 43 end object Tv2Column1: TcxGridDBColumn Caption = #32852#31995#20154 DataBinding.FieldName = 'Contacts' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -391,6 +403,7 @@ inherited frmFactory: TfrmFactory object Tv2Column2: TcxGridDBColumn Caption = #32852#31995#30005#35805 DataBinding.FieldName = 'bossphone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 96 @@ -398,6 +411,7 @@ inherited frmFactory: TfrmFactory object Tv2Column3: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 120 @@ -405,6 +419,7 @@ inherited frmFactory: TfrmFactory object cxGridDBColumn1: TcxGridDBColumn Caption = #25163#26426#21495 DataBinding.FieldName = 'PhoneNumber' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -422,12 +437,11 @@ inherited frmFactory: TfrmFactory Height = 328 Align = alRight TabOrder = 1 - ExplicitLeft = 757 - ExplicitTop = 2 object TV3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -451,6 +465,7 @@ inherited frmFactory: TfrmFactory object cxGridDBColumn2: TcxGridDBColumn Caption = #40664#35748 DataBinding.FieldName = 'IsDefault' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -459,12 +474,14 @@ inherited frmFactory: TfrmFactory object TV3Column1: TcxGridDBColumn Caption = #36134#25143#21517#31216 DataBinding.FieldName = 'AcName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end object cxGridDBColumn3: TcxGridDBColumn Caption = #38134#34892#36134#21495 DataBinding.FieldName = 'account' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -473,6 +490,7 @@ inherited frmFactory: TfrmFactory object cxGridDBColumn4: TcxGridDBColumn Caption = #24320#25143#34892 DataBinding.FieldName = 'OpenBank' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 232 @@ -493,6 +511,7 @@ inherited frmFactory: TfrmFactory Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_4 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -516,12 +535,14 @@ inherited frmFactory: TfrmFactory object TV4Column1: TcxGridDBColumn Caption = #25991#20214#21517 DataBinding.FieldName = 'FileName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 150 end object TV4Column2: TcxGridDBColumn Caption = #19978#20256#26102#38388 DataBinding.FieldName = 'FillTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end end diff --git a/A01基础公司管理/U_Factory.pas b/A01基础公司管理/U_Factory.pas index 6dd335f..de8708c 100644 --- a/A01基础公司管理/U_Factory.pas +++ b/A01基础公司管理/U_Factory.pas @@ -14,7 +14,7 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, - dxBarBuiltInMenu, U_BaseList, cxPC; + dxBarBuiltInMenu, U_BaseList, cxPC, dxSkinWXI, dxScrollbarAnnotations; type TfrmFactory = class(TfrmBaseList) diff --git a/A01基础公司管理/U_FactoryInput.dfm b/A01基础公司管理/U_FactoryInput.dfm index 6f68250..6e43e1e 100644 --- a/A01基础公司管理/U_FactoryInput.dfm +++ b/A01基础公司管理/U_FactoryInput.dfm @@ -433,6 +433,7 @@ object frmFactoryInput: TfrmFactoryInput Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_LXR DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -456,6 +457,7 @@ object frmFactoryInput: TfrmFactoryInput object v3Column3: TcxGridDBColumn Caption = #40664#35748 DataBinding.FieldName = 'IsDefault' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -464,6 +466,7 @@ object frmFactoryInput: TfrmFactoryInput object Tv1Column4: TcxGridDBColumn Caption = #32844#21153 DataBinding.FieldName = 'position' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -477,6 +480,7 @@ object frmFactoryInput: TfrmFactoryInput object Tv1Column1: TcxGridDBColumn Caption = #32852#31995#20154 DataBinding.FieldName = 'Contacts' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -485,12 +489,14 @@ object frmFactoryInput: TfrmFactoryInput object Tv1Column2: TcxGridDBColumn Caption = #32852#31995#30005#35805 DataBinding.FieldName = 'Telephone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object cxGridDBColumn1: TcxGridDBColumn Caption = #25163#26426#21495 DataBinding.FieldName = 'PhoneNumber' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -499,6 +505,7 @@ object frmFactoryInput: TfrmFactoryInput object Tv1Column3: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -566,11 +573,11 @@ object frmFactoryInput: TfrmFactoryInput Align = alClient BorderStyle = cxcbsNone TabOrder = 1 - ExplicitLeft = 0 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_Bank DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -594,6 +601,7 @@ object frmFactoryInput: TfrmFactoryInput object cxGridDBColumn10: TcxGridDBColumn Caption = #40664#35748 DataBinding.FieldName = 'IsDefault' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -602,12 +610,14 @@ object frmFactoryInput: TfrmFactoryInput object TV2Column1: TcxGridDBColumn Caption = #36134#25143#21517#31216 DataBinding.FieldName = 'AcName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 118 end object cxGridDBColumn11: TcxGridDBColumn Caption = #38134#34892#36134#21495 DataBinding.FieldName = 'account' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter @@ -616,9 +626,17 @@ object frmFactoryInput: TfrmFactoryInput object cxGridDBColumn12: TcxGridDBColumn Caption = #24320#25143#34892 DataBinding.FieldName = 'OpenBank' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 286 end + object TV2Column2: TcxGridDBColumn + Caption = #24065#31181 + DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end end object cxGridLevel4: TcxGridLevel GridView = TV2 diff --git a/A01基础公司管理/U_FactoryInput.pas b/A01基础公司管理/U_FactoryInput.pas index 2d47ab1..12e75f6 100644 --- a/A01基础公司管理/U_FactoryInput.pas +++ b/A01基础公司管理/U_FactoryInput.pas @@ -14,7 +14,7 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, - dxBarBuiltInMenu, U_BaseList, Vcl.Menus; + dxBarBuiltInMenu, U_BaseList, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations; type TfrmFactoryInput = class(TForm) @@ -83,6 +83,7 @@ type Tv1Column4: TcxGridDBColumn; TV2Column1: TcxGridDBColumn; GPM_2: TcxGridPopupMenu; + TV2Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index f1f201e..8fee1ed 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -318,6 +318,7 @@ inherited frmClothInfo: TfrmClothInfo OptionsView.CellAutoHeight = True OptionsView.Headers = False RootValue = -1 + ScrollbarAnnotations.CustomAnnotations = <> Styles.Inactive = DataLink_ClothInfo.Red Styles.Selection = DataLink_ClothInfo.Red Styles.IncSearch = DataLink_ClothInfo.Red @@ -383,6 +384,7 @@ inherited frmClothInfo: TfrmClothInfo Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True @@ -401,6 +403,7 @@ inherited frmClothInfo: TfrmClothInfo object v1SSel: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default @@ -409,6 +412,7 @@ inherited frmClothInfo: TfrmClothInfo object v1Column12: TcxGridDBColumn Caption = #31867#21035 DataBinding.FieldName = 'CTName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default @@ -417,6 +421,7 @@ inherited frmClothInfo: TfrmClothInfo object v1CYNo: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default @@ -425,12 +430,14 @@ inherited frmClothInfo: TfrmClothInfo object v1Column9: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 96 end object Tv1Column11: TcxGridDBColumn Caption = #33521#25991#21697#21517 DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -438,6 +445,7 @@ inherited frmClothInfo: TfrmClothInfo object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default @@ -446,6 +454,7 @@ inherited frmClothInfo: TfrmClothInfo object v1Column1: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 @@ -453,6 +462,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column3: TcxGridDBColumn Caption = #22797#21512#24067'1' DataBinding.FieldName = 'C_composite1' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 85 @@ -460,6 +470,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column8: TcxGridDBColumn Caption = #22797#21512#24067'2' DataBinding.FieldName = 'C_composite2' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 @@ -467,6 +478,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column2: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -474,12 +486,14 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column1: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 58 end object v1Column11: TcxGridDBColumn Caption = #22270#29255 DataBinding.FieldName = 'IsImg' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -488,6 +502,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column5: TcxGridDBColumn Caption = #22635#21333#20154 DataBinding.FieldName = 'filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -495,6 +510,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column6: TcxGridDBColumn Caption = #20462#25913#20154 DataBinding.FieldName = 'editer' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -502,6 +518,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column7: TcxGridDBColumn Caption = #20462#25913#26102#38388 DataBinding.FieldName = 'edittime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 67 @@ -509,6 +526,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column9: TcxGridDBColumn Caption = #24405#20837#26102#38388 DataBinding.FieldName = 'FILLTIME' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -516,12 +534,14 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column10: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'CINote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object Tv1Column12: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -529,6 +549,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column13: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -536,6 +557,7 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column14: TcxGridDBColumn Caption = #21442#32771#20215 DataBinding.FieldName = 'CKPrice' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end @@ -710,6 +732,7 @@ inherited frmClothInfo: TfrmClothInfo Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource2 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -728,11 +751,13 @@ inherited frmClothInfo: TfrmClothInfo object Tv1Column4: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'GlideIdx' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object cxGridDBColumn1: TcxGridDBColumn Caption = #24037#24207 DataBinding.FieldName = 'ProcessName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -746,6 +771,7 @@ inherited frmClothInfo: TfrmClothInfo object cxGridDBColumn2: TcxGridDBColumn Caption = #24037#24207#21495 DataBinding.FieldName = 'ProcessNO' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -759,18 +785,21 @@ inherited frmClothInfo: TfrmClothInfo object TV2Column1: TcxGridDBColumn Caption = #24037#24207#31867#22411 DataBinding.FieldName = 'ProcessTypeName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object TV2Column2: TcxGridDBColumn Caption = #31867#22411#21495 DataBinding.FieldName = 'ProcessTypeNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object cxGridDBColumn3: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'PatternName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -784,6 +813,7 @@ inherited frmClothInfo: TfrmClothInfo object cxGridDBColumn4: TcxGridDBColumn Caption = #33457#22411#21495 DataBinding.FieldName = 'PatternNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -797,6 +827,7 @@ inherited frmClothInfo: TfrmClothInfo object cxGridDBColumn5: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = cxGridDBColumn5PropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -805,18 +836,21 @@ inherited frmClothInfo: TfrmClothInfo object TV2Column3: TcxGridDBColumn Caption = #24037#33402#35828#26126 DataBinding.FieldName = 'TechnologyNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 100 end object TV2Column4: TcxGridDBColumn Caption = #26469#28304 DataBinding.FieldName = 'Source' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object TV2Column5: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'CINote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index dcd5f15..ef87f3b 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -16,7 +16,7 @@ uses dxBarBuiltInMenu, cxPC, Math, RM_BarCode, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, cxContainer, dxDBBarCode, dxBarCode, Vcl.Clipbrd, cxTextEdit, BtnEdit, StrUtils, - cxButtonEdit; + cxButtonEdit, dxSkinWXI, dxScrollbarAnnotations; type FdDy = record diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index e226b69..89e5e97 100644 Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ diff --git a/A09财务通用管理/U_CollectList.pas b/A09财务通用管理/U_CollectList.pas index ccdfcf4..0bbebf9 100644 --- a/A09财务通用管理/U_CollectList.pas +++ b/A09财务通用管理/U_CollectList.pas @@ -180,8 +180,8 @@ begin end; if CheckBox1.Checked then begin - sql.Add(' and A.FFTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' '); - sql.Add(' and FFTime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' '); + sql.Add(' and ISNULL(A.FFTime,A.SQDate)>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' '); + sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' '); end; sql.Add(WSql); Open; diff --git a/A09财务通用管理/U_CompanySel.dfm b/A09财务通用管理/U_CompanySel.dfm index c72d075..8b11dff 100644 --- a/A09财务通用管理/U_CompanySel.dfm +++ b/A09财务通用管理/U_CompanySel.dfm @@ -67,25 +67,67 @@ inherited frmCompanySel: TfrmCompanySel Width = 121 end object TV1Column5: TcxGridDBColumn - Caption = #36134#25143 + Caption = #25105#21496#36134#25143 DataBinding.FieldName = 'BankName' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter + VisibleForCustomization = False end object TV1Column6: TcxGridDBColumn - Caption = #24320#25143#34892 + Caption = #25105#21496#24320#25143#34892 DataBinding.FieldName = 'BankDeposit' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter + VisibleForCustomization = False Width = 113 end object TV1Column7: TcxGridDBColumn - Caption = #38134#34892#36134#21495 + Caption = #25105#21496#38134#34892#36134#21495 DataBinding.FieldName = 'BankCardNo' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter + VisibleForCustomization = False Width = 116 end + object TV1Column8: TcxGridDBColumn + Caption = #36134#25143 + DataBinding.FieldName = 'account' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + VisibleForCustomization = False + Width = 84 + end + object TV1Column9: TcxGridDBColumn + Caption = #24320#25143#34892 + DataBinding.FieldName = 'OpenBank' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + VisibleForCustomization = False + Width = 84 + end + object TV1Column10: TcxGridDBColumn + Caption = #38134#34892#36134#25143 + DataBinding.FieldName = 'AcName' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + VisibleForCustomization = False + Width = 107 + end + object TV1Column11: TcxGridDBColumn + Caption = #24065#31181 + DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + VisibleForCustomization = False + Width = 50 + end end object cxGrid1Level1: TcxGridLevel GridView = TV1 diff --git a/A09财务通用管理/U_CompanySel.pas b/A09财务通用管理/U_CompanySel.pas index 41b95b9..947dde6 100644 --- a/A09财务通用管理/U_CompanySel.pas +++ b/A09财务通用管理/U_CompanySel.pas @@ -57,6 +57,10 @@ type TV1Column5: TcxGridDBColumn; TV1Column6: TcxGridDBColumn; TV1Column7: TcxGridDBColumn; + TV1Column8: TcxGridDBColumn; + TV1Column9: TcxGridDBColumn; + TV1Column10: TcxGridDBColumn; + TV1Column11: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -99,6 +103,7 @@ begin except application.MessageBox('ʧܣ', 'ʾϢ'); end; + end; procedure TfrmCompanySel.CoNameChange(Sender: TObject); @@ -128,7 +133,7 @@ begin begin Close; sql.Clear; - sql.Add('select A.*,B.Contacts,C.* from BS_Company A left join Bs_Company_contact B on A.CoId=B.CoID '); + sql.Add('select C.Currency,A.*,B.Contacts,C.* from BS_Company A left join Bs_Company_contact B on A.CoId=B.CoID '); sql.Add('left join Bs_Company_bank C on A.COID=C.CoID where Valid =''Y'''); if Trim(FCoType) <> '˾' then begin @@ -156,10 +161,31 @@ end; procedure TfrmCompanySel.FormShow(Sender: TObject); begin inherited; + if FCoType = '˾' then + begin + TV1Column5.visible := True; + TV1Column6.visible := True; + TV1Column7.visible := True; + TV1Column8.visible := False; + TV1Column9.visible := False; + TV1Column10.visible := False; + end + else + begin + TV1Column5.visible := False; + TV1Column6.visible := False; + TV1Column7.visible := False; + TV1Column8.visible := True; + TV1Column9.visible := True; + TV1Column10.visible := True; + end; + if FCoType = 'Ӧ' then + begin + TV1Column11.visible := True; + end; + InitGrid(); - InitGrid(); - - ReadCxGrid('λ' + Trim(FCoType), TV1, 'Զ'); + ReadCxGrid('λ1' + Trim(FCoType), TV1, 'Զ'); end; @@ -171,7 +197,7 @@ end; procedure TfrmCompanySel.TBSaveClick(Sender: TObject); begin - WriteCxGrid('λ' + Trim(FCoType), TV1, 'Զ'); + WriteCxGrid('λ1' + Trim(FCoType), TV1, 'Զ'); end; diff --git a/A09财务通用管理/U_PayInput.pas b/A09财务通用管理/U_PayInput.pas index 0786e9e..f2b8b7b 100644 --- a/A09财务通用管理/U_PayInput.pas +++ b/A09财务通用管理/U_PayInput.pas @@ -165,6 +165,7 @@ begin begin FCoType := 'ͻ'; end; + if ShowModal = 1 then begin OppCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString); diff --git a/A09财务通用管理/U_PayList.dfm b/A09财务通用管理/U_PayList.dfm index 8326c3d..f046b35 100644 --- a/A09财务通用管理/U_PayList.dfm +++ b/A09财务通用管理/U_PayList.dfm @@ -6,8 +6,6 @@ inherited frmPayList: TfrmPayList ClientWidth = 1284 FormStyle = fsMDIChild Visible = True - ExplicitLeft = -94 - ExplicitTop = -42 ExplicitWidth = 1300 ExplicitHeight = 629 PixelsPerInch = 96 diff --git a/A09财务通用管理/U_PayList.pas b/A09财务通用管理/U_PayList.pas index f24b2af..decf6ab 100644 --- a/A09财务通用管理/U_PayList.pas +++ b/A09财务通用管理/U_PayList.pas @@ -236,8 +236,8 @@ begin Filtered := False; sql.Add(' select IsTP=cast((case when (select COUNT(T.WBID) from TP_File T where T.WBID=A.FFID)=0 then 0 else 1 end) as bit ) '); sql.ADD(',A.*,B.account,B.OpenBank from Finance_Flow A'); - sql.Add(' Left join BS_Company_Bank B on A.OppBankID=B.CBID where A.FFType=''Ǽ'' '); - sql.Add(' Or ISNULL(A.RegType,'''')=''տ'''); + sql.Add(' Left join BS_Company_Bank B on A.OppBankID=B.CBID '); + sql.Add(' where (A.FFType=''Ǽ'' Or ISNULL(A.RegType,'''')=''տ'')'); case cxTabControl1.TabIndex of 0: begin diff --git a/B01基础合同管理/Contract.dproj.local b/B01基础合同管理/Contract.dproj.local index 87ab867..13b0a61 100644 --- a/B01基础合同管理/Contract.dproj.local +++ b/B01基础合同管理/Contract.dproj.local @@ -5,35 +5,35 @@ 1899-12-30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas 1899-12-30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm - 1899-12-30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas= + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.217,=D:\Dp10Repo\项目代码\骉骐\B01基础合同管理\U_SalesConInPutCopy.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= 1899-12-30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.114,=D:\Dp10Repo\项目代码\骉骐\B01基础合同管理\U_ContractList.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm - 1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas= + 1899-12-30 00:00:00.000.872,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas= 1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas= 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas + 1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas 1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas - 1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas= - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= @@ -46,27 +46,27 @@ 1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas= + 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.609,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanList.pas 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm - 1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas= 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas= 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 2024-08-21 09:38:15.872,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas diff --git a/B01基础合同管理/Contract.identcache b/B01基础合同管理/Contract.identcache index ba69672..2d5b091 100644 Binary files a/B01基础合同管理/Contract.identcache and b/B01基础合同管理/Contract.identcache differ diff --git a/B01基础合同管理/U_ContractList.dfm b/B01基础合同管理/U_ContractList.dfm index 5aa3f03..222e50c 100644 --- a/B01基础合同管理/U_ContractList.dfm +++ b/B01基础合同管理/U_ContractList.dfm @@ -6,6 +6,7 @@ inherited frmContractList: TfrmContractList ClientWidth = 1525 FormStyle = fsMDIChild Visible = True + ExplicitLeft = -9 ExplicitWidth = 1541 ExplicitHeight = 775 PixelsPerInch = 96 @@ -199,6 +200,14 @@ inherited frmContractList: TfrmContractList ImageIndex = 7 OnClick = TBCloseClick end + object ToolButton4: TToolButton + Left = 712 + Top = 38 + AutoSize = True + Caption = #23548#20986 + ImageIndex = 19 + OnClick = ToolButton4Click + end end object cxGrid1: TcxGrid [1] Left = 0 @@ -208,6 +217,7 @@ inherited frmContractList: TfrmContractList Align = alClient PopupMenu = pm1 TabOrder = 3 + ExplicitTop = 161 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -522,6 +532,27 @@ inherited frmContractList: TfrmContractList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end + object Tv1Column24: TcxGridDBColumn + Caption = #23567#21333#36153 + DataBinding.FieldName = 'XDPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1Column22: TcxGridDBColumn + Caption = #39044#20272#25104#26412 + DataBinding.FieldName = 'Estimated' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 59 + end + object Tv1Column23: TcxGridDBColumn + Caption = #39044#20272#25104#26412#35814#24773 + DataBinding.FieldName = 'EstimatedCD' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 326 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/B01基础合同管理/U_ContractList.pas b/B01基础合同管理/U_ContractList.pas index 8b8856f..3de4adb 100644 --- a/B01基础合同管理/U_ContractList.pas +++ b/B01基础合同管理/U_ContractList.pas @@ -141,6 +141,10 @@ type Tv1Column18: TcxGridDBColumn; Tv1Column20: TcxGridDBColumn; Tv1Column21: TcxGridDBColumn; + Tv1Column22: TcxGridDBColumn; + Tv1Column23: TcxGridDBColumn; + ToolButton4: TToolButton; + Tv1Column24: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -178,6 +182,7 @@ type procedure N5Click(Sender: TObject); procedure N6Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); private fFlileFlag: string; procedure InitGrid(); @@ -470,6 +475,8 @@ begin sql.Add('select IsFJ=cast((case when (select COUNT(FF.WBID) from FJ_File FF'); sql.Add('where FF.TFType = ''ͬ'' and FF.WBID=AA.ConMID)=0 then 0 else 1 end) as bit ) '); + SQL.Add(',STUFF( (SELECT '';'' +X.CB_Name+X.CB_Price FROM Bs_Contract_Sub_CB X '); + sql.Add('where X.ConSid= B.ConSid ORDER BY X.SerialNo FOR XML PATH('''')),1, 1, '''') AS EstimatedCD '); sql.Add(',AA.*,B.* from (select A.* '); sql.Add(',(Case A.Status when ''0'' then ''δύ'' when ''1'' then ''ύ'''); sql.Add('when ''9'' then '''' when ''10'' then '''' '); @@ -725,6 +732,14 @@ begin end; +procedure TfrmContractList.ToolButton4Click(Sender: TObject); +begin + if CDS_1.IsEmpty then + Exit; + TcxGridToExcel(self.Caption, cxGrid1); + +end; + procedure TfrmContractList.btnWCClick(Sender: TObject); var MConMIDS: string; diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index 3db68c5..e9a2bba 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -139,7 +139,7 @@ begin end; end; - 121: //ۺͬ + 121: //ۺͬƷѯ begin with TfrmContractList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm index eb9370b..65bece9 100644 --- a/B01基础合同管理/U_SalesConInPut.dfm +++ b/B01基础合同管理/U_SalesConInPut.dfm @@ -11,6 +11,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut OldCreateOrder = True Position = poScreenCenter WindowState = wsMaximized + ExplicitLeft = -326 + ExplicitTop = -2 ExplicitWidth = 1533 ExplicitHeight = 734 PixelsPerInch = 96 @@ -951,7 +953,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut BorderStyle = cxcbsNone PopupMenu = pm_sub TabOrder = 0 - ExplicitLeft = 4 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1185,6 +1186,13 @@ inherited frmSalesConInPut: TfrmSalesConInPut Options.Sorting = False Width = 84 end + object Tv1Column10: TcxGridDBColumn + Caption = #23567#21333#36153 + DataBinding.FieldName = 'XDPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end object Tv1Column2: TcxGridDBColumn Caption = #39044#20272#25104#26412 DataBinding.FieldName = 'Estimated' diff --git a/B01基础合同管理/U_SalesConInPut.pas b/B01基础合同管理/U_SalesConInPut.pas index cc0a6f5..31eacb8 100644 --- a/B01基础合同管理/U_SalesConInPut.pas +++ b/B01基础合同管理/U_SalesConInPut.pas @@ -155,6 +155,7 @@ type QDAddress: TBtnEditC; Label32: TLabel; IsYF: TComboBox; + Tv1Column10: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -1581,6 +1582,21 @@ begin CBMX(); end; + if PState = '鿴' then + begin + with ADOQuery1 do + begin + Close; + SQL.Clear; + sql.Add(' select * from BS_Contract_Sub_CB '); + sql.Add('where ConSid=' + quotedstr(trim(order_Sub.fieldbyname('Consid').AsString))); +// sql.Add(' order by SerialNo '); +// ShowMessage(sql.text); + Open; + end; + SCreateCDS(ADOQuery1, Sub_CB); + SInitCDSData(ADOQuery1, Sub_CB); + end; // TV2.DataController.Filter.Clear; end; diff --git a/B01基础合同管理/U_SalesContractList.dfm b/B01基础合同管理/U_SalesContractList.dfm index 0d1230f..75e44a5 100644 --- a/B01基础合同管理/U_SalesContractList.dfm +++ b/B01基础合同管理/U_SalesContractList.dfm @@ -990,6 +990,13 @@ inherited frmSalesContractList: TfrmSalesContractList HeaderAlignmentHorz = taCenter Width = 54 end + object TV2Column3: TcxGridDBColumn + Caption = #23567#21333#36153 + DataBinding.FieldName = 'XDPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 56 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 diff --git a/B01基础合同管理/U_SalesContractList.pas b/B01基础合同管理/U_SalesContractList.pas index db49344..53167b7 100644 --- a/B01基础合同管理/U_SalesContractList.pas +++ b/B01基础合同管理/U_SalesContractList.pas @@ -131,6 +131,7 @@ type TV2Column2: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; + TV2Column3: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -649,6 +650,11 @@ begin FGSTT := self.FGSTT; ToolBar2.Visible := False; TBSave.Visible := False; + panel2.Visible := True; + ToolButton4.Visible := False; + ToolButton5.Visible := False; + ToolButton1.Visible := False; + ToolButton2.Visible := False; // ScrollBox1.Enabled := False; if ShowModal = 1 then begin diff --git a/B04采购计划管理/ProjectGroup1.groupproj.local b/B04采购计划管理/ProjectGroup1.groupproj.local index 857b53a..5b943b8 100644 --- a/B04采购计划管理/ProjectGroup1.groupproj.local +++ b/B04采购计划管理/ProjectGroup1.groupproj.local @@ -1,7 +1,7 @@  - - - - + + + + diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache index 16d7f71..a47ce8e 100644 Binary files a/B04采购计划管理/PurchasePlan.identcache and b/B04采购计划管理/PurchasePlan.identcache differ diff --git a/B04采购计划管理/testDll.identcache b/B04采购计划管理/testDll.identcache index 2ba39f1..8e19809 100644 Binary files a/B04采购计划管理/testDll.identcache and b/B04采购计划管理/testDll.identcache differ diff --git a/T03贸易布匹检验/TradeInsp.identcache b/T03贸易布匹检验/TradeInsp.identcache index 293074e..1a6bf4d 100644 Binary files a/T03贸易布匹检验/TradeInsp.identcache and b/T03贸易布匹检验/TradeInsp.identcache differ diff --git a/T03贸易布匹检验/testDll.identcache b/T03贸易布匹检验/testDll.identcache index 366c68e..b4d04e6 100644 Binary files a/T03贸易布匹检验/testDll.identcache and b/T03贸易布匹检验/testDll.identcache differ diff --git a/T04贸易明细仓库/U_TradeClothOutEdit.dfm b/T04贸易明细仓库/U_TradeClothOutEdit.dfm index f317e16..29f9425 100644 --- a/T04贸易明细仓库/U_TradeClothOutEdit.dfm +++ b/T04贸易明细仓库/U_TradeClothOutEdit.dfm @@ -23,6 +23,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit 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 frmTradeClothOutEdit: TfrmTradeClothOutEdit object v1Column6: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter @@ -68,6 +70,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit 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 frmTradeClothOutEdit: TfrmTradeClothOutEdit 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,12 +95,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv1Column4: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'PacketNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 57 end object v1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -104,12 +111,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v2Column6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -118,6 +127,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v2Column5: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -126,12 +136,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv1Column2: TcxGridDBColumn Caption = #32568#21495 DataBinding.FieldName = 'BatchNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column3: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 52 end @@ -241,6 +253,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv2CellDblClick DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True @@ -257,6 +270,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -265,6 +279,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 123 @@ -272,6 +287,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -280,6 +296,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -288,12 +305,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv2Column2: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 48 end object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 51 @@ -301,6 +320,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 42 @@ -308,6 +328,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v1PRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -316,6 +337,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v1PRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -324,12 +346,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv2Column1: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 60 end object Tv2Column3: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 58 end @@ -381,7 +405,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit end object Label1: TLabel Left = 386 - Top = 82 + Top = 92 Width = 24 Height = 12 Caption = #22791#27880 @@ -475,8 +499,8 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit end end object edtScan: TEdit - Left = 81 - Top = 84 + Left = 84 + Top = 89 Width = 296 Height = 72 Font.Charset = GB2312_CHARSET @@ -489,12 +513,10 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit OnKeyPress = edtScanKeyPress end object IONote: TMemo - Left = 419 - Top = 84 + Left = 416 + Top = 89 Width = 189 Height = 59 - Lines.Strings = ( - '') TabOrder = 5 end end @@ -563,6 +585,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -591,6 +614,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v3Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -601,6 +625,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object cxGridDBColumn1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 90 @@ -608,6 +633,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object cxGridDBColumn4: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 52 @@ -615,6 +641,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v3MJID: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -622,6 +649,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v3Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -629,12 +657,14 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv3Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object cxGridDBColumn6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -643,6 +673,7 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object v3Column1: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 59 @@ -650,18 +681,21 @@ inherited frmTradeClothOutEdit: TfrmTradeClothOutEdit object Tv3Column2: TcxGridDBColumn Caption = #32568#21495 DataBinding.FieldName = 'BatchNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv3Column3: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 49 end object Tv3Column4: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'PacketNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 49 end diff --git a/T04贸易明细仓库/U_TradeClothOutEdit.pas b/T04贸易明细仓库/U_TradeClothOutEdit.pas index 08caf91..ff485ad 100644 --- a/T04贸易明细仓库/U_TradeClothOutEdit.pas +++ b/T04贸易明细仓库/U_TradeClothOutEdit.pas @@ -11,7 +11,8 @@ 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, BtnEdit; + RM_GridReport, RM_Dataset, Vcl.ToolWin, BtnEdit, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradeClothOutEdit = class(TfrmBaseList) diff --git a/T04贸易明细仓库/U_TradeClothOutListNew.dfm b/T04贸易明细仓库/U_TradeClothOutListNew.dfm index d6cdf31..8ac95e3 100644 --- a/T04贸易明细仓库/U_TradeClothOutListNew.dfm +++ b/T04贸易明细仓库/U_TradeClothOutListNew.dfm @@ -7,7 +7,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitTop = -28 + ExplicitLeft = -368 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -1625,6 +1625,13 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew Options.Editing = False Width = 66 end + object Tv1Column13: TcxGridDBColumn + Caption = #20986#24211#22791#27880 + DataBinding.FieldName = 'IONote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end object Tv1Column2: TcxGridDBColumn Caption = #33521#25991#39068#33394 DataBinding.FieldName = 'C_EColor' @@ -1640,13 +1647,6 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew HeaderAlignmentHorz = taCenter Width = 66 end - object Tv1Column13: TcxGridDBColumn - Caption = #20986#24211#22791#27880 - DataBinding.FieldName = 'IONote' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 86 - end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T04贸易明细仓库/U_TradeClothOutListNew.pas b/T04贸易明细仓库/U_TradeClothOutListNew.pas index 09c1ea0..8a2b0e2 100644 --- a/T04贸易明细仓库/U_TradeClothOutListNew.pas +++ b/T04贸易明细仓库/U_TradeClothOutListNew.pas @@ -164,7 +164,6 @@ type TV2Column8: TcxGridDBColumn; TV2Column9: TcxGridDBColumn; TV2Column10: TcxGridDBColumn; - Tv1Column13: TcxGridDBColumn; DS_3: TDataSource; CDS_3: TClientDataSet; Panel1: TPanel; @@ -200,6 +199,7 @@ type Button1: TButton; TV2Column11: TcxGridDBColumn; TV3Column1: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject);