From f501114fda360015a03fc676309a9f1a66d71c76 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Wed, 11 Jun 2025 09:07:37 +0800 Subject: [PATCH] 12345 --- A02基础产品管理/ClothInfo.dproj.local | 88 ++-- A02基础产品管理/ClothInfo.identcache | Bin 2019 -> 2019 bytes A02基础产品管理/U_ClothInfo.dfm | 36 +- A02基础产品管理/U_ClothInfo.pas | 4 - A02基础产品管理/U_ClothInfoInput.dfm | 608 +++++++++++++++++------- A02基础产品管理/U_ClothInfoInput.pas | 548 ++++++++++++++++++--- A02基础产品管理/U_TatClothInfo.dfm | 19 + A02基础产品管理/U_TatClothInfo.pas | 3 +- A02基础产品管理/U_TatClothInfoInput.dfm | 34 +- A02基础产品管理/U_TatClothInfoInput.pas | 2 +- 10 files changed, 1016 insertions(+), 326 deletions(-) diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index fe6dde0..0eb5115 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -1,50 +1,50 @@  - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm - 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm - 1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas= - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas - 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm - 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas= + 1899-12-30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm + 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas + 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas + 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/A02基础产品管理/ClothInfo.identcache b/A02基础产品管理/ClothInfo.identcache index 0a7a38a83054cb5bac6fa8f0876d956b4de035a3..3228c4df5494dc3c576422aa18959cc26598bd71 100644 GIT binary patch delta 39 xcmV+?0NDTI591F38j~;wE|ZV}5V4gT1CvJvRkN@ImjaWG2Ro5J8?&4SM*#x+46XnG delta 36 scmaFN|Cpauih+T_bFu)V)#OGt>5VL5%$wIUPiLAO#T>eM4x2k80J&-kP5=M^ diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index 06e6f4f..a9e7cb8 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -322,8 +322,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient PopupMenu = PM_1 TabOrder = 0 - ExplicitLeft = 6 - ExplicitTop = 41 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -378,14 +376,6 @@ inherited frmClothInfo: TfrmClothInfo 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 - end object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' @@ -403,37 +393,14 @@ inherited frmClothInfo: TfrmClothInfo Options.Editing = False Width = 81 end - object Tv1Column3: TcxGridDBColumn - Caption = #22383#24067#32534#21495 - DataBinding.FieldName = 'C_FromCode' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 85 - end object Tv1Column8: TcxGridDBColumn Caption = #22383#24067#21517#31216 - DataBinding.FieldName = 'C_FromName' + DataBinding.FieldName = 'F_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 end - object Tv1Column2: TcxGridDBColumn - Caption = #25104#20998 - DataBinding.FieldName = 'C_Composition' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - 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' @@ -633,6 +600,7 @@ inherited frmClothInfo: TfrmClothInfo Height = 41 Align = alTop TabOrder = 1 + Visible = False DesignSize = ( 1208 41) diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 28e2824..889f465 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -113,9 +113,7 @@ type ToolButton1: TToolButton; DataSource3: TDataSource; CDS_Sub: TClientDataSet; - Tv1Column2: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; cxGridPopupMenu2: TcxGridPopupMenu; ToolButton2: TToolButton; N3: TMenuItem; @@ -129,9 +127,7 @@ type CDS_Tree: TClientDataSet; ADOQueryPrint: TADOQuery; CDS_Label: TClientDataSet; - Tv1Column1: TcxGridDBColumn; ToolButton3: TToolButton; - Tv1Column3: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 7cbb7df..05adb13 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -1,9 +1,8 @@ -object frmClothInfoInput: TfrmClothInfoInput +object frmClothInfoInput: TfrmClothInfoInput Left = 459 Top = 231 - Anchors = [] Caption = #20135#21697#20449#24687#24405#20837 - ClientHeight = 667 + ClientHeight = 748 ClientWidth = 1080 Color = clWhite Font.Charset = GB2312_CHARSET @@ -62,30 +61,38 @@ Left = 0 Top = 38 Width = 1080 - Height = 621 - Align = alTop + Height = 710 + Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False TabOrder = 1 - Properties.ActivePage = cxTabSheet6 + Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> - ClientRectBottom = 619 + ExplicitHeight = 621 + ClientRectBottom = 708 ClientRectLeft = 2 ClientRectRight = 1078 - ClientRectTop = 22 + ClientRectTop = 25 object cxTabSheet1: TcxTabSheet Caption = #22522#26412#20449#24687 ImageIndex = 0 + ExplicitTop = 22 + ExplicitHeight = 597 object Panel1: TPanel Left = 0 Top = 0 Width = 1076 - Height = 597 + Height = 683 Align = alClient TabOrder = 0 - ExplicitLeft = -176 - ExplicitTop = -60 + ExplicitTop = -3 object C_GramWeight: TcxTextEdit Tag = 2 - Left = 118 + Left = 130 Top = 85 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -96,7 +103,7 @@ end object C_Name: TcxTextEdit Tag = 2 - Left = 118 + Left = 130 Top = 17 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -107,7 +114,7 @@ end object F_Width: TcxTextEdit Tag = 2 - Left = 701 + Left = 738 Top = 17 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -117,12 +124,12 @@ Width = 140 end object cxLabel37: TcxLabel - Left = 29 + Left = 16 Top = 21 Caption = #25104#21697#21697#21517 end object cxLabel38: TcxLabel - Left = 304 + Left = 293 Top = 123 Caption = #32428#26012 end @@ -132,17 +139,17 @@ Caption = #26448#36136 end object cxLabel40: TcxLabel - Left = 304 + Left = 293 Top = 157 Caption = #21518#25972#29702#31867#22411 end object cxLabel41: TcxLabel - Left = 29 + Left = 16 Top = 89 Caption = #25104#21697#20811#37325'(g/'#13217')' end object cxLabel42: TcxLabel - Left = 29 + Left = 16 Top = 123 Caption = #22383#24067#21697#21517 end @@ -152,22 +159,22 @@ Caption = #22383#24067#38376#24133'(cm)' end object cxLabel44: TcxLabel - Left = 304 + Left = 293 Top = 55 Caption = #25104#21697#32463#23494'('#26681'/'#33521#23544')' end object cxLabel45: TcxLabel - Left = 304 + Left = 293 Top = 21 Caption = #25104#21697#38376#24133'(cm)' end object cxLabel46: TcxLabel - Left = 29 + Left = 16 Top = 157 Caption = #22383#24067#20811#37325'(g/'#13217')' end object cxLabel47: TcxLabel - Left = 304 + Left = 293 Top = 89 Caption = #25104#21697#32428#23494'('#26681'/'#33521#23544')' end @@ -178,7 +185,7 @@ end object Material: TcxTextEdit Tag = 2 - Left = 701 + Left = 738 Top = 119 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -189,7 +196,7 @@ end object LatitudeSlope: TcxTextEdit Tag = 2 - Left = 410 + Left = 435 Top = 119 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -200,7 +207,7 @@ end object FinishingStandards: TcxTextEdit Tag = 2 - Left = 701 + Left = 738 Top = 153 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -211,7 +218,7 @@ end object F_Name: TcxTextEdit Tag = 2 - Left = 118 + Left = 130 Top = 119 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -222,7 +229,7 @@ end object C_FinishLongitudeDensity: TcxTextEdit Tag = 2 - Left = 410 + Left = 435 Top = 51 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -233,7 +240,7 @@ end object C_Width: TcxTextEdit Tag = 2 - Left = 410 + Left = 435 Top = 17 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -244,7 +251,7 @@ end object F_GramWeight: TcxTextEdit Tag = 2 - Left = 118 + Left = 130 Top = 153 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -255,7 +262,7 @@ end object C_FinishLatitudeDensity: TcxTextEdit Tag = 2 - Left = 410 + Left = 435 Top = 85 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -266,7 +273,7 @@ end object Finishingtype: TcxTextEdit Tag = 2 - Left = 410 + Left = 435 Top = 153 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -287,7 +294,7 @@ end object F_FinishLongitudeDensity: TcxTextEdit Tag = 2 - Left = 701 + Left = 738 Top = 51 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -298,7 +305,7 @@ end object F_FinishLatitudeDensity: TcxTextEdit Tag = 2 - Left = 701 + Left = 738 Top = 85 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -308,13 +315,13 @@ Width = 140 end object cxLabel150: TcxLabel - Left = 29 + Left = 16 Top = 56 Caption = #25104#21697#32534#21495 end object C_Code: TcxTextEdit Tag = 2 - Left = 118 + Left = 130 Top = 52 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -323,20 +330,208 @@ TabOrder = 29 Width = 140 end + object cxGrid4: TcxGrid + Left = 1 + Top = 392 + Width = 1074 + Height = 290 + Align = alBottom + TabOrder = 30 + ExplicitTop = 386 + object TV4: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_GX + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object cxGridDBColumn1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object cxGridDBColumn2: TcxGridDBColumn + Caption = #21407#26009#21517#31216 + DataBinding.FieldName = 'GXName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn11: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'NOTE' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 142 + end + end + object cxGridLevel4: TcxGridLevel + GridView = TV4 + end + end + object Panel8: TPanel + Left = 1 + Top = 351 + Width = 1074 + Height = 41 + Align = alBottom + TabOrder = 31 + ExplicitTop = 345 + object Panel9: TPanel + Left = 1 + Top = 42 + Width = 184 + Height = 39 + Align = alLeft + TabOrder = 0 + ExplicitTop = 1 + object Label20: TLabel + Left = 37 + Top = 7 + Width = 84 + Height = 20 + Caption = #24037#24207#20449#24687 + Font.Charset = GB2312_CHARSET + Font.Color = clRed + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + end + object Panel10: TPanel + Left = 1 + Top = 1 + Width = 1072 + Height = 41 + Align = alTop + TabOrder = 1 + ExplicitTop = 0 + object Panel11: TPanel + Left = 1 + Top = 1 + Width = 184 + Height = 39 + Align = alLeft + TabOrder = 0 + object Label1: TLabel + Left = 37 + Top = 7 + Width = 84 + Height = 20 + Caption = #24037#24207#20449#24687 + Font.Charset = GB2312_CHARSET + Font.Color = clRed + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + end + object ToolBar2: TToolBar + Tag = 1 + Left = 185 + Top = 1 + Width = 497 + Height = 39 + Align = alLeft + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar1' + Color = clWhite + DisabledImages = DataLink_ClothInfo.ImageList_new32 + EdgeInner = esNone + EdgeOuter = esNone + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + Images = DataLink_ClothInfo.ImageList_new32 + List = True + ParentColor = False + ParentFont = False + ShowCaptions = True + TabOrder = 1 + object ToolButton2: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #28165#27927 + ImageIndex = 2 + OnClick = ToolButton2Click + end + object ToolButton3: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #23450#22411 + ImageIndex = 2 + OnClick = ToolButton3Click + end + object ToolButton1: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #38450#27700 + ImageIndex = 2 + OnClick = ToolButton1Click + end + object ToolButton4: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #21457#27873 + ImageIndex = 2 + OnClick = ToolButton4Click + end + object ToolButton5: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #21038#33014 + ImageIndex = 2 + OnClick = ToolButton5Click + end + object ToolButton6: TToolButton + Left = 355 + Top = 0 + AutoSize = True + Caption = #36711#27611 + ImageIndex = 2 + OnClick = ToolButton6Click + end + object ToolButton7: TToolButton + Left = 426 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 6 + OnClick = ToolButton7Click + end + end + end + end end end object cxTabSheet2: TcxTabSheet - Caption = #28165#27927#24037#24207 + Caption = ' '#28165#27927' ' ImageIndex = 2 + ExplicitTop = 22 + ExplicitHeight = 597 object Panel2: TPanel Left = 0 Top = 0 Width = 1076 - Height = 597 + Height = 683 Align = alClient TabOrder = 0 - ExplicitLeft = -16 - ExplicitTop = -88 + ExplicitHeight = 597 object cxLabel10: TcxLabel Left = 25 Top = 131 @@ -363,12 +558,12 @@ Caption = #27880#24847#20107#39033 end object cxLabel15: TcxLabel - Left = 405 + Left = 462 Top = 226 Caption = '4#' end object cxLabel16: TcxLabel - Left = 405 + Left = 462 Top = 195 Caption = '2#' end @@ -409,7 +604,7 @@ end object qx_WaterContent: TcxTextEdit Tag = 2 - Left = 498 + Left = 528 Top = 97 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -420,7 +615,7 @@ end object qx_RollMethod: TcxTextEdit Tag = 2 - Left = 498 + Left = 528 Top = 36 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -431,7 +626,7 @@ end object qx_Add_Name: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 67 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -455,7 +650,7 @@ end object qx_temperature4: TcxTextEdit Tag = 2 - Left = 498 + Left = 528 Top = 223 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -466,7 +661,7 @@ end object qx_temperature2: TcxTextEdit Tag = 2 - Left = 498 + Left = 528 Top = 192 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -477,7 +672,7 @@ end object qx_temperature1: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 194 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -488,7 +683,7 @@ end object qx_temperature3: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 224 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -499,7 +694,7 @@ end object qx_temperature5: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 253 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -510,7 +705,7 @@ end object qx_UnpackingMethod: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 36 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -521,7 +716,7 @@ end object qx_speed: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 97 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -532,7 +727,7 @@ end object qx_ReduceAmplitude: TcxTextEdit Tag = 2 - Left = 83 + Left = 96 Top = 128 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -543,7 +738,7 @@ end object qx_Add_Number: TcxTextEdit Tag = 2 - Left = 498 + Left = 528 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -560,17 +755,18 @@ end end object cxTabSheet3: TcxTabSheet - Caption = #23450#22411#24037#24207 + Caption = ' '#23450#22411' ' ImageIndex = 3 + ExplicitTop = 22 + ExplicitHeight = 597 object Panel3: TPanel Left = 0 Top = 0 Width = 1076 - Height = 597 + Height = 683 Align = alClient TabOrder = 0 - ExplicitLeft = 24 - ExplicitTop = 32 + ExplicitHeight = 597 object cxLabel1: TcxLabel Left = 284 Top = 134 @@ -622,7 +818,7 @@ Caption = #25490#39118#26426#36716#36895'('#36716'/'#20998')' end object cxLabel3: TcxLabel - Left = 575 + Left = 613 Top = 38 Caption = #36895#24230'(M/Min)' end @@ -637,7 +833,7 @@ Caption = #27880#24847#20107#39033 end object cxLabel55: TcxLabel - Left = 575 + Left = 613 Top = 101 Caption = #19978#36229#21890#29575'(%)' end @@ -652,7 +848,7 @@ Caption = #28072#21147' MPA' end object cxLabel58: TcxLabel - Left = 575 + Left = 613 Top = 70 Caption = #27611#21047#36229#21890#29575'(%)' end @@ -667,7 +863,7 @@ Caption = '6#' end object cxLabel60: TcxLabel - Left = 575 + Left = 613 Top = 133 Caption = #19979#36229#21890#29575'(%)' end @@ -698,7 +894,7 @@ end object dx_OutFanSpeed: TcxTextEdit Tag = 2 - Left = 402 + Left = 440 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -720,7 +916,7 @@ end object dx_WidthAmplitude: TcxTextEdit Tag = 2 - Left = 402 + Left = 440 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -753,7 +949,7 @@ end object dx_UnpackingMethod: TcxTextEdit Tag = 2 - Left = 113 + Left = 128 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -764,7 +960,7 @@ end object dx_OpenAmplitude: TcxTextEdit Tag = 2 - Left = 113 + Left = 128 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -775,7 +971,7 @@ end object dx_RosePower: TcxTextEdit Tag = 2 - Left = 113 + Left = 128 Top = 97 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -786,7 +982,7 @@ end object dx_RollMethod: TcxTextEdit Tag = 2 - Left = 402 + Left = 440 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -797,7 +993,7 @@ end object dx_BrushSuperRate: TcxTextEdit Tag = 2 - Left = 655 + Left = 722 Top = 65 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -821,7 +1017,7 @@ end object dx_UpSuperRate: TcxTextEdit Tag = 2 - Left = 655 + Left = 722 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -832,7 +1028,7 @@ end object dx_speed: TcxTextEdit Tag = 2 - Left = 655 + Left = 722 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -843,7 +1039,7 @@ end object dx_TubePress: TcxTextEdit Tag = 2 - Left = 113 + Left = 128 Top = 128 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -865,7 +1061,7 @@ end object dx_CycleFanSpeed: TcxTextEdit Tag = 2 - Left = 402 + Left = 440 Top = 127 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -876,7 +1072,7 @@ end object dx_DownSuperRate: TcxTextEdit Tag = 2 - Left = 655 + Left = 722 Top = 126 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -954,13 +1150,15 @@ end end object cxTabSheet4: TcxTabSheet - Caption = #38450#27700#24037#33402 + Caption = ' '#38450#27700' ' ImageIndex = 4 + ExplicitTop = 22 + ExplicitHeight = 597 object cxGrid2: TcxGrid Left = 0 - Top = 389 + Top = 393 Width = 1076 - Height = 208 + Height = 290 Align = alBottom TabOrder = 0 object Tv1: TcxGridDBTableView @@ -972,6 +1170,13 @@ DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False OptionsView.Indicator = True + object Tv1Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end object Tv11fs_Name: TcxGridDBColumn Caption = #21407#26009#21517#31216 DataBinding.FieldName = 'fs_Name' @@ -1051,17 +1256,17 @@ Left = 0 Top = 0 Width = 1076 - Height = 389 + Height = 393 Align = alClient TabOrder = 1 - ExplicitTop = -6 + ExplicitHeight = 401 object cxLabel100: TcxLabel Left = 260 Top = 247 Caption = '6#' end object cxLabel101: TcxLabel - Left = 565 + Left = 627 Top = 132 Caption = #19979#36229#21890#29575'(%)' end @@ -1096,7 +1301,7 @@ Caption = #21387#36710#21387#21147'(MPA)' end object cxLabel110: TcxLabel - Left = 276 + Left = 301 Top = 161 Caption = #21387#36746#21518#21547#27700#29575'(%)' end @@ -1106,7 +1311,7 @@ Caption = #27974#26009#37197#27604':' end object cxLabel82: TcxLabel - Left = 276 + Left = 301 Top = 130 Caption = #24490#29615#39118#26426#36716#36895'('#36716'/'#20998')' end @@ -1146,17 +1351,17 @@ Caption = #36864#24067#26041#27861 end object cxLabel90: TcxLabel - Left = 276 + Left = 301 Top = 69 Caption = #36710#23614#38376#24133 end object cxLabel91: TcxLabel - Left = 276 + Left = 301 Top = 100 Caption = #25490#39118#26426#36716#36895'('#36716'/'#20998')' end object cxLabel92: TcxLabel - Left = 565 + Left = 627 Top = 38 Caption = #36895#24230'(M/Min)' end @@ -1171,12 +1376,12 @@ Caption = #27880#24847#20107#39033 end object cxLabel95: TcxLabel - Left = 565 + Left = 627 Top = 101 Caption = #19978#36229#21890#29575'(%)' end object cxLabel96: TcxLabel - Left = 276 + Left = 301 Top = 38 Caption = #26426#23614#21367#24067#26041#27861 end @@ -1186,7 +1391,7 @@ Caption = #28072#21147'(MPA)' end object cxLabel98: TcxLabel - Left = 565 + Left = 627 Top = 69 Caption = #27611#21047#36229#21890#29575'(%)' end @@ -1197,7 +1402,7 @@ end object fs_OutFanSpeed: TcxTextEdit Tag = 2 - Left = 394 + Left = 456 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1219,7 +1424,7 @@ end object fs_WidthAmplitude: TcxTextEdit Tag = 2 - Left = 394 + Left = 456 Top = 65 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1252,7 +1457,7 @@ end object fs_UnpackingMethod: TcxTextEdit Tag = 2 - Left = 113 + Left = 138 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1263,7 +1468,7 @@ end object fs_OpenAmplitude: TcxTextEdit Tag = 2 - Left = 113 + Left = 138 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1274,7 +1479,7 @@ end object fs_RosePower: TcxTextEdit Tag = 2 - Left = 113 + Left = 138 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1285,7 +1490,7 @@ end object fs_RollMethod: TcxTextEdit Tag = 2 - Left = 394 + Left = 456 Top = 34 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1296,7 +1501,7 @@ end object fs_BrushSuperRate: TcxTextEdit Tag = 2 - Left = 645 + Left = 735 Top = 65 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1307,7 +1512,7 @@ end object fs_Precautions: TcxTextEdit Tag = 2 - Left = 84 + Left = 106 Top = 304 AutoSize = False Style.LookAndFeel.SkinName = 'WXI' @@ -1320,7 +1525,7 @@ end object fs_UpSuperRate: TcxTextEdit Tag = 2 - Left = 645 + Left = 735 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1331,7 +1536,7 @@ end object fs_speed: TcxTextEdit Tag = 2 - Left = 645 + Left = 735 Top = 34 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1342,7 +1547,7 @@ end object fs_TubePress: TcxTextEdit Tag = 2 - Left = 113 + Left = 138 Top = 127 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1364,7 +1569,7 @@ end object fs_CycleFanSpeed: TcxTextEdit Tag = 2 - Left = 394 + Left = 456 Top = 126 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1375,7 +1580,7 @@ end object fs_DownSuperRate: TcxTextEdit Tag = 2 - Left = 645 + Left = 735 Top = 127 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1452,7 +1657,7 @@ end object fs_CarPress: TcxTextEdit Tag = 2 - Left = 113 + Left = 138 Top = 158 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1463,7 +1668,7 @@ end object fs_PressWaterContent: TcxTextEdit Tag = 2 - Left = 394 + Left = 456 Top = 157 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1475,24 +1680,33 @@ end end object cxTabSheet5: TcxTabSheet - Caption = #21457#27873#24037#33402 + Caption = ' '#21457#27873' ' ImageIndex = 4 + ExplicitTop = 22 + ExplicitHeight = 597 object cxGrid1: TcxGrid Left = 0 - Top = 467 + Top = 471 Width = 1076 - Height = 130 + Height = 212 Align = alBottom TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_1 + DataController.DataSource = DS_2 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False OptionsView.Indicator = True + object Tv2Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 67 + end object Tv2fp_Name: TcxGridDBColumn Caption = #21407#26009#21517#31216 DataBinding.FieldName = 'fp_Name' @@ -1568,18 +1782,19 @@ Left = 0 Top = 0 Width = 1076 - Height = 467 + Height = 471 Align = alClient Caption = 'Panel5' TabOrder = 1 ExplicitTop = -6 + ExplicitHeight = 464 object cxLabel107: TcxLabel - Left = 310 + Left = 353 Top = 415 Caption = #31995#32479#21387#21147'(Kg)' end object cxLabel108: TcxLabel - Left = 310 + Left = 353 Top = 385 Caption = #28151#21512#22836#30005#26426#39057#29575'('#36716')' end @@ -1594,7 +1809,7 @@ Caption = '6#' end object cxLabel30: TcxLabel - Left = 573 + Left = 642 Top = 133 Caption = #19979#36229#21890#29575'(%)' end @@ -1629,7 +1844,7 @@ Caption = #20992#26495#24038#39640#24230'(mm)' end object cxLabel49: TcxLabel - Left = 281 + Left = 311 Top = 164 Caption = #20992#26495#21491#39640#24230'(mm)' end @@ -1639,7 +1854,7 @@ Caption = #27974#26009#37197#27604':' end object cxLabel51: TcxLabel - Left = 281 + Left = 311 Top = 132 Caption = #24490#29615#39118#26426#36716#36895'('#36716'/'#20998')' end @@ -1679,17 +1894,17 @@ Caption = #36864#24067#26041#27861 end object cxLabel70: TcxLabel - Left = 281 + Left = 311 Top = 70 Caption = #36710#23614#38376#24133 end object cxLabel71: TcxLabel - Left = 281 + Left = 311 Top = 101 Caption = #25490#39118#26426#36716#36895'('#36716'/'#20998')' end object cxLabel72: TcxLabel - Left = 573 + Left = 642 Top = 38 Caption = #36895#24230'(M/Min)' end @@ -1704,12 +1919,12 @@ Caption = #27880#24847#20107#39033 end object cxLabel75: TcxLabel - Left = 573 + Left = 642 Top = 101 Caption = #19978#36229#21890#29575'(%)' end object cxLabel76: TcxLabel - Left = 281 + Left = 311 Top = 38 Caption = #26426#23614#21367#24067#26041#27861 end @@ -1719,7 +1934,7 @@ Caption = #28072#21147'(MPA)' end object cxLabel78: TcxLabel - Left = 573 + Left = 642 Top = 70 Caption = #27611#21047#36229#21890#29575'(%)' end @@ -1740,7 +1955,7 @@ end object fp_OutFanSpeed: TcxTextEdit Tag = 2 - Left = 399 + Left = 468 Top = 98 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1762,7 +1977,7 @@ end object fp_WidthAmplitude: TcxTextEdit Tag = 2 - Left = 399 + Left = 468 Top = 67 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1795,7 +2010,7 @@ end object fp_UnpackingMethod: TcxTextEdit Tag = 2 - Left = 113 + Left = 143 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1806,7 +2021,7 @@ end object fp_OpenAmplitude: TcxTextEdit Tag = 2 - Left = 113 + Left = 143 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1817,7 +2032,7 @@ end object fp_RosePower: TcxTextEdit Tag = 2 - Left = 113 + Left = 143 Top = 96 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1828,7 +2043,7 @@ end object fp_RollMethod: TcxTextEdit Tag = 2 - Left = 399 + Left = 468 Top = 36 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1839,7 +2054,7 @@ end object fp_BrushSuperRate: TcxTextEdit Tag = 2 - Left = 653 + Left = 754 Top = 66 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1863,7 +2078,7 @@ end object fp_UpSuperRate: TcxTextEdit Tag = 2 - Left = 653 + Left = 754 Top = 97 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1874,7 +2089,7 @@ end object fp_speed: TcxTextEdit Tag = 2 - Left = 653 + Left = 754 Top = 35 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1885,7 +2100,7 @@ end object fp_TubePress: TcxTextEdit Tag = 2 - Left = 113 + Left = 143 Top = 127 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1907,7 +2122,7 @@ end object fp_CycleFanSpeed: TcxTextEdit Tag = 2 - Left = 399 + Left = 468 Top = 128 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1918,7 +2133,7 @@ end object fp_DownSuperRate: TcxTextEdit Tag = 2 - Left = 653 + Left = 754 Top = 128 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1995,7 +2210,7 @@ end object fp_LeftHeight: TcxTextEdit Tag = 2 - Left = 113 + Left = 143 Top = 158 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2006,7 +2221,7 @@ end object fp_RightHeight: TcxTextEdit Tag = 2 - Left = 399 + Left = 468 Top = 159 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2017,7 +2232,7 @@ end object fp_PumbMixElectricFrequency: TcxTextEdit Tag = 2 - Left = 137 + Left = 180 Top = 411 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2028,7 +2243,7 @@ end object fp_SystemPress: TcxTextEdit Tag = 2 - Left = 424 + Left = 467 Top = 411 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2039,7 +2254,7 @@ end object fp_MixElectricFrequency: TcxTextEdit Tag = 2 - Left = 424 + Left = 467 Top = 381 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2050,7 +2265,7 @@ end object fp_GasFlow: TcxTextEdit Tag = 2 - Left = 137 + Left = 180 Top = 381 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2062,24 +2277,33 @@ end end object cxTabSheet6: TcxTabSheet - Caption = #21038#33014#24037#33402 + Caption = ' '#21038#33014' ' ImageIndex = 5 + ExplicitTop = 22 + ExplicitHeight = 597 object cxGrid3: TcxGrid Left = 0 Top = 385 Width = 1076 - Height = 212 + Height = 298 Align = alBottom TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_1 + DataController.DataSource = DS_3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False OptionsView.Indicator = True + object Tv3Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 69 + end object Tv3gj_Name: TcxGridDBColumn Caption = #21407#26009#21517#31216 DataBinding.FieldName = 'gj_Name' @@ -2157,8 +2381,13 @@ Width = 1076 Height = 385 Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False TabOrder = 1 - ExplicitTop = -6 object cxLabel116: TcxLabel Left = 258 Top = 247 @@ -2578,17 +2807,19 @@ end end end - object 轧毛工艺: TcxTabSheet - Caption = #36711#27611#24037#33402 + object cxtabsheet7: TcxTabSheet + Caption = ' '#36711#27611' ' ImageIndex = 6 + ExplicitTop = 22 + ExplicitHeight = 597 object panel7: TPanel Left = 0 Top = 0 Width = 1076 - Height = 597 + Height = 683 Align = alClient TabOrder = 0 - ExplicitLeft = -2 + ExplicitHeight = 597 object cxLabel115: TcxLabel Left = 28 Top = 106 @@ -2631,7 +2862,7 @@ end object zm_RollMethod: TcxTextEdit Tag = 2 - Left = 499 + Left = 526 Top = 101 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2642,7 +2873,7 @@ end object zm_inoutSpeed: TcxTextEdit Tag = 2 - Left = 499 + Left = 526 Top = 67 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2653,7 +2884,7 @@ end object zm_needle: TcxTextEdit Tag = 2 - Left = 499 + Left = 526 Top = 33 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -2664,7 +2895,7 @@ end object zm_Precautions: TcxTextEdit Tag = 2 - Left = 86 + Left = 107 Top = 167 AutoSize = False Style.LookAndFeel.SkinName = 'WXI' @@ -2677,8 +2908,8 @@ end object zm_UnpackingMethod: TcxTextEdit Tag = 2 - Left = 86 - Top = 35 + Left = 107 + Top = 36 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2688,8 +2919,8 @@ end object zm_frequency: TcxTextEdit Tag = 2 - Left = 86 - Top = 69 + Left = 107 + Top = 70 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2699,8 +2930,8 @@ end object zm_wagCloth: TcxTextEdit Tag = 2 - Left = 86 - Top = 103 + Left = 107 + Top = 104 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2710,8 +2941,8 @@ end object zm_WidthAmplitude: TcxTextEdit Tag = 2 - Left = 86 - Top = 137 + Left = 107 + Top = 138 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2730,15 +2961,15 @@ object ADOQueryCmd: TADOQuery Connection = DataLink_ClothInfo.ADOLink Parameters = <> - Left = 505 - Top = 9 + Left = 905 + Top = 305 end object ADOQueryTemp: TADOQuery Connection = DataLink_ClothInfo.ADOLink LockType = ltReadOnly Parameters = <> - Left = 613 - Top = 17 + Left = 669 + Top = 297 end object CDS_1: TClientDataSet Aggregates = <> @@ -2753,8 +2984,63 @@ Top = 252 end object GPM_1: TcxGridPopupMenu + Grid = cxGrid1 PopupMenus = <> Left = 792 Top = 252 end + object GPM_2: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 784 + Top = 364 + end + object DS_2: TDataSource + DataSet = cds_2 + Left = 827 + Top = 364 + end + object cds_2: TClientDataSet + Aggregates = <> + IndexFieldNames = 'SerialNo' + Params = <> + Left = 827 + Top = 420 + end + object GPM_3: TcxGridPopupMenu + Grid = cxGrid3 + PopupMenus = <> + Left = 784 + Top = 484 + end + object DS_3: TDataSource + DataSet = CDS_3 + Left = 827 + Top = 484 + end + object CDS_3: TClientDataSet + Aggregates = <> + IndexFieldNames = 'SerialNo' + Params = <> + Left = 827 + Top = 540 + end + object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid4 + PopupMenus = <> + Left = 624 + Top = 524 + end + object DS_GX: TDataSource + DataSet = cds_gx + Left = 667 + Top = 524 + end + object cds_gx: TClientDataSet + Aggregates = <> + IndexFieldNames = 'SerialNo' + Params = <> + Left = 667 + Top = 580 + end end diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index e84259f..ed57f23 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -358,7 +358,7 @@ type gj_LeftHeight: TcxTextEdit; gj_RightHeight: TcxTextEdit; gj_OutFanSpeed: TcxTextEdit; - ë: TcxTabSheet; + cxtabsheet7: TcxTabSheet; cxLabel113: TcxLabel; cxLabel114: TcxLabel; F_FinishLongitudeDensity: TcxTextEdit; @@ -385,6 +385,38 @@ type cxLabel149: TcxLabel; cxLabel150: TcxLabel; C_Code: TcxTextEdit; + GPM_2: TcxGridPopupMenu; + DS_2: TDataSource; + cds_2: TClientDataSet; + GPM_3: TcxGridPopupMenu; + DS_3: TDataSource; + CDS_3: TClientDataSet; + Tv3Column1: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; + Tv2Column1: TcxGridDBColumn; + cxGrid4: TcxGrid; + TV4: TcxGridDBTableView; + cxGridDBColumn1: TcxGridDBColumn; + cxGridDBColumn2: TcxGridDBColumn; + cxGridDBColumn11: TcxGridDBColumn; + cxGridLevel4: TcxGridLevel; + Panel8: TPanel; + Panel9: TPanel; + Label20: TLabel; + cxGridPopupMenu1: TcxGridPopupMenu; + DS_GX: TDataSource; + cds_gx: TClientDataSet; + Panel10: TPanel; + Panel11: TPanel; + Label1: TLabel; + ToolBar2: TToolBar; + ToolButton2: TToolButton; + ToolButton3: TToolButton; + ToolButton1: TToolButton; + ToolButton4: TToolButton; + ToolButton5: TToolButton; + ToolButton6: TToolButton; + ToolButton7: TToolButton; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure TbSaveClick(Sender: TObject); @@ -398,10 +430,16 @@ type procedure SetXH(); procedure ToolButton3Click(Sender: TObject); procedure Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure ToolButton7Click(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); + procedure ToolButton5Click(Sender: TObject); + procedure ToolButton6Click(Sender: TObject); private canshu1: string; Fint: Integer; procedure InitGrid(); + procedure ArrangeTabsByDataset; function SaveData(): Boolean; { Private declarations } public @@ -424,13 +462,13 @@ procedure TfrmClothInfoInput.SetXH(); var i: Integer; begin - with CDS_1 do + with CDS_GX do begin First; i := 1; while not Eof do begin - with CDS_1 do + with CDS_GX do begin Edit; FieldByName('XHNoTemp').Value := i; @@ -441,14 +479,14 @@ begin end; end; - with CDS_1 do + with CDS_GX do begin - CDS_1.IndexFieldNames := ''; + CDS_GX.IndexFieldNames := ''; First; i := 1; while not Eof do begin - with CDS_1 do + with CDS_GX do begin Edit; FieldByName('SerialNo').Value := FieldByName('XHNoTemp').AsInteger; @@ -457,43 +495,173 @@ begin i := i + 1; Next; end; - CDS_1.IndexFieldNames := 'SerialNo'; + CDS_GX.IndexFieldNames := 'SerialNo'; end; end; +procedure TfrmClothInfoInput.ArrangeTabsByDataset; +var + I: Integer; + TabSheet: TcxTabSheet; + CurrentIndex: Integer; +begin + // ̶һҳ A + cxTabSheet1.PageIndex := 0; + cxTabSheet1.Visible := True; + + // ʼҳ + for I := 1 to cxPageControl1.PageCount - 1 do + cxPageControl1.Pages[I].TabVisible := False; + + // ݼǷ񼤻 + if not (CDS_GX.Active and (CDS_GX.RecordCount > 0)) then + Exit; + + // õǰ1ʼ0ѱAռã + CurrentIndex := 1; + + // ݼ + CDS_GX.IndexFieldNames := 'serialno'; + CDS_GX.First; + + // ݼҳ + while not CDS_GX.Eof do + begin + // ݹҶӦҳ + for I := 0 to cxPageControl1.PageCount - 1 do + begin + TabSheet := cxPageControl1.Pages[I] as TcxTabSheet; + + // ƥ乤Ҳǵһ̶ҳ + if (Trim(TabSheet.Caption) = CDS_GX.FieldByName('gxname').AsString) and (TabSheet <> cxTabSheet1) then + begin + TabSheet.PageIndex := CurrentIndex; + TabSheet.TabVisible := True; + Inc(CurrentIndex); + Break; + end; + end; + + CDS_GX.Next; + end; + + // ˢҳؼ + cxPageControl1.Invalidate; + +end; + procedure TfrmClothInfoInput.InitGrid(); +var + i: integer; begin with ADOQueryTemp do begin Close; SQL.Clear; - SQL.Add('select * from V_BS_Cloth_Info where BCIID=''' + Trim(FBCIID) + ''''); + SQL.Add('select * from BS_Cloth_Info where BCIID=''' + Trim(FBCIID) + ''''); Open; end; SCSHData(ADOQueryTemp, panel1, 2); SCSHData(ADOQueryTemp, Panel1, 0); -// C_FromName.TxtCode := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); -// C_FromName.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName').AsString); with ADOQueryTemp do begin Close; SQL.Clear; - sql.Add(' select * from Bs_Cloth_Process '); - sql.Add(' where BCIID=''' + Trim(FBCIID) + ''''); - sql.Add(' order by SerialNo '); + SQL.Add('select * from Bs_Cloth_GY_Main where BCIID=''' + Trim(FBCIID) + ''''); + Open; + end; + + SCSHData(ADOQueryTemp, Panel2, 2); + SCSHData(ADOQueryTemp, Panel3, 2); + SCSHData(ADOQueryTemp, Panel4, 2); + SCSHData(ADOQueryTemp, Panel5, 2); + SCSHData(ADOQueryTemp, Panel6, 2); + SCSHData(ADOQueryTemp, Panel7, 2); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype=''ˮ'' and A.BCIID=''' + Trim(FBCIID) + ''''); Open; end; SCreateCDS(ADOQueryTemp, CDS_1); SInitCDSData(ADOQueryTemp, CDS_1); + if ADOQueryTemp.IsEmpty then + begin + for i := 0 to 3 do + begin + CDS_1.Append; + CDS_1.FieldByName('serialno').Value := i + 1; + CDS_1.posT; + end; + + end; + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype='''' and A.BCIID=''' + Trim(FBCIID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_2); + SInitCDSData(ADOQueryTemp, CDS_2); + if ADOQueryTemp.IsEmpty then + begin + for i := 0 to 7 do + begin + CDS_2.Append; + CDS_2.FieldByName('serialno').Value := i + 1; + CDS_2.posT; + end; + + end; + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype=''ν'' and A.BCIID=''' + Trim(FBCIID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_3); + SInitCDSData(ADOQueryTemp, CDS_3); + if ADOQueryTemp.IsEmpty then + begin + for i := 0 to 7 do + begin + CDS_3.Append; + CDS_3.FieldByName('serialno').Value := i + 1; + CDS_3.posT; + end; + + end; + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GX A '); + sql.Add(' where A.BCIID=''' + Trim(FBCIID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_GX); + SInitCDSData(ADOQueryTemp, CDS_GX); +// C_FromName.TxtCode := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); +// C_FromName.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName').AsString); + end; procedure TfrmClothInfoInput.FormShow(Sender: TObject); begin InitGrid(); + ArrangeTabsByDataset; // if CopyInt = 1 then // begin // FBCIID := ''; @@ -510,6 +678,7 @@ end; function TfrmClothInfoInput.SaveData(): Boolean; var MaxBCIID, MaxProcessID, MaxBCPID: string; + Maxid1, maxid2, maxid3, maxgx: string; begin try ADOQueryCmd.Connection.BeginTrans; @@ -595,36 +764,26 @@ begin end; end; - - - - - if Trim(FProcessID) = '' then - begin - if GetLSNo(ADOQueryCmd, MaxProcessID, 'GY', 'Bs_Cloth_GY_Main', 4, 1) = False then - begin - Result := False; - ADOQueryCmd.Connection.RollbackTrans; - Application.MessageBox('ȡʧܣ', 'ʾ', 0); - Exit; - end; - end - else - begin - MaxProcessID := Trim(FProcessID); - end; with ADOQueryCmd do begin Close; SQL.Clear; - sql.Add('select * from Bs_Cloth_GY_Main where ProcessID=''' + Trim(FProcessID) + ''''); + sql.Add('select * from Bs_Cloth_GY_Main where BCIID=''' + Trim(FBCIID) + ''''); Open; end; with ADOQueryCmd do begin + if Trim(FBCIID) = '' then + begin + Append; - FieldByName('ProcessID').Value := Trim(MaxProcessID); + end + else + begin + Edit; + end; + FieldByName('BCIID').Value := Trim(MaxBCIID); RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel2, 2); RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel3, 2); RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel4, 2); @@ -636,7 +795,63 @@ begin //////////////// ////////////////////// /// -////////////////// ӱ ////////////////////// +/// +/// +/// +/// ///////////////// 湤ӱ ////////////////////// + with CDS_GX do + begin + First; + while not Eof do + begin + if Trim(CDS_GX.fieldbyname('GXID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxgx, 'GX', 'Bs_Cloth_GX', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxgx := Trim(CDS_GX.fieldbyname('GXID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GX where '); + sql.Add(' GXID=''' + Trim(maxgx) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_GX.fieldbyname('GXID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + + FieldByName('BCIID').Value := Trim(MaxBCIID); + FieldByName('GXID').Value := Trim(maxgx); + RTSetSaveDataCDS(ADOQueryCmd, Tv4, CDS_GX, 'Bs_Cloth_GX', 0); + Post; + end; + CDS_GX.Edit; + CDS_GX.FieldByName('BCIID').Value := Trim(MaxBCIID); + CDS_GX.FieldByName('GXID').Value := Trim(maxgx); + + Next; + end; + end; +//////////////// 湤ӱ ////////////////////// +////////////////// ˮӱ ////////////////////// with CDS_1 do begin First; @@ -644,52 +859,158 @@ begin begin if Trim(CDS_1.fieldbyname('BCPID').AsString) = '' then begin - if GetLSNo(ADOQueryCmd, MaxBCPID, 'P', 'Bs_Cloth_GY_Sub', 4, 1) = False then + if GetLSNo(ADOQueryTemp, Maxid1, 'FS', 'Bs_Cloth_GY_Sub', 5, 1) = False then begin - Result := False; ADOQueryCmd.Connection.RollbackTrans; - Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); Exit; end; end else begin - MaxBCPID := Trim(CDS_1.fieldbyname('BCPID').AsString); + Maxid1 := Trim(CDS_1.fieldbyname('BCPID').AsString); end; with ADOQueryCmd do begin Close; SQL.Clear; - sql.Add('select * from Bs_Cloth_GY_Sub where BCPID=''' + Trim(MaxBCPID) + ''''); + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(Maxid1) + ''''); Open; end; with ADOQueryCmd do begin - if ADOQueryCmd.IsEmpty then - Append - else - Edit; - RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Bs_Cloth_GY_Sub', 0); - RTSetSaveDataCDS(ADOQueryCmd, Tv2, CDS_1, 'Bs_Cloth_GY_Sub', 0); - RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_1, 'Bs_Cloth_GY_Sub', 0); - FieldByName('BCPID').Value := Trim(MaxBCPID); - FieldByName('BCIID').Value := Trim(MaxBCIID); + if Trim(CDS_1.fieldbyname('BCPID').AsString) = '' then + begin + Append; + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ˮ'; + FieldByName('BCIID').Value := Trim(MaxBCIID); + FieldByName('BCPID').Value := Trim(Maxid1); + RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Bs_Cloth_GY_Sub', 0); Post; end; - with CDS_1 do - begin - Edit; - FieldByName('BCPID').Value := Trim(MaxBCPID); - Post; - end; + CDS_1.Edit; + CDS_1.FieldByName('BCIID').Value := Trim(MaxBCIID); + CDS_1.FieldByName('BCPID').Value := Trim(Maxid1); + Next; end; end; //////////////// ӱ ////////////////////// +////////////////// 淢ӱ ////////////////////// + with CDS_2 do + begin + First; + while not Eof do + begin + if Trim(CDS_2.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxid2, 'FP', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxid2 := Trim(CDS_2.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxid2) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_2.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := ''; + FieldByName('BCIID').Value := Trim(MaxBCIID); + FieldByName('BCPID').Value := Trim(maxid2); + RTSetSaveDataCDS(ADOQueryCmd, Tv2, CDS_2, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + CDS_2.Edit; + CDS_2.FieldByName('BCIID').Value := Trim(MaxBCIID); + CDS_2.FieldByName('BCPID').Value := Trim(maxid2); + + Next; + end; + end; +//////////////// 淢ӱ ////////////////////// /// -/// -/// +/// ////////////////// νӱ ////////////////////// + with CDS_3 do + begin + First; + while not Eof do + begin + if Trim(CDS_3.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxid3, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxid3 := Trim(CDS_3.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxid3) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_3.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ν'; + FieldByName('BCIID').Value := Trim(MaxBCIID); + FieldByName('BCPID').Value := Trim(maxid3); + RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_3, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + CDS_3.Edit; + CDS_3.FieldByName('BCIID').Value := Trim(MaxBCIID); + CDS_3.FieldByName('BCPID').Value := Trim(maxid3); + + Next; + end; + end; +//////////////// 淢ӱ ////////////////////// ADOQueryCmd.Connection.CommitTrans; FBCIID := MaxBCIID; Result := True; @@ -725,7 +1046,7 @@ begin // C_Code.Text := MC_Code; // // end; - SetXH(); +// SetXH(); if SaveData() then begin Application.MessageBox('ɹ', 'ʾ', 0); @@ -733,44 +1054,141 @@ begin end; end; +procedure TfrmClothInfoInput.ToolButton1Click(Sender: TObject); +var + i: Integer; +begin + + i := CDS_GX.RecordCount; //ǰdatasetжм¼ + i := i + 1; +// CopyAddRow(Tv1, CDS_1); + with CDS_GX do + begin + Append; + FieldByName('SerialNo').Value := i; + FieldByName('GXName').Value := 'ˮ'; + Post; + end; + SetXH(); + ArrangeTabsByDataset; +end; + procedure TfrmClothInfoInput.ToolButton2Click(Sender: TObject); var i: Integer; begin - i := CDS_1.RecordCount; //ǰdatasetжм¼ + i := CDS_GX.RecordCount; //ǰdatasetжм¼ i := i + 1; // CopyAddRow(Tv1, CDS_1); - with CDS_1 do + with CDS_GX do begin - Edit; + Append; FieldByName('SerialNo').Value := i; - FieldByName('FtyWastage').Value := 0; + FieldByName('GXName').Value := 'ϴ'; Post; end; SetXH(); + ArrangeTabsByDataset; end; procedure TfrmClothInfoInput.ToolButton3Click(Sender: TObject); +var + i: Integer; begin - if CDS_1.IsEmpty then + + i := CDS_GX.RecordCount; //ǰdatasetжм¼ + i := i + 1; +// CopyAddRow(Tv1, CDS_1); + with CDS_GX do + begin + Append; + FieldByName('SerialNo').Value := i; + FieldByName('GXName').Value := ''; + Post; + end; + SetXH(); + ArrangeTabsByDataset; +end; + +procedure TfrmClothInfoInput.ToolButton4Click(Sender: TObject); +var + i: Integer; +begin + + i := CDS_GX.RecordCount; //ǰdatasetжм¼ + i := i + 1; +// CopyAddRow(Tv1, CDS_1); + with CDS_GX do + begin + Append; + FieldByName('SerialNo').Value := i; + FieldByName('GXName').Value := ''; + Post; + end; + SetXH(); + ArrangeTabsByDataset; +end; + +procedure TfrmClothInfoInput.ToolButton5Click(Sender: TObject); +var + i: Integer; +begin + + i := CDS_GX.RecordCount; //ǰdatasetжм¼ + i := i + 1; +// CopyAddRow(Tv1, CDS_1); + with CDS_GX do + begin + Append; + FieldByName('SerialNo').Value := i; + FieldByName('GXName').Value := 'ν'; + Post; + end; + SetXH(); + ArrangeTabsByDataset; +end; + +procedure TfrmClothInfoInput.ToolButton6Click(Sender: TObject); +var + i: Integer; +begin + + i := CDS_GX.RecordCount; //ǰdatasetжм¼ + i := i + 1; +// CopyAddRow(Tv1, CDS_1); + with CDS_GX do + begin + Append; + FieldByName('SerialNo').Value := i; + FieldByName('GXName').Value := 'ë'; + Post; + end; + SetXH(); + ArrangeTabsByDataset; +end; + +procedure TfrmClothInfoInput.ToolButton7Click(Sender: TObject); +begin + if CDS_GX.IsEmpty then Exit; if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then Exit; - if Trim(CDS_1.fieldbyname('BCPID').AsString) <> '' then + if Trim(CDS_GX.fieldbyname('GXID').AsString) <> '' then begin with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('delete Bs_Cloth_Process where BCPID=''' + Trim(CDS_1.fieldbyname('BCPID').AsString) + ''''); + sql.Add('delete Bs_Cloth_GX where GXID=''' + Trim(CDS_GX.fieldbyname('GXID').AsString) + ''''); ExecSQL; end; end; - CDS_1.Delete; + CDS_GX.Delete; SetXH(); + ArrangeTabsByDataset; end; procedure TfrmClothInfoInput.C_FromNameBtnUpClick(Sender: TObject); diff --git a/A02基础产品管理/U_TatClothInfo.dfm b/A02基础产品管理/U_TatClothInfo.dfm index 37edf23..33fbc23 100644 --- a/A02基础产品管理/U_TatClothInfo.dfm +++ b/A02基础产品管理/U_TatClothInfo.dfm @@ -287,6 +287,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo 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 @@ -325,6 +326,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo 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 @@ -343,6 +345,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object v1SSel: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default @@ -351,6 +354,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object v1Column12: TcxGridDBColumn Caption = #31867#21035 DataBinding.FieldName = 'CTName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default @@ -359,6 +363,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo 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 @@ -367,12 +372,14 @@ inherited frmTatClothInfo: TfrmTatClothInfo object v1Column9: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 96 end object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default @@ -381,6 +388,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object v1Column1: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 @@ -388,6 +396,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column11: TcxGridDBColumn Caption = #32428#23494 DataBinding.FieldName = 'C_FinishLatitudeDensity' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -395,6 +404,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column3: TcxGridDBColumn Caption = #32463#23494 DataBinding.FieldName = 'C_FinishLongitudeDensity' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -402,6 +412,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column2: TcxGridDBColumn Caption = #32428#32433#35268#26684 DataBinding.FieldName = 'C_LatitudeSpec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -409,12 +420,14 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column1: TcxGridDBColumn Caption = #32463#32433#35268#26684 DataBinding.FieldName = 'C_LongitudeSpec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object Tv1Column4: TcxGridDBColumn Caption = #31576#21495 DataBinding.FieldName = 'C_ReedNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -422,6 +435,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column8: TcxGridDBColumn Caption = #22836#32441 DataBinding.FieldName = 'C_YarnQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -429,6 +443,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object v1Column11: TcxGridDBColumn Caption = #22270#29255 DataBinding.FieldName = 'IsImg' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -437,6 +452,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column5: TcxGridDBColumn Caption = #22635#21333#20154 DataBinding.FieldName = 'filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -444,6 +460,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column6: TcxGridDBColumn Caption = #20462#25913#20154 DataBinding.FieldName = 'editer' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -451,6 +468,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column7: TcxGridDBColumn Caption = #20462#25913#26102#38388 DataBinding.FieldName = 'edittime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 67 @@ -458,6 +476,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo object Tv1Column9: TcxGridDBColumn Caption = #24405#20837#26102#38388 DataBinding.FieldName = 'FILLTIME' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 diff --git a/A02基础产品管理/U_TatClothInfo.pas b/A02基础产品管理/U_TatClothInfo.pas index 88fdf89..c5283d0 100644 --- a/A02基础产品管理/U_TatClothInfo.pas +++ b/A02基础产品管理/U_TatClothInfo.pas @@ -15,7 +15,8 @@ uses cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, cxNavigator, dxBarBuiltInMenu, cxPC, Math, RM_BarCode, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, cxContainer, - dxDBBarCode, dxBarCode, Vcl.Clipbrd, cxTextEdit, BtnEdit, StrUtils; + dxDBBarCode, dxBarCode, Vcl.Clipbrd, cxTextEdit, BtnEdit, StrUtils, + dxScrollbarAnnotations; type FdDy = record diff --git a/A02基础产品管理/U_TatClothInfoInput.dfm b/A02基础产品管理/U_TatClothInfoInput.dfm index d3ae1ab..0fe421d 100644 --- a/A02基础产品管理/U_TatClothInfoInput.dfm +++ b/A02基础产品管理/U_TatClothInfoInput.dfm @@ -33,7 +33,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 718 object ToolButton1: TToolButton Tag = 1 Left = 0 @@ -73,7 +72,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput ParentColor = False ParentCtl3D = False TabOrder = 1 - ExplicitTop = 34 object Label1: TLabel Left = 31 Top = 11 @@ -440,8 +438,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Height = 382 Align = alLeft TabOrder = 2 - ExplicitTop = 307 - ExplicitHeight = 300 object cxPageControl2: TcxPageControl Left = 1 Top = 42 @@ -461,7 +457,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Visible = False Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ExplicitHeight = 257 ClientRectBottom = 339 ClientRectRight = 735 ClientRectTop = 0 @@ -479,10 +474,9 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Font.Style = [] ParentFont = False TabOrder = 1 - ExplicitLeft = -2 - ExplicitTop = 47 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -525,12 +519,14 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxGridDBColumn3: TcxGridDBColumn Caption = #21407#26009#20195#21495 DataBinding.FieldName = 'Y_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 131 end object cxGridDBColumn4: TcxGridDBColumn Caption = #21407#26009#21517#31216 DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -546,6 +542,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxGridDBColumn5: TcxGridDBColumn Caption = #32433#32447#21697#29260 DataBinding.FieldName = 'PinPai' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -560,18 +557,21 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxGridDBColumn8: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'Y_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 99 end object cxGridDBColumn7: TcxGridDBColumn Caption = #37197#27604 DataBinding.FieldName = 'Y_Ratio' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 116 end object TV1Column1: TcxGridDBColumn Caption = #29992#37327 DataBinding.FieldName = 'Y_Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -579,6 +579,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object TV1Column2: TcxGridDBColumn Caption = 'D'#25968 DataBinding.FieldName = 'Denier' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -594,6 +595,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Height = 41 Align = alTop TabOrder = 2 + ExplicitLeft = -2 + ExplicitTop = -5 object Panel4: TPanel Left = 1 Top = 1 @@ -675,10 +678,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Height = 382 Align = alClient TabOrder = 3 - ExplicitLeft = 308 - ExplicitTop = 307 - ExplicitWidth = 824 - ExplicitHeight = 300 object cxPageControl1: TcxPageControl Left = 1 Top = 42 @@ -698,8 +697,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Visible = False Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ExplicitWidth = 822 - ExplicitHeight = 257 ClientRectBottom = 339 ClientRectRight = 794 ClientRectTop = 0 @@ -717,10 +714,9 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Font.Style = [] ParentFont = False TabOrder = 1 - ExplicitLeft = 5 - ExplicitTop = 47 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -763,6 +759,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object v2Column10: TcxGridDBColumn Caption = #21407#26009#20195#21495 DataBinding.FieldName = 'Y_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default Width = 131 @@ -770,6 +767,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxGridDBColumn1: TcxGridDBColumn Caption = #21407#26009#21517#31216 DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -786,6 +784,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object v2Column2: TcxGridDBColumn Caption = #32433#32447#21697#29260 DataBinding.FieldName = 'PinPai' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -801,6 +800,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object v2Column5: TcxGridDBColumn Caption = #37197#27604 DataBinding.FieldName = 'Y_Ratio' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default Width = 116 @@ -808,6 +808,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object v2Column6: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'Y_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default Width = 99 @@ -815,6 +816,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object Tv2Column1: TcxGridDBColumn Caption = #29992#37327 DataBinding.FieldName = 'Y_Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -822,6 +824,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object Tv2Column2: TcxGridDBColumn Caption = 'D'#25968 DataBinding.FieldName = 'Denier' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -837,7 +840,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Height = 41 Align = alTop TabOrder = 2 - ExplicitWidth = 822 object Panel6: TPanel Left = 1 Top = 1 diff --git a/A02基础产品管理/U_TatClothInfoInput.pas b/A02基础产品管理/U_TatClothInfoInput.pas index 77e4a2d..658a10d 100644 --- a/A02基础产品管理/U_TatClothInfoInput.pas +++ b/A02基础产品管理/U_TatClothInfoInput.pas @@ -10,7 +10,7 @@ uses cxGrid, ComCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, cxTextEdit, cxButtonEdit, StdCtrls, ExtCtrls, cxCurrencyEdit, BtnEdit, U_BaseList, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, cxPC; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, cxPC, dxScrollbarAnnotations; type TfrmTatClothInfoInput = class(TForm)