diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index e8bcb4c..93cbd7f 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -16,7 +16,8 @@ uses dxBarBuiltInMenu, cxPC, Math, RM_BarCode, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, cxContainer, dxDBBarCode, dxBarCode, Vcl.Clipbrd, cxTextEdit, BtnEdit, StrUtils, Vcl.Buttons, - dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters; + dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters, + dxSkinWXI; type FdDy = record @@ -178,7 +179,7 @@ type CurrentPage, RecordsNumber: Integer; CTID: string; PState: Integer; - FCTID, FTopID, FJurisdiction, FCTType, canshu3, CTID1, CTID2: string; + FCTID, FTopID, FJurisdiction, FCTType, canshu3, canshu4, CTID1, CTID2, FCTType1: string; procedure SetStatus(); procedure setpage(); procedure InitTree(); @@ -290,29 +291,84 @@ begin end; end; +//procedure TfrmClothInfo.InitTree(); +// +//begin +// try +// cxDBTreeList1.BeginUpdate; +// CDS_Tree.DisableControls; +// with ADOQueryTree do +// +// begin +// Close; +// SQL.Clear; +// SQL.Add('SELECT * FROM F_BS_CloType('''' )'); // ݿղȡз +// +// +// // ӹ +// SQL.Add('WHERE CTType = ' + QuotedStr(FCTType)); +// +// if canshu4 = 'μӹ' then +// begin +// SQL.Add(' and CTID=' + quotedstr('CT2412300005')); +// end +// else +// begin +// SQL.Add(' and CTID <>' + quotedstr('CT2412300005')); +// +// end; +// +// +// SQL.Add('order by CTName'); +// Open; +// end; +// +// SCreateCDS(ADOQueryTree, CDS_Tree); +// SInitCDSData(ADOQueryTree, CDS_Tree); +// +// finally +// CDS_Tree.EnableControls; +// cxDBTreeList1.EndUpdate; +// +// cxDBTreeList1.Items[0].Expand(false); +// end; +// + +//end; + procedure TfrmClothInfo.InitTree(); + begin try cxDBTreeList1.BeginUpdate; CDS_Tree.DisableControls; + with ADOQueryTree do begin - Close; SQL.Clear; - SQL.Add('select * from BS_Cloth_Type where CTType=' + quotedstr(FCTType)); - SQL.Add('order by CTName'); + + if canshu4= 'μӹ' then + begin + SQL.Add('SELECT * FROM dbo.F_BS_CloType(''CT2505100001'') A ORDER BY CTName '); + end + else + begin + SQL.Add('SELECT * FROM dbo.F_BS_CloType(''CT2412300003'') A ORDER BY CTName '); + end; + Open; end; + SCreateCDS(ADOQueryTree, CDS_Tree); SInitCDSData(ADOQueryTree, CDS_Tree); finally CDS_Tree.EnableControls; cxDBTreeList1.EndUpdate; - cxDBTreeList1.Items[0].Expand(false); - end; - Self.cds_tree.Locate('CTName', 'Ʒ', []); + cxDBTreeList1.Items[0].Expand(False); + end; + Self.cds_tree.Locate('CTName', 'Ʒ', []); end; procedure TfrmClothInfo.InitGrid(); @@ -370,6 +426,7 @@ begin FJurisdiction := Trim(Self.fParameters1); FCTType := Trim(self.fParameters2); canshu3 := Trim(self.fParameters3); + canshu4 := Trim(self.fParameters4); end; procedure TfrmClothInfo.TBCloseClick(Sender: TObject); diff --git a/A02基础产品管理/U_ClothInfoImport.dfm b/A02基础产品管理/U_ClothInfoImport.dfm index 9504176..9bc7dc4 100644 --- a/A02基础产品管理/U_ClothInfoImport.dfm +++ b/A02基础产品管理/U_ClothInfoImport.dfm @@ -4,7 +4,6 @@ inherited frmClothInfoImport: TfrmClothInfoImport Caption = #26679#21697#23548#20837 ClientHeight = 562 ClientWidth = 1484 - Color = clBtnFace Font.Charset = ANSI_CHARSET Font.Height = -16 Font.Name = #24494#36719#38597#40657 @@ -23,11 +22,9 @@ inherited frmClothInfoImport: TfrmClothInfoImport ButtonHeight = 30 ButtonWidth = 99 Caption = 'ToolBar1' - Color = clBtnFace DisabledImages = DataLink_ClothInfo.cxImageList_bar Images = DataLink_ClothInfo.cxImageList_bar List = True - ParentColor = True ShowCaptions = True TabOrder = 0 object TBRafresh: TToolButton @@ -108,7 +105,6 @@ inherited frmClothInfoImport: TfrmClothInfoImport DataBinding.FieldName = 'C_Code' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_ClothInfo.Default Width = 116 end object Tv1Column19: TcxGridDBColumn @@ -137,7 +133,6 @@ inherited frmClothInfoImport: TfrmClothInfoImport DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_ClothInfo.Default Width = 97 end object v1Column1: TcxGridDBColumn @@ -292,7 +287,7 @@ inherited frmClothInfoImport: TfrmClothInfoImport Left = 249 Top = 161 end - inherited cxImageList_bar: TImageList + inherited ImageList_new32: TImageList Left = 528 Top = 144 end diff --git a/A02基础产品管理/U_ClothInfoImport.pas b/A02基础产品管理/U_ClothInfoImport.pas index c453866..e2dc795 100644 --- a/A02基础产品管理/U_ClothInfoImport.pas +++ b/A02基础产品管理/U_ClothInfoImport.pas @@ -15,7 +15,8 @@ uses cxTextEdit, cxDropDownEdit, cxPC, U_BaseHelp, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, ComObj, U_BaseList, System.ImageList, - Vcl.ImgList, dxScrollbarAnnotations; + Vcl.ImgList, dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, + dxSkinWXI; type TfrmClothInfoImport = class(TfrmBaseHelp) diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 7a2e005..971890f 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -95,7 +95,7 @@ object frmClothInfoInput: TfrmClothInfoInput Left = 0 Top = 0 Width = 749 - Height = 529 + Height = 327 Align = alTop TabOrder = 1 object Label1: TLabel @@ -142,17 +142,17 @@ object frmClothInfoInput: TfrmClothInfoInput Visible = False end object Label6: TLabel - Left = 422 + Left = 454 Top = 95 Width = 32 Height = 21 Caption = #35268#26684 end object Label9: TLabel - Left = 37 - Top = 299 + Left = 66 + Top = 274 Width = 32 - Height = 21 + Height = 22 Caption = #22791#27880 end object Label11: TLabel @@ -172,7 +172,7 @@ object frmClothInfoInput: TfrmClothInfoInput Visible = False end object Label16: TLabel - Left = 422 + Left = 454 Top = 173 Width = 32 Height = 21 @@ -185,13 +185,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 21 Caption = #20379#24212#21830#20195#21495 end - object Label19: TLabel - Left = 422 - Top = 249 - Width = 48 - Height = 21 - Caption = #20379#24212#21830 - end object Label21: TLabel Left = 301 Top = 598 @@ -208,19 +201,12 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = #26579#33394#26041#24335 end object Label2: TLabel - Left = 37 - Top = 211 + Left = 34 + Top = 175 Width = 64 Height = 21 Caption = #26631#20934#25253#20215 end - object Label8: TLabel - Left = 37 - Top = 173 - Width = 64 - Height = 21 - Caption = #37197#36135#31995#25968 - end object Label13: TLabel Left = 422 Top = 135 @@ -236,29 +222,15 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = '%' end object Label20: TLabel - Left = 37 + Left = 69 Top = 135 Width = 32 Height = 21 Caption = #24211#20301 end - object Label17: TLabel - Left = 37 - Top = 347 - Width = 32 - Height = 21 - Caption = #20027#24067 - end - object Label24: TLabel - Left = 34 - Top = 385 - Width = 41 - Height = 21 - Caption = #27425#24067'1' - end object Label25: TLabel - Left = 37 - Top = 249 + Left = 34 + Top = 213 Width = 64 Height = 21 Caption = #35745#20215#21333#20301 @@ -271,62 +243,6 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = #32433#32447#24418#24577 Visible = False end - object Label26: TLabel - Left = 32 - Top = 421 - Width = 41 - Height = 21 - Caption = #27425#24067'2' - end - object Label27: TLabel - Left = 34 - Top = 457 - Width = 41 - Height = 21 - Caption = #27425#24067'3' - end - object Label28: TLabel - Left = 34 - Top = 492 - Width = 41 - Height = 21 - Caption = #27425#24067'4' - end - object Label29: TLabel - Left = 419 - Top = 385 - Width = 73 - Height = 21 - Caption = #21152#24037#26041#24335'1' - end - object Label30: TLabel - Left = 419 - Top = 421 - Width = 73 - Height = 21 - Caption = #21152#24037#26041#24335'2' - end - object Label31: TLabel - Left = 419 - Top = 457 - Width = 73 - Height = 21 - Caption = #21152#24037#26041#24335'3' - end - object Label32: TLabel - Left = 419 - Top = 492 - Width = 73 - Height = 21 - Caption = #21152#24037#26041#24335'4' - end - object Label33: TLabel - Left = 419 - Top = 348 - Width = 64 - Height = 21 - Caption = #21152#24037#26041#24335 - end object C_Code: TcxTextEdit Tag = 2 Left = 119 @@ -396,22 +312,6 @@ object frmClothInfoInput: TfrmClothInfoInput OnDblClick = C_GramWeightDblClick Width = 234 end - object C_FromName: TcxButtonEdit - Tag = 7 - Left = 119 - Top = 344 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = C_FromNamePropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 5 - OnDblClick = C_GramWeightDblClick - Width = 234 - end object C_Width: TcxButtonEdit Tag = 2 Left = 510 @@ -425,7 +325,7 @@ object frmClothInfoInput: TfrmClothInfoInput Properties.ReadOnly = False Properties.OnButtonClick = C_WidthPropertiesButtonClick Style.ButtonStyle = btsDefault - TabOrder = 6 + TabOrder = 5 OnDblClick = C_GramWeightDblClick Width = 234 end @@ -442,23 +342,23 @@ object frmClothInfoInput: TfrmClothInfoInput Properties.ReadOnly = False Properties.OnButtonClick = C_WidthPropertiesButtonClick Style.ButtonStyle = btsDefault - TabOrder = 7 + TabOrder = 6 OnDblClick = C_GramWeightDblClick Width = 234 end object CINote: TcxMemo Tag = 2 - Left = 119 - Top = 281 - TabOrder = 8 - Height = 57 + Left = 116 + Top = 256 + TabOrder = 7 + Height = 58 Width = 622 end object GC_Name: TcxTextEdit Tag = 2 Left = 438 Top = 598 - TabOrder = 9 + TabOrder = 8 Visible = False OnKeyPress = CYColorKeyPress Width = 234 @@ -476,7 +376,7 @@ object frmClothInfoInput: TfrmClothInfoInput Properties.ReadOnly = False Properties.OnButtonClick = C_WidthPropertiesButtonClick Style.ButtonStyle = btsDefault - TabOrder = 10 + TabOrder = 9 Visible = False OnDblClick = C_GramWeightDblClick Width = 234 @@ -485,7 +385,7 @@ object frmClothInfoInput: TfrmClothInfoInput Tag = 2 Left = 510 Top = 169 - TabOrder = 11 + TabOrder = 10 OnKeyPress = CYColorKeyPress Width = 234 end @@ -493,24 +393,16 @@ object frmClothInfoInput: TfrmClothInfoInput Tag = 2 Left = 73 Top = 618 - TabOrder = 12 + TabOrder = 11 Visible = False OnKeyPress = CYColorKeyPress Width = 234 end - object FtyName: TcxTextEdit - Tag = 2 - Left = 510 - Top = 245 - TabOrder = 13 - OnKeyPress = CYColorKeyPress - Width = 234 - end object C_EName: TcxTextEdit Tag = 2 Left = 483 Top = 598 - TabOrder = 14 + TabOrder = 12 Visible = False OnKeyPress = CYColorKeyPress Width = 234 @@ -519,26 +411,19 @@ object frmClothInfoInput: TfrmClothInfoInput Tag = 2 Left = 510 Top = 207 - TabOrder = 15 + TabOrder = 13 OnKeyPress = CYColorKeyPress Width = 234 end object CostPrice: TcxCurrencyEdit Tag = 2 Left = 119 - Top = 207 + Top = 170 EditValue = 0.000000000000000000 Properties.AssignedValues.DisplayFormat = True Properties.OnEditValueChanged = CostPricePropertiesEditValueChanged - TabOrder = 16 - Width = 234 - end - object distributionCoefficient: TcxCurrencyEdit - Tag = 2 - Left = 119 - Top = 169 - Properties.AssignedValues.DisplayFormat = True - TabOrder = 17 + TabOrder = 14 + OnClick = CostPriceClick Width = 234 end object quota: TcxCurrencyEdit @@ -547,23 +432,7 @@ object frmClothInfoInput: TfrmClothInfoInput Top = 131 EditValue = 10.000000000000000000 Properties.AssignedValues.DisplayFormat = True - TabOrder = 18 - Width = 234 - end - object C_FromName2: TcxButtonEdit - Tag = 7 - Left = 119 - Top = 382 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = C_FromName2PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 19 - OnDblClick = C_GramWeightDblClick + TabOrder = 15 Width = 234 end object StkPosition: TcxMRUEdit @@ -573,177 +442,47 @@ object frmClothInfoInput: TfrmClothInfoInput Properties.ImmediatePost = True Properties.ReadOnly = False Properties.OnButtonClick = StkPositionPropertiesButtonClick - TabOrder = 20 + TabOrder = 16 Width = 234 end object qtyunit: TcxMRUEdit Left = 119 - Top = 245 + Top = 209 Hint = 'qtyunit/'#25968#37327#21333#20301 Properties.ImmediatePost = True Properties.ReadOnly = False Properties.OnButtonClick = StkPositionPropertiesButtonClick - TabOrder = 21 + TabOrder = 17 Width = 234 end object C_YarnSpec: TcxTextEdit Tag = 2 Left = 356 Top = 654 - TabOrder = 22 + TabOrder = 18 Visible = False OnKeyPress = CYColorKeyPress Width = 234 end - object C_FromName3: TcxButtonEdit - Tag = 7 - Left = 119 - Top = 417 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = C_FromName3PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 23 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object C_FromName4: TcxButtonEdit - Tag = 7 - Left = 119 - Top = 452 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = C_FromName4PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 24 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object C_FromName5: TcxButtonEdit - Tag = 7 - Left = 119 - Top = 488 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = C_FromName5PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 25 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object Process2: TcxButtonEdit - Tag = 7 - Left = 498 - Top = 383 - Hint = 'Process2/'#21152#24037#26041#24335'1' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = Process2PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 26 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object Process3: TcxButtonEdit - Tag = 7 - Left = 498 - Top = 418 - Hint = 'Process3/'#21152#24037#26041#24335'2' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = Process3PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 27 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object Process4: TcxButtonEdit - Tag = 7 - Left = 498 - Top = 453 - Hint = 'Process4/'#21152#24037#26041#24335'3' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = Process4PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 28 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object Process5: TcxButtonEdit - Tag = 7 - Left = 498 - Top = 488 - Hint = 'Process5/'#21152#24037#26041#24335'4' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = Process5PropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 29 - OnDblClick = C_GramWeightDblClick - Width = 234 - end - object Process: TcxButtonEdit - Tag = 7 - Left = 498 - Top = 344 - Hint = 'Process/'#21152#24037#26041#24335 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = ProcessPropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 30 - OnDblClick = C_GramWeightDblClick - Width = 234 - end end object Panel3: TPanel Left = 0 - Top = 529 + Top = 327 Width = 749 - Height = 239 + Height = 441 Align = alClient TabOrder = 2 + ExplicitTop = 345 + ExplicitHeight = 423 object Panel4: TPanel Left = 1 - Top = 1 + Top = 185 Width = 395 - Height = 237 + Height = 255 Align = alLeft Caption = 'Panel4' TabOrder = 0 + ExplicitHeight = 237 object ToolBar3: TToolBar Left = 1 Top = 1 @@ -779,9 +518,10 @@ object frmClothInfoInput: TfrmClothInfoInput Left = 1 Top = 31 Width = 393 - Height = 205 + Height = 223 Align = alClient TabOrder = 1 + ExplicitHeight = 205 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -831,12 +571,13 @@ object frmClothInfoInput: TfrmClothInfoInput end object Panel5: TPanel Left = 396 - Top = 1 + Top = 185 Width = 352 - Height = 237 + Height = 255 Align = alClient Caption = 'Panel5' TabOrder = 1 + ExplicitHeight = 237 object ToolBar4: TToolBar Left = 1 Top = 1 @@ -872,9 +613,10 @@ object frmClothInfoInput: TfrmClothInfoInput Left = 1 Top = 31 Width = 350 - Height = 205 + Height = 223 Align = alClient TabOrder = 1 + ExplicitHeight = 205 object TV3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -922,6 +664,251 @@ object frmClothInfoInput: TfrmClothInfoInput end end end + object Panel6: TPanel + Left = 1 + Top = 1 + Width = 747 + Height = 184 + Align = alTop + TabOrder = 2 + ExplicitLeft = -2 + ExplicitTop = -1 + object lbl1: TLabel + Left = 61 + Top = 3 + Width = 32 + Height = 21 + Caption = #20027#24067 + end + object lbl2: TLabel + Left = 52 + Top = 41 + Width = 41 + Height = 21 + Caption = #27425#24067'1' + end + object lbl3: TLabel + Left = 52 + Top = 79 + Width = 41 + Height = 21 + Caption = #27425#24067'2' + end + object lbl4: TLabel + Left = 52 + Top = 118 + Width = 41 + Height = 21 + Caption = #27425#24067'3' + end + object lbl5: TLabel + Left = 52 + Top = 156 + Width = 41 + Height = 21 + Caption = #27425#24067'4' + end + object lbl6: TLabel + Left = 419 + Top = 41 + Width = 73 + Height = 21 + Caption = #21152#24037#26041#24335'1' + end + object lbl7: TLabel + Left = 419 + Top = 79 + Width = 73 + Height = 21 + Caption = #21152#24037#26041#24335'2' + end + object lbl8: TLabel + Left = 419 + Top = 118 + Width = 73 + Height = 21 + Caption = #21152#24037#26041#24335'3' + end + object lbl9: TLabel + Left = 419 + Top = 156 + Width = 73 + Height = 21 + Caption = #21152#24037#26041#24335'4' + end + object lbl10: TLabel + Left = 428 + Top = 3 + Width = 64 + Height = 21 + Caption = #21152#24037#26041#24335 + end + object C_FromName: TcxButtonEdit + Tag = 7 + Left = 115 + Top = -2 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromNamePropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 0 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object C_FromName2: TcxButtonEdit + Tag = 7 + Left = 115 + Top = 36 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromName2PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 1 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object C_FromName3: TcxButtonEdit + Tag = 7 + Left = 115 + Top = 74 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromName3PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 2 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object C_FromName4: TcxButtonEdit + Tag = 7 + Left = 115 + Top = 113 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromName4PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 3 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object C_FromName5: TcxButtonEdit + Tag = 7 + Left = 115 + Top = 151 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromName5PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 4 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object Process2: TcxButtonEdit + Tag = 7 + Left = 509 + Top = 36 + Hint = 'Process2/'#21152#24037#26041#24335'1' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = Process2PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 5 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object Process3: TcxButtonEdit + Tag = 7 + Left = 509 + Top = 74 + Hint = 'Process3/'#21152#24037#26041#24335'2' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = Process3PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 6 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object Process4: TcxButtonEdit + Tag = 7 + Left = 509 + Top = 112 + Hint = 'Process4/'#21152#24037#26041#24335'3' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = Process4PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 7 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object Process5: TcxButtonEdit + Tag = 7 + Left = 509 + Top = 151 + Hint = 'Process5/'#21152#24037#26041#24335'4' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = Process5PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 8 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + object Process: TcxButtonEdit + Tag = 7 + Left = 510 + Top = -2 + Hint = 'Process/'#21152#24037#26041#24335 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = ProcessPropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 9 + OnDblClick = C_GramWeightDblClick + Width = 234 + end + end end end object Panel1: TPanel diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 14ef42a..69095b2 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -12,7 +12,7 @@ uses cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, cxCheckBox, cxDropDownEdit, cxContainer, cxMaskEdit, dxScrollbarAnnotations, cxMemo, dxSkinsCore, dxSkinsDefaultPainters, cxMRUEdit, - ComObj; + ComObj, dxSkinWXI; type TfrmClothInfoInput = class(TForm) @@ -55,23 +55,18 @@ type Label10: TLabel; Label16: TLabel; Label18: TLabel; - Label19: TLabel; Label21: TLabel; Label23: TLabel; Label2: TLabel; - Label8: TLabel; Label13: TLabel; Label14: TLabel; Label20: TLabel; - Label17: TLabel; - Label24: TLabel; Label25: TLabel; C_Code: TcxTextEdit; C_Name: TcxTextEdit; C_GramWeight: TcxButtonEdit; C_Composition: TcxButtonEdit; C_Spec: TcxButtonEdit; - C_FromName: TcxButtonEdit; C_Width: TcxButtonEdit; C_Pattern: TcxButtonEdit; CINote: TcxMemo; @@ -79,13 +74,10 @@ type C_EComposition: TcxButtonEdit; CraftCode: TcxTextEdit; FtyNo: TcxTextEdit; - FtyName: TcxTextEdit; C_EName: TcxTextEdit; DyeingMethod: TcxTextEdit; CostPrice: TcxCurrencyEdit; - distributionCoefficient: TcxCurrencyEdit; quota: TcxCurrencyEdit; - C_FromName2: TcxButtonEdit; StkPosition: TcxMRUEdit; qtyunit: TcxMRUEdit; Label12: TLabel; @@ -125,21 +117,26 @@ type OpenDialog1: TOpenDialog; CDS_LM: TClientDataSet; ToolButton12: TToolButton; - Label26: TLabel; + Panel6: TPanel; + lbl1: TLabel; + lbl2: TLabel; + lbl3: TLabel; + lbl4: TLabel; + lbl5: TLabel; + lbl6: TLabel; + lbl7: TLabel; + lbl8: TLabel; + lbl9: TLabel; + lbl10: TLabel; + C_FromName: TcxButtonEdit; + C_FromName2: TcxButtonEdit; C_FromName3: TcxButtonEdit; - Label27: TLabel; C_FromName4: TcxButtonEdit; - Label28: TLabel; C_FromName5: TcxButtonEdit; - Label29: TLabel; Process2: TcxButtonEdit; - Label30: TLabel; Process3: TcxButtonEdit; - Label31: TLabel; Process4: TcxButtonEdit; - Label32: TLabel; Process5: TcxButtonEdit; - Label33: TLabel; Process: TcxButtonEdit; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -175,6 +172,8 @@ type procedure Process5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure C_FromName4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure C_FromName5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure CostPriceClick(Sender: TObject); + private canshu1: string; Fint: Integer; @@ -530,7 +529,17 @@ begin Open; end; - SCSHData(ADOQueryTemp, panel2, 2); +// SCSHData(ADOQueryTemp, panel2, 2); +// SCSHData(ADOQueryTemp, panel6, 2); + if FCTID = 'CT2412300005' then + begin + SCSHData(ADOQueryTemp, panel2, 2); + SCSHData(ADOQueryTemp, panel6, 2); + end + else + begin + SCSHData(ADOQueryTemp, panel2, 2); + end; StkPosition.Text := ADOQueryTemp.FieldByName('StkPosition').AsString; qtyunit.Text := ADOQueryTemp.FieldByName('qtyunit').AsString; // SCSHData(ADOQueryTemp, ScrollBox1, 0); @@ -746,6 +755,7 @@ begin C_Name.Enabled := True; C_FromName.Enabled := False; C_FromName2.Enabled := False; + Panel6.Visible:=False; end; with ADOQueryTemp do begin @@ -880,7 +890,16 @@ begin if trim(C_Code.Text) = '' then C_Code.Text := Trim(MaxBCIID); - RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel2, 2); + + if FCTID = 'CT2412300005' then + begin + RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel2, 2); + RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel6, 2) ; + end + else + begin + RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel2, 2); + end; Post; end; with ADOQueryTemp do @@ -1283,7 +1302,7 @@ begin begin if GetLSNo(ADOQueryCmd, MC_Code, 'C', 'BS_Cloth_Info', 4, 0) = False then begin - Application.MessageBox('ȡƷʧ!', 'ʾ', 0); + Application.MessageBox('ȡƷʧ!', 'ʾ', 0); Exit; end; C_Code.Text := MC_Code; @@ -1445,6 +1464,13 @@ begin // Panel6.Visible := False; end; + + +procedure TfrmClothInfoInput.CostPriceClick(Sender: TObject); +begin + CostPrice.text:=''; +end; + procedure TfrmClothInfoInput.CostPricePropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm index 72c9634..31cccd4 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm @@ -8,8 +8,8 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Font.Height = -16 FormStyle = fsMDIChild Visible = True - ExplicitWidth = 1303 - ExplicitHeight = 637 + ExplicitWidth = 1311 + ExplicitHeight = 645 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -28,7 +28,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList ParentColor = False ShowCaptions = True TabOrder = 2 - ExplicitWidth = 1041 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -131,7 +130,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList ParentBackground = False ParentColor = True TabOrder = 3 - ExplicitWidth = 1041 object Label3: TLabel Left = 254 Top = 47 @@ -268,7 +266,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList TabOrder = 6 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 1037 + ExplicitWidth = 1291 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -351,14 +349,12 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change - ExplicitWidth = 1041 ClientRectBottom = 457 ClientRectRight = 1295 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = ' '#20135#21697#27719#24635' ' ImageIndex = 0 - ExplicitWidth = 1041 object cxGrid2: TcxGrid Left = 0 Top = 0 @@ -367,7 +363,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitWidth = 1041 object TV2: TcxGridDBTableView OnDblClick = TV2DblClick Navigator.Buttons.CustomButtons = <> @@ -520,7 +515,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList object cxTabSheet2: TcxTabSheet Caption = #20135#21697#26126#32454 ImageIndex = 1 - ExplicitWidth = 1041 object cxGrid1: TcxGrid Left = 0 Top = 0 @@ -529,7 +523,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitWidth = 1041 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas index fd16327..6491e3e 100644 --- a/T05贸易门市管理/U_GetDllForm.pas +++ b/T05贸易门市管理/U_GetDllForm.pas @@ -138,30 +138,30 @@ begin end; end; - 112: // - begin - with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // - begin - fFormID := FormID; - FOrdType := ''; - FormStyle := mstyle; - WindowState := mstate; - BorderStyle := mborderstyle; - mnewHandle := Handle; - end; - end; - - 121: // - begin - with TfrmTradeDispatchedList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // - begin - fFormID := FormID; - FormStyle := mstyle; - WindowState := mstate; - BorderStyle := mborderstyle; - mnewHandle := Handle; - end; - end; +// 112: // +// begin +// with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// begin +// fFormID := FormID; +// FOrdType := ''; +// FormStyle := mstyle; +// WindowState := mstate; +// BorderStyle := mborderstyle; +// mnewHandle := Handle; +// end; +// end; +// +// 121: // +// begin +// with TfrmTradeDispatchedList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// begin +// fFormID := FormID; +// FormStyle := mstyle; +// WindowState := mstate; +// BorderStyle := mborderstyle; +// mnewHandle := Handle; +// end; +// end; 10000: begin diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index a3f618e..d33125e 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -3,12 +3,12 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Top = 4 Caption = #35746#21333#24405#20837 ClientHeight = 652 - ClientWidth = 1360 + ClientWidth = 1787 Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poMainFormCenter WindowState = wsMaximized - ExplicitWidth = 1376 + ExplicitWidth = 1803 ExplicitHeight = 691 PixelsPerInch = 96 TextHeight = 21 @@ -16,7 +16,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 1 Left = 0 Top = 0 - Width = 1360 + Width = 1787 Height = 30 AutoSize = True ButtonHeight = 30 @@ -28,6 +28,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 0 + ExplicitWidth = 1360 object TBSave: TToolButton Left = 0 Top = 0 @@ -57,7 +58,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 1 Left = 0 Top = 185 - Width = 1360 + Width = 1787 Height = 24 ButtonHeight = 30 ButtonWidth = 67 @@ -68,7 +69,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 1 - ExplicitTop = 225 + ExplicitWidth = 1360 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -89,30 +90,29 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object Panel2: TPanel [2] Left = 0 Top = 209 - Width = 1360 + Width = 1787 Height = 443 Align = alClient Caption = 'Panel2' TabOrder = 2 - ExplicitTop = 249 - ExplicitHeight = 403 + ExplicitWidth = 1360 object Panel3: TPanel Left = 1 Top = 1 - Width = 1072 + Width = 1499 Height = 441 Align = alClient Caption = 'Panel2' TabOrder = 0 - ExplicitHeight = 401 + ExplicitWidth = 1072 object cxGrid1: TcxGrid Left = 1 Top = 1 - Width = 1070 + Width = 1497 Height = 439 Align = alClient TabOrder = 0 - ExplicitHeight = 399 + ExplicitWidth = 1070 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -339,14 +339,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end end object Panel4: TPanel - Left = 1073 + Left = 1500 Top = 1 Width = 286 Height = 441 Align = alRight Caption = 'Panel4' TabOrder = 1 - ExplicitHeight = 401 + ExplicitLeft = 1073 object Panel5: TPanel Left = 1 Top = 1 @@ -384,7 +384,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = #21452#20987#21024#38500#26126#32454#20449#24687 TabOrder = 1 - ExplicitHeight = 358 object cxGrid2: TcxGrid Left = 2 Top = 23 @@ -392,7 +391,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 373 Align = alClient TabOrder = 0 - ExplicitHeight = 333 object TvMX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -455,7 +453,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object ScrollBox1: TScrollBox [3] Left = 0 Top = 30 - Width = 1360 + Width = 1787 Height = 155 Align = alTop BevelInner = bvNone @@ -465,6 +463,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut ParentCtl3D = False TabOrder = 3 OnClick = ScrollBox1Click + ExplicitLeft = -1 + ExplicitTop = 24 object Label3: TLabel Left = 730 Top = 70 @@ -518,12 +518,11 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Visible = False end object Label37: TLabel - Left = 29 - Top = 247 - Width = 80 + Left = 1077 + Top = 21 + Width = 64 Height = 21 - Caption = #35746#21333#31867#22411#65306 - Visible = False + Caption = #35746#21333#31867#22411 end object Label18: TLabel Left = 730 @@ -586,8 +585,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object OrdType: TComboBox Tag = 2 - Left = 122 - Top = 243 + Left = 1164 + Top = 17 Width = 200 Height = 29 Style = csDropDownList @@ -597,9 +596,9 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut ParentCtl3D = False TabOrder = 4 Text = #27491#24120#21333 - Visible = False Items.Strings = ( - #27491#24120#21333) + #27491#24120#21333 + #21098#26679#21333) end object OurCoName: TcxButtonEdit Tag = 2 diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index 22ab6c3..ef70843 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -145,6 +145,7 @@ type procedure InitImage2(); procedure LookImage(FileName: string); procedure InitMXGrid(MTMSId: string); + procedure AddLine(); { Private declarations } public PState, CopyInt, PriceFlag: Integer; @@ -169,6 +170,33 @@ uses {$R *.dfm} +procedure TfrmTradeMarketInPut.AddLine(); +var + i: Integer; + maxno: string; +begin + + i := cds_1.RecordCount; + i := i + 1; + CopyAddRow(Tv1, cds_1); + + if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then + begin + ADOCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + with cds_1 do + begin + Edit; + FieldByName('SerialNo').Value := IntToStr(i); + FieldByName('TMSId').Value := Trim(maxno); + FieldByName('TMSPiece').Value := 0; + FieldByName('TMSQty').Value := 0; + Post; + end; +end; + procedure TfrmTradeMarketInPut.InitImage1(); begin @@ -348,11 +376,15 @@ begin TMMNo.Text := ''; fFlileFlag := UserDataFlag + 'HX'; InitData(); - ordtype.Items.Clear; - ordtype.Items.Add(fordtype); - ordtype.ItemIndex := 0; - InitImage1(); - InitImage2(); + + if CDS_1.IsEmpty then + begin + AddLine(); + AddLine(); + AddLine(); + AddLine(); + AddLine(); + end; with ADO_PM do begin @@ -525,6 +557,13 @@ var begin ToolBar1.SetFocus; + with cds_1 do + begin + while cds_1.Locate('C_Code', null, []) do + begin + cds_1.Delete + end; + end; if trim(CustName.Text) = '' then begin @@ -573,31 +612,9 @@ begin end; procedure TfrmTradeMarketInPut.ToolButton1Click(Sender: TObject); -var - i: Integer; - maxno: string; begin - i := cds_1.RecordCount; - i := i + 1; - CopyAddRow(Tv1, cds_1); - - if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then - begin - ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); - Exit; - end; - with cds_1 do - begin - Edit; - FieldByName('SerialNo').Value := IntToStr(i); - FieldByName('TMSId').Value := Trim(maxno); - FieldByName('TMSPiece').Value := 0; - FieldByName('TMSQty').Value := 0; -// FieldByName('TMSUnit').Value := 'M'; - Post; - end; + AddLine(); end; procedure TfrmTradeMarketInPut.ToolButton2Click(Sender: TObject);