diff --git a/A00通用窗体/U_ClothInfoSel.dfm b/A00通用窗体/U_ClothInfoSel.dfm index e17d58a..7934e20 100644 --- a/A00通用窗体/U_ClothInfoSel.dfm +++ b/A00通用窗体/U_ClothInfoSel.dfm @@ -28,7 +28,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel List = True ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1519 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -76,7 +75,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel ScrollbarAnnotations.CustomAnnotations = <> TabOrder = 1 OnDblClick = cxDBTreeList1DblClick - ExplicitHeight = 492 object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn DataBinding.FieldName = 'CTName' Width = 210 @@ -97,10 +95,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel BevelOuter = bvLowered Caption = 'Panel3' TabOrder = 2 - ExplicitLeft = 530 - ExplicitTop = 120 - ExplicitWidth = 1303 - ExplicitHeight = 492 object Panel7: TPanel Left = 2 Top = 2 @@ -109,7 +103,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel Align = alTop BevelOuter = bvNone TabOrder = 0 - ExplicitWidth = 1299 object Panel4: TPanel Left = 0 Top = 0 @@ -119,7 +112,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel AutoSize = True ParentColor = True TabOrder = 0 - ExplicitWidth = 1299 DesignSize = ( 1587 40) @@ -214,7 +206,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel Height = 650 Align = alClient TabOrder = 1 - ExplicitTop = 40 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -479,8 +470,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel ParentColor = False TabOrder = 2 Visible = False - ExplicitLeft = 984 - ExplicitHeight = 448 object cxGrid2: TcxGrid Left = 2 Top = 23 @@ -488,7 +477,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel Height = 625 Align = alClient TabOrder = 0 - ExplicitHeight = 423 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -628,7 +616,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel BevelOuter = bvLowered ParentColor = True TabOrder = 3 - ExplicitWidth = 1519 object Label3: TLabel Left = 1010 Top = 53 diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index c39a83e..ac46550 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -638,8 +638,7 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient PopupMenu = PM_1 TabOrder = 2 - ExplicitLeft = 6 - ExplicitTop = 41 + ExplicitLeft = 4 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -810,7 +809,7 @@ inherited frmClothInfo: TfrmClothInfo Width = 138 end object Tv1Column12: TcxGridDBColumn - Caption = #21152#24037#21035 + Caption = #24037#33402 DataBinding.FieldName = 'CraftCode' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -849,13 +848,6 @@ inherited frmClothInfo: TfrmClothInfo HeaderAlignmentHorz = taCenter Width = 105 end - object Tv1Column22: TcxGridDBColumn - Caption = #32568#21495 - DataBinding.FieldName = 'FtyPCId' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 95 - end object Tv1Column19: TcxGridDBColumn Caption = #24320#21457#20154#21592 DataBinding.FieldName = 'Developer' diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index b19003d..3630c99 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -138,7 +138,6 @@ type Tv1Column16: TcxGridDBColumn; Tv1Column17: TcxGridDBColumn; Tv1Column18: TcxGridDBColumn; - Tv1Column22: TcxGridDBColumn; Tv1Column19: TcxGridDBColumn; Tv1Column20: TcxGridDBColumn; Tv1Column21: TcxGridDBColumn; diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index bc4605d..0856317 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -3,7 +3,7 @@ object frmClothInfoInput: TfrmClothInfoInput Top = 231 Anchors = [] Caption = #20135#21697#20449#24687#24405#20837 - ClientHeight = 653 + ClientHeight = 565 ClientWidth = 1284 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -69,16 +69,15 @@ object frmClothInfoInput: TfrmClothInfoInput object ScrollBox1: TScrollBox Left = 0 Top = 30 - Width = 775 - Height = 623 + Width = 761 + Height = 535 Align = alLeft BevelInner = bvNone BevelOuter = bvNone Ctl3D = False ParentCtl3D = False TabOrder = 1 - ExplicitLeft = -5 - ExplicitTop = 29 + ExplicitHeight = 649 object Label1: TLabel Left = 37 Top = 18 @@ -158,7 +157,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label9: TLabel Left = 37 - Top = 400 + Top = 402 Width = 32 Height = 21 Caption = #22791#27880 @@ -167,7 +166,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label11: TLabel Left = 37 - Top = 238 + Top = 242 Width = 32 Height = 21 Caption = #24067#31181 @@ -185,7 +184,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label12: TLabel Left = 37 - Top = 276 + Top = 279 Width = 64 Height = 21 Caption = #32433#32447#24418#24577 @@ -194,16 +193,16 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label16: TLabel Left = 421 - Top = 238 - Width = 48 + Top = 242 + Width = 32 Height = 21 - Caption = #21152#24037#21035 + Caption = #24037#33402 Color = clWhite ParentColor = False end object Label18: TLabel Left = 37 - Top = 314 + Top = 316 Width = 80 Height = 21 Caption = #20379#24212#21830#20195#21495 @@ -212,7 +211,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label19: TLabel Left = 421 - Top = 314 + Top = 316 Width = 48 Height = 21 Caption = #20379#24212#21830 @@ -230,7 +229,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label23: TLabel Left = 421 - Top = 276 + Top = 279 Width = 64 Height = 21 Caption = #26579#33394#26041#24335 @@ -282,6 +281,24 @@ object frmClothInfoInput: TfrmClothInfoInput Color = clWhite ParentColor = False end + object Label17: TLabel + Left = 39 + Top = 456 + Width = 41 + Height = 21 + Caption = #21697#21517'1' + Color = clWhite + ParentColor = False + end + object Label24: TLabel + Left = 433 + Top = 456 + Width = 41 + Height = 21 + Caption = #21697#21517'2' + Color = clWhite + ParentColor = False + end object C_Code: TcxTextEdit Tag = 2 Left = 119 @@ -311,7 +328,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_GramWeight: TcxButtonEdit Tag = 2 Left = 507 - Top = 90 + Top = 88 Hint = 'C_GramWeight/'#20811#37325 Properties.Buttons = < item @@ -328,7 +345,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_Composition: TcxButtonEdit Tag = 2 Left = 119 - Top = 128 + Top = 126 Hint = 'C_Composition/'#25104#20998 Properties.Buttons = < item @@ -345,7 +362,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_Spec: TcxButtonEdit Tag = 2 Left = 119 - Top = 165 + Top = 163 Hint = 'C_Spec/'#35268#26684 Properties.Buttons = < item @@ -361,9 +378,8 @@ object frmClothInfoInput: TfrmClothInfoInput end object C_FromName: TcxButtonEdit Tag = 7 - Left = 1048 - Top = 226 - ParentFont = False + Left = 119 + Top = 450 Properties.Buttons = < item Default = True @@ -373,14 +389,13 @@ object frmClothInfoInput: TfrmClothInfoInput Properties.OnButtonClick = C_FromNamePropertiesButtonClick Style.ButtonStyle = btsDefault TabOrder = 6 - Visible = False OnDblClick = C_GramWeightDblClick Width = 234 end object C_Width: TcxButtonEdit Tag = 2 Left = 119 - Top = 90 + Top = 88 Hint = 'C_Width/'#38376#24133 Properties.Buttons = < item @@ -397,7 +412,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_Pattern: TcxButtonEdit Tag = 2 Left = 119 - Top = 52 + Top = 50 Hint = 'C_Pattern/'#33457#22411 Properties.Buttons = < item @@ -414,15 +429,15 @@ object frmClothInfoInput: TfrmClothInfoInput object CINote: TcxMemo Tag = 2 Left = 119 - Top = 381 + Top = 384 TabOrder = 9 Height = 57 - Width = 626 + Width = 622 end object GC_Name: TcxTextEdit Tag = 2 Left = 119 - Top = 234 + Top = 236 TabOrder = 10 OnKeyPress = CYColorKeyPress Width = 234 @@ -430,7 +445,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_EComposition: TcxButtonEdit Tag = 2 Left = 507 - Top = 128 + Top = 126 Hint = 'C_EComposition/'#25104#20998 Properties.Buttons = < item @@ -447,7 +462,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_YarnSpec: TcxTextEdit Tag = 2 Left = 119 - Top = 272 + Top = 273 TabOrder = 12 OnKeyPress = CYColorKeyPress Width = 234 @@ -455,7 +470,7 @@ object frmClothInfoInput: TfrmClothInfoInput object CraftCode: TcxTextEdit Tag = 2 Left = 507 - Top = 234 + Top = 236 TabOrder = 13 OnKeyPress = CYColorKeyPress Width = 234 @@ -479,7 +494,7 @@ object frmClothInfoInput: TfrmClothInfoInput object C_EName: TcxTextEdit Tag = 2 Left = 507 - Top = 52 + Top = 50 TabOrder = 16 OnKeyPress = CYColorKeyPress Width = 234 @@ -487,7 +502,7 @@ object frmClothInfoInput: TfrmClothInfoInput object DyeingMethod: TcxTextEdit Tag = 2 Left = 507 - Top = 272 + Top = 273 TabOrder = 17 OnKeyPress = CYColorKeyPress Width = 234 @@ -501,14 +516,14 @@ object frmClothInfoInput: TfrmClothInfoInput end object distributionCoefficient: TcxCurrencyEdit Left = 119 - Top = 201 + Top = 199 Properties.AssignedValues.DisplayFormat = True TabOrder = 19 Width = 234 end object quota: TcxCurrencyEdit Left = 507 - Top = 201 + Top = 199 EditValue = 10.000000000000000000 Properties.AssignedValues.DisplayFormat = True TabOrder = 20 @@ -517,7 +532,7 @@ object frmClothInfoInput: TfrmClothInfoInput object StkPosition: TcxButtonEdit Tag = 2 Left = 507 - Top = 165 + Top = 163 Hint = 'StkPosition/'#24211#20301 Properties.Buttons = < item @@ -531,18 +546,37 @@ object frmClothInfoInput: TfrmClothInfoInput OnDblClick = C_GramWeightDblClick Width = 234 end + object C_FromName2: TcxButtonEdit + Tag = 7 + Left = 506 + Top = 450 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = C_FromName2PropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 22 + OnDblClick = C_GramWeightDblClick + Width = 234 + end end object Panel1: TPanel - Left = 775 + Left = 761 Top = 30 - Width = 509 - Height = 623 + Width = 523 + Height = 535 Align = alClient TabOrder = 2 + ExplicitLeft = 775 + ExplicitWidth = 509 + ExplicitHeight = 623 object ToolBar2: TToolBar Left = 1 Top = 1 - Width = 507 + Width = 521 Height = 30 AutoSize = True ButtonHeight = 30 @@ -555,6 +589,7 @@ object frmClothInfoInput: TfrmClothInfoInput ParentColor = False ShowCaptions = True TabOrder = 0 + ExplicitWidth = 507 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -564,7 +599,7 @@ object frmClothInfoInput: TfrmClothInfoInput OnClick = ToolButton3Click end object ToolButton4: TToolButton - Left = 71 + Left = 63 Top = 0 AutoSize = True Caption = #21024#34892 @@ -575,12 +610,12 @@ object frmClothInfoInput: TfrmClothInfoInput object cxGrid1: TcxGrid Left = 1 Top = 31 - Width = 507 - Height = 591 + Width = 521 + Height = 503 Align = alClient TabOrder = 1 - ExplicitLeft = 6 - ExplicitTop = 37 + ExplicitWidth = 507 + ExplicitHeight = 591 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 8d70b37..0bdb3a1 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -82,6 +82,9 @@ type StkPosition: TcxButtonEdit; TV1Column5: TcxGridDBColumn; TV1Column6: TcxGridDBColumn; + C_FromName2: TcxButtonEdit; + Label17: TLabel; + Label24: TLabel; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); @@ -95,6 +98,7 @@ type procedure ToolButton4Click(Sender: TObject); procedure TV1Column5PropertiesEditValueChanged(Sender: TObject); procedure C_WidthPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure C_FromName2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private canshu1: string; Fint: Integer; @@ -147,6 +151,10 @@ begin // SCSHData(ADOQueryTemp, ScrollBox1, 0); C_FromName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); // C_FromName.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName').AsString); // + + C_FromName2.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName2').AsString); // + C_FromName2.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName2').AsString); // + if ADOQueryTemp.fieldbyname('CJDATE').AsInteger <= 7 then begin if TypeInt = 2 then @@ -171,13 +179,31 @@ begin end; +procedure TfrmClothInfoInput.C_FromName2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmClothInfoSel := TfrmClothInfoSel.Create(Application); + with frmClothInfoSel do + begin +// FCTType := ''; + if ShowModal = 1 then + begin + C_FromName2.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('BCIID').AsString); + C_FromName2.Text := Trim(CDS_1.fieldbyname('C_Name').AsString); + end; + end; + finally + frmClothInfoSel.Free; + end; +end; + procedure TfrmClothInfoInput.C_FromNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try frmClothInfoSel := TfrmClothInfoSel.Create(Application); with frmClothInfoSel do begin - FCTType := ''; +// FCTType := ''; if ShowModal = 1 then begin C_FromName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('BCIID').AsString); @@ -316,10 +342,27 @@ begin begin Append; FieldByName('ToID').Value := Trim(MaxBCIID); + FieldByName('SerialNo').Value := 1; FieldByName('FromID').Value := Trim(C_FromName.Properties.LookupItems.Text); // Post; end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from BS_Cloth_Info_Link where 1=2'); + Open; + end; + with ADOQueryCmd do + begin + Append; + FieldByName('ToID').Value := Trim(MaxBCIID); + FieldByName('SerialNo').Value := 2; + FieldByName('FromID').Value := Trim(C_FromName2.Properties.LookupItems.Text); // + Post; + end; + with ADOQueryTemp do begin Close; @@ -449,6 +492,7 @@ begin end; C_Code.Text := MC_Code; end; + C_Name.Text := Trim(C_FromName.Text) + '+' + Trim(C_FromName2.Text); if SaveData() then begin Application.MessageBox('ɹ', 'ʾ', 0); diff --git a/A05基础资料管理/U_PositionInPut.dfm b/A05基础资料管理/U_PositionInPut.dfm index 0649719..fc97c50 100644 --- a/A05基础资料管理/U_PositionInPut.dfm +++ b/A05基础资料管理/U_PositionInPut.dfm @@ -47,14 +47,14 @@ inherited frmPositionInPut: TfrmPositionInPut DataBinding.FieldName = 'POSNO' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 100 + Width = 201 end object Tv1Column1: TcxGridDBColumn Caption = #24211#20301#21517#31216 DataBinding.FieldName = 'POSName' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 100 + Width = 216 end end object cxGrid2Level1: TcxGridLevel @@ -69,7 +69,7 @@ inherited frmPositionInPut: TfrmPositionInPut Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 99 + ButtonWidth = 83 Caption = 'ToolBar1' Images = DataLink_BaseInfo.cxImageList_bar List = True @@ -84,15 +84,23 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = TBSaveClick end object TBAdd: TToolButton - Left = 71 + Left = 63 Top = 0 AutoSize = True Caption = #26032#22686 ImageIndex = 2 OnClick = TBAddClick end + object ToolButton2: TToolButton + Left = 126 + Top = 0 + AutoSize = True + Caption = #23548#20837 + ImageIndex = 28 + OnClick = ToolButton2Click + end object TBDel: TToolButton - Left = 142 + Left = 189 Top = 0 AutoSize = True Caption = #21024#38500 @@ -100,7 +108,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = TBDelClick end object ToolButton1: TToolButton - Left = 213 + Left = 252 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -108,7 +116,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 316 + Left = 339 Top = 0 AutoSize = True Caption = #20851#38381 @@ -242,4 +250,14 @@ inherited frmPositionInPut: TfrmPositionInPut Left = 160 Top = 192 end + object CDS_LM: TClientDataSet + Aggregates = <> + Params = <> + Left = 384 + Top = 239 + end + object OpenDialog1: TOpenDialog + Left = 302 + Top = 239 + end end diff --git a/A05基础资料管理/U_PositionInPut.pas b/A05基础资料管理/U_PositionInPut.pas index 18c9b48..b8d5c38 100644 --- a/A05基础资料管理/U_PositionInPut.pas +++ b/A05基础资料管理/U_PositionInPut.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, StrUtils, U_BaseInput, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxScrollbarAnnotations, cxContainer, dxBarBuiltInMenu, - System.ImageList, Vcl.ImgList, cxImageList; + System.ImageList, Vcl.ImgList, cxImageList, System.Win.ComObj; type TfrmPositionInPut = class(TfrmBaseInput) @@ -41,6 +41,9 @@ type Label2: TLabel; Label3: TLabel; POSName: TcxTextEdit; + CDS_LM: TClientDataSet; + OpenDialog1: TOpenDialog; + ToolButton2: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -48,6 +51,7 @@ type procedure TBDelClick(Sender: TObject); procedure TBSaveClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); private { Private declarations } function SaveCKData(): Boolean; @@ -177,6 +181,16 @@ var begin inherited; ReadCxGrid(trim(self.Caption), Tv1, 'Ⱦɫֿ'); + with CDS_LM do + begin + FieldDefs.Clear; + FieldDefs.Add('LXH', ftInteger, 0); + FieldDefs.Add('lCode', ftString, 40); + FieldDefs.Add('LName', ftString, 40); + close; + CreateDataSet; + end; + with ADOQueryTemp do begin Close; @@ -248,5 +262,91 @@ begin WriteCxGrid(trim(self.Caption), Tv1, 'Ⱦɫֿ'); end; +procedure TfrmPositionInPut.ToolButton2Click(Sender: TObject); +var + excelApp, WorkBook: Variant; + i, j, k, LX, ExcelRowCount: integer; + maxId, FCPID, FCPName, t1, t2, t3, FFID: string; +begin + + try + excelApp := CreateOleObject('Excel.Application'); + openDialog1.Filter := '*.CSV;*.xls'; + if opendialog1.Execute then + begin + WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName); + end + else + exit; + excelApp.Visible := false; + ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count; + except + application.MessageBox('EXCEL', 'Ϣ', MB_ICONERROR); + exit; + end; + + CDS_LM.EmptyDataSet; + + for j := 0 to Tv1.ColumnCount - 1 do + begin + with CDS_LM do + begin + Append; + FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName); + FieldByName('LName').Value := trim(Tv1.Columns[j].Caption); + Post; + end; + end; + + try + for i := 1 to 50 do + begin + if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then + continue; + if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then + begin + with CDS_LM do + begin + Edit; + FieldByName('LXH').Value := i; + Post; + end; + end; + end; + except + application.MessageBox('', 'Ϣ', MB_ICONERROR); + exit; + end; + + try + for i := 2 to ExcelRowCount do + begin + with CDS_Sub do + begin + Append; + CDS_LM.First; + while not CDS_LM.Eof do + begin + if CDS_LM.FieldByName('LXH').AsInteger > 0 then + CDS_Sub.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value; + CDS_LM.Next; + end; + Post; + end; + end; + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + except + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + exit; + end; + +end; + end. diff --git a/T02贸易汇总仓库/U_TradeCardInPut.dfm b/T02贸易汇总仓库/U_TradeCardInPut.dfm index b0916ae..ac0932e 100644 --- a/T02贸易汇总仓库/U_TradeCardInPut.dfm +++ b/T02贸易汇总仓库/U_TradeCardInPut.dfm @@ -311,7 +311,7 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut end object PCQty: TcxTextEdit Left = 528 - Top = 9 + Top = 7 TabOrder = 0 OnKeyPress = PCQtyKeyPress Width = 80 @@ -319,7 +319,7 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut object PCGrade: TcxComboBox Tag = 2 Left = 192 - Top = 9 + Top = 7 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( 'A' @@ -332,35 +332,35 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut end object PackWidth: TcxTextEdit Left = 736 - Top = 9 + Top = 7 TabOrder = 2 OnKeyPress = PackWidthKeyPress Width = 80 end object PackLength: TcxTextEdit Left = 632 - Top = 9 + Top = 7 TabOrder = 3 OnKeyPress = PackLengthKeyPress Width = 80 end object ActualWidth: TcxTextEdit Left = 960 - Top = 9 + Top = 7 TabOrder = 4 OnKeyPress = ActualWidthKeyPress Width = 80 end object PackHeight: TcxTextEdit Left = 840 - Top = 9 + Top = 7 TabOrder = 5 Width = 80 end object Position: TcxButtonEdit Tag = 1 Left = 1241 - Top = 9 + Top = 7 Properties.Buttons = < item Default = True @@ -372,7 +372,7 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut end object CMSel: TcxComboBox Left = 76 - Top = 9 + Top = 7 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( #25968#37327 @@ -382,24 +382,24 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut Text = #25968#37327 Width = 76 end - object QtyKgGross: TcxTextEdit + object GrossWeight: TcxTextEdit Left = 288 - Top = 9 + Top = 7 TabOrder = 8 - OnKeyPress = QtyKgGrossKeyPress + OnKeyPress = GrossWeightKeyPress Width = 80 end - object QtyKgNet: TcxTextEdit + object NetWeight: TcxTextEdit Left = 408 - Top = 9 + Top = 7 TabOrder = 9 - OnKeyPress = QtyKgNetKeyPress + OnKeyPress = NetWeightKeyPress Width = 80 end object StkCoName: TcxButtonEdit Tag = 1 Left = 1080 - Top = 9 + Top = 7 Properties.Buttons = < item Default = True @@ -411,7 +411,7 @@ inherited frmTradeCardInPut: TfrmTradeCardInPut end object C_StyleNo: TcxTextEdit Left = 1421 - Top = 9 + Top = 7 TabOrder = 11 OnKeyPress = PCQtyKeyPress Width = 80 diff --git a/T02贸易汇总仓库/U_TradeCardInPut.pas b/T02贸易汇总仓库/U_TradeCardInPut.pas index 06547b8..4b892a0 100644 --- a/T02贸易汇总仓库/U_TradeCardInPut.pas +++ b/T02贸易汇总仓库/U_TradeCardInPut.pas @@ -108,8 +108,8 @@ type Downgrade: TcxButtonEdit; cxButton4: TcxButton; Label23: TLabel; - QtyKgGross: TcxTextEdit; - QtyKgNet: TcxTextEdit; + GrossWeight: TcxTextEdit; + NetWeight: TcxTextEdit; Label24: TLabel; StkCoName: TcxButtonEdit; Label25: TLabel; @@ -172,8 +172,8 @@ type procedure DowngradePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton7Click(Sender: TObject); procedure cxButton4Click(Sender: TObject); - procedure QtyKgGrossKeyPress(Sender: TObject; var Key: Char); - procedure QtyKgNetKeyPress(Sender: TObject; var Key: Char); + procedure GrossWeightKeyPress(Sender: TObject; var Key: Char); + procedure NetWeightKeyPress(Sender: TObject; var Key: Char); procedure PositionPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure cxButtonEdit1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton10Click(Sender: TObject); @@ -280,8 +280,8 @@ begin begin sql.Add(', Piece=1,Qty=' + FloatToStr(StrToFloatDef(PCQty.Text, 0))); sql.Add(', StkPiece=1,StkQty=' + FloatToStr(StrToFloatDef(PCQty.Text, 0))); - sql.Add(', QtyKgGross=' + FloatToStr(StrToFloatDef(QtyKgGross.Text, 0))); - sql.Add(', QtyKgNet=' + FloatToStr(StrToFloatDef(QtyKgNet.Text, 0))); + sql.Add(', GrossWeight=' + FloatToStr(StrToFloatDef(GrossWeight.Text, 0))); + sql.Add(', NetWeight=' + FloatToStr(StrToFloatDef(NetWeight.Text, 0))); sql.Add(', Grade=' + QuotedStr(PCGrade.Text)); sql.Add(', StkCoNo=' + QuotedStr(StkCoName.Properties.LookupItems.Text)); @@ -440,15 +440,15 @@ begin end; end; -procedure TfrmTradeCardInPut.QtyKgGrossKeyPress(Sender: TObject; var Key: Char); +procedure TfrmTradeCardInPut.GrossWeightKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin - QtyKgNet.SetFocus; + NetWeight.SetFocus; end; end; -procedure TfrmTradeCardInPut.QtyKgNetKeyPress(Sender: TObject; var Key: Char); +procedure TfrmTradeCardInPut.NetWeightKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin @@ -1049,7 +1049,7 @@ begin sql.Add(' set EditID=' + quotedstr(DCode)); sql.Add(', Editer=' + quotedstr(DName)); sql.Add(', Edittime=getdate()'); - sql.Add(', Piece=0,Qty=0, StkPiece=0,StkQty=0,QtyKgNet=0,QtyKgGross=0,IOPosition=NULL,Grade=NULL'); + sql.Add(', Piece=0,Qty=0, StkPiece=0,StkQty=0,NetWeight=0,GrossWeight=0,IOPosition=NULL,Grade=NULL'); sql.Add(' where EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + QuotedStr(MBCIOIDS) + ','','') X where BS_Cloth_IO.BCIOID=X.RTValue ) '); ExecSQL; end; diff --git a/T02贸易汇总仓库/U_TradeClothTotalInInput1.dfm b/T02贸易汇总仓库/U_TradeClothTotalInInput1.dfm index 29515b1..523ac0f 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInInput1.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInInput1.dfm @@ -3,12 +3,12 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 Top = 126 Caption = #26126#32454#20837#24211#30331#35760 ClientHeight = 525 - ClientWidth = 879 + ClientWidth = 1041 Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 895 + ExplicitWidth = 1057 ExplicitHeight = 564 PixelsPerInch = 96 TextHeight = 21 @@ -16,7 +16,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 Tag = 1 Left = 0 Top = 0 - Width = 879 + Width = 1041 Height = 30 AutoSize = True ButtonHeight = 30 @@ -34,7 +34,6 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1540 object TBSave: TToolButton Left = 0 Top = 0 @@ -59,7 +58,6 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 Height = 495 Align = alLeft TabOrder = 1 - ExplicitLeft = 8 object Label12: TLabel Left = 271 Top = 20 @@ -83,7 +81,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label2: TLabel Left = 25 - Top = 95 + Top = 91 Width = 64 Height = 21 Caption = #20135#21697#32534#21495 @@ -92,7 +90,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label5: TLabel Left = 271 - Top = 95 + Top = 91 Width = 64 Height = 21 Caption = #20013#25991#21697#21517 @@ -101,7 +99,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label15: TLabel Left = 271 - Top = 130 + Top = 126 Width = 64 Height = 21 Caption = #26377#25928#38376#24133 @@ -110,7 +108,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label22: TLabel Left = 25 - Top = 130 + Top = 126 Width = 64 Height = 21 Caption = #25104#21697#20811#37325 @@ -119,7 +117,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label4: TLabel Left = 25 - Top = 235 + Top = 231 Width = 64 Height = 21 Caption = #33457#22411#32534#21495 @@ -128,7 +126,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label7: TLabel Left = 25 - Top = 165 + Top = 161 Width = 64 Height = 21 Caption = #20013#25991#25104#20998 @@ -137,7 +135,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label6: TLabel Left = 25 - Top = 270 + Top = 266 Width = 32 Height = 21 Caption = #35268#26684 @@ -146,7 +144,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label11: TLabel Left = 25 - Top = 200 + Top = 196 Width = 32 Height = 21 Caption = #39068#33394 @@ -155,7 +153,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label10: TLabel Left = 271 - Top = 165 + Top = 161 Width = 64 Height = 21 Caption = #33521#25991#25104#20998 @@ -164,7 +162,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label16: TLabel Left = 25 - Top = 307 + Top = 303 Width = 64 Height = 21 Caption = #26579#21378#32568#21495 @@ -173,7 +171,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label21: TLabel Left = 271 - Top = 235 + Top = 231 Width = 64 Height = 21 Caption = #33521#25991#21697#21517 @@ -182,7 +180,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label27: TLabel Left = 271 - Top = 270 + Top = 266 Width = 64 Height = 21 Caption = #25968#37327#21333#20301 @@ -196,7 +194,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label8: TLabel Left = 271 - Top = 200 + Top = 196 Width = 32 Height = 21 Caption = #33394#21495 @@ -205,14 +203,14 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object Label17: TLabel Left = 271 - Top = 305 + Top = 301 Width = 32 Height = 21 Caption = #31867#22411 end object Label18: TLabel - Left = 27 - Top = 342 + Left = 11 + Top = 406 Width = 64 Height = 21 Caption = #20986#24211#21333#21495 @@ -256,31 +254,31 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object C_Name: TcxTextEdit Left = 339 - Top = 91 + Top = 87 TabOrder = 3 Width = 150 end object C_Color: TcxTextEdit Left = 95 - Top = 196 + Top = 192 TabOrder = 4 Width = 150 end object FtyPCId: TcxTextEdit Left = 95 - Top = 303 + Top = 299 TabOrder = 5 Width = 150 end object C_EName: TcxTextEdit Left = 339 - Top = 231 + Top = 227 TabOrder = 6 Width = 150 end object C_Code: TcxButtonEdit Left = 95 - Top = 91 + Top = 87 Properties.Buttons = < item Default = True @@ -294,7 +292,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object QtyUnit: TcxComboBox Left = 339 - Top = 266 + Top = 262 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( 'M' @@ -322,49 +320,49 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 end object C_EComposition: TcxTextEdit Left = 339 - Top = 161 + Top = 157 TabOrder = 10 Width = 150 end object C_GramWeight: TcxTextEdit Left = 95 - Top = 126 + Top = 122 TabOrder = 11 Width = 150 end object C_Composition: TcxTextEdit Left = 95 - Top = 161 + Top = 157 TabOrder = 12 Width = 150 end object C_Width: TcxTextEdit Left = 339 - Top = 126 + Top = 122 TabOrder = 13 Width = 150 end object C_Spec: TcxTextEdit Left = 95 - Top = 266 + Top = 262 TabOrder = 14 Width = 150 end object C_Pattern: TcxTextEdit Left = 95 - Top = 231 + Top = 227 TabOrder = 15 Width = 150 end object C_Colorno: TcxTextEdit Left = 339 - Top = 196 + Top = 192 TabOrder = 16 Width = 150 end object C_Degree: TcxComboBox Left = 339 - Top = 301 + Top = 297 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( #22383#24067 @@ -375,8 +373,8 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 Width = 150 end object BCIONO: TcxTextEdit - Left = 95 - Top = 338 + Left = 79 + Top = 402 Properties.ReadOnly = True TabOrder = 18 Visible = False @@ -386,24 +384,19 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 object pnl1: TPanel [2] Left = 505 Top = 30 - Width = 374 + Width = 536 Height = 495 Align = alClient Caption = 'pnl1' TabOrder = 2 - ExplicitLeft = 1040 - ExplicitTop = 512 - ExplicitWidth = 313 - ExplicitHeight = 137 object cxGrid1: TcxGrid Tag = 2 Left = 1 Top = 72 - Width = 372 + Width = 534 Height = 422 Align = alClient TabOrder = 0 - ExplicitLeft = 6 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -413,18 +406,63 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 item Kind = skSum Column = Tv1Column1 + end + item + Kind = skSum + Column = Tv1Column2 + end + item + Kind = skSum + Column = Tv1Column3 + end + item + Kind = skSum + Column = Tv1Column4 + end + item + Kind = skSum + Column = Tv1Column5 end> DataController.Summary.SummaryGroups = <> OptionsBehavior.GoToNextCellOnEnter = True OptionsCustomize.ColumnFiltering = False OptionsView.Footer = True OptionsView.GroupByBox = False + OptionsView.Indicator = True object Tv1Column1: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 169 + Width = 65 + end + object Tv1Column2: TcxGridDBColumn + Caption = #27611#37325 + DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column3: TcxGridDBColumn + Caption = #20928#37325 + DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column4: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column5: TcxGridDBColumn + Caption = #30721#25968 + DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 end end object cxGrid1Level1: TcxGridLevel @@ -435,7 +473,7 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 Tag = 1 Left = 1 Top = 1 - Width = 372 + Width = 534 Height = 30 AutoSize = True ButtonHeight = 30 @@ -453,8 +491,6 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 ParentFont = False ShowCaptions = True TabOrder = 1 - ExplicitWidth = 311 - ExplicitHeight = 60 object btn1: TToolButton Left = 0 Top = 0 @@ -463,16 +499,24 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 ImageIndex = 2 OnClick = TBAddClick end - object btn3: TToolButton + object btndaoru: TToolButton Left = 63 Top = 0 AutoSize = True + Caption = #23548#20837 + ImageIndex = 28 + OnClick = btndaoruClick + end + object btn3: TToolButton + Left = 126 + Top = 0 + AutoSize = True Caption = #21024#38500 ImageIndex = 6 OnClick = TBDelClick end object btn4: TToolButton - Left = 126 + Left = 189 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -483,37 +527,34 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 object pnl2: TPanel Left = 1 Top = 31 - Width = 372 + Width = 534 Height = 41 Align = alTop TabOrder = 2 - ExplicitLeft = 72 - ExplicitTop = 160 - ExplicitWidth = 185 object Label9: TLabel Left = 33 - Top = 10 + Top = 7 Width = 32 Height = 21 Caption = #21305#25968 end object Label13: TLabel Left = 193 - Top = 10 + Top = 7 Width = 32 Height = 21 Caption = #25968#37327 end object inPiece: TcxCurrencyEdit Left = 71 - Top = 6 + Top = 3 Properties.AssignedValues.DisplayFormat = True TabOrder = 0 Width = 98 end object inQty: TcxCurrencyEdit Left = 231 - Top = 6 + Top = 3 Properties.AssignedValues.DisplayFormat = True TabOrder = 1 OnKeyPress = inQtyKeyPress @@ -577,8 +618,8 @@ inherited frmTradeClothTotalInInput1: TfrmTradeClothTotalInInput1 object CDS_LM: TClientDataSet Aggregates = <> Params = <> - Left = 608 - Top = 328 + Left = 664 + Top = 370 end object OpenDialog1: TOpenDialog Left = 522 diff --git a/T02贸易汇总仓库/U_TradeClothTotalInInput1.pas b/T02贸易汇总仓库/U_TradeClothTotalInInput1.pas index 34354d6..b80ce51 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInInput1.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalInInput1.pas @@ -80,6 +80,11 @@ type C_Degree: TcxComboBox; Label18: TLabel; BCIONO: TcxTextEdit; + Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + Tv1Column5: TcxGridDBColumn; + btndaoru: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -100,6 +105,7 @@ type procedure C_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure inQtyKeyPress(Sender: TObject; var Key: Char); procedure StkCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure btndaoruClick(Sender: TObject); private { Private declarations } function SaveCKData(): Boolean; @@ -118,6 +124,92 @@ uses {$R *.dfm} +procedure TfrmTradeClothTotalInInput1.btndaoruClick(Sender: TObject); +var + excelApp, WorkBook: Variant; + i, j, k, LX, ExcelRowCount: integer; + maxId, FCPID, FCPName, t1, t2, t3, FFID: string; +begin + + try + excelApp := CreateOleObject('Excel.Application'); + openDialog1.Filter := '*.CSV;*.xls'; + if opendialog1.Execute then + begin + WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName); + end + else + exit; + excelApp.Visible := false; + ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count; + except + application.MessageBox('EXCEL', 'Ϣ', MB_ICONERROR); + exit; + end; + + CDS_LM.EmptyDataSet; + + for j := 0 to Tv1.ColumnCount - 1 do + begin + with CDS_LM do + begin + Append; + FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName); + FieldByName('LName').Value := trim(Tv1.Columns[j].Caption); + Post; + end; + end; + + try + for i := 1 to 50 do + begin + if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then + continue; + if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then + begin + with CDS_LM do + begin + Edit; + FieldByName('LXH').Value := i; + Post; + end; + end; + end; + except + application.MessageBox('', 'Ϣ', MB_ICONERROR); + exit; + end; + + try + for i := 2 to ExcelRowCount do + begin + with CDS_Sub do + begin + Append; + CDS_LM.First; + while not CDS_LM.Eof do + begin + if CDS_LM.FieldByName('LXH').AsInteger > 0 then + CDS_Sub.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value; + CDS_LM.Next; + end; + Post; + end; + end; + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + except + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + exit; + end; + +end; + procedure TfrmTradeClothTotalInInput1.C_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm index 4dac061..71dec53 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm @@ -20,7 +20,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' Color = clSkyBlue Images = DataLink_TradeTotalClothStk.cxImageList_bar @@ -37,7 +37,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBRafreshClick end object TBFind: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #36807#28388 @@ -46,7 +46,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBFindClick end object TBAdd: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #20837#24211 @@ -54,7 +54,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBAddClick end object btn1: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #26126#32454#20837#24211 @@ -62,7 +62,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = btn1Click end object TBEdit: TToolButton - Left = 276 + Left = 316 Top = 0 AutoSize = True Caption = #20462#25913 @@ -70,7 +70,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBEditClick end object TBDel: TToolButton - Left = 339 + Left = 387 Top = 0 AutoSize = True Caption = #21024#38500 @@ -78,7 +78,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBDelClick end object ToolButton2: TToolButton - Left = 402 + Left = 458 Top = 0 AutoSize = True Caption = #25171#21360 @@ -86,7 +86,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = ToolButton2Click end object ToolButton3: TToolButton - Left = 465 + Left = 529 Top = 0 AutoSize = True Caption = #38468#20214 @@ -94,7 +94,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = ToolButton3Click end object TBExport: TToolButton - Left = 528 + Left = 600 Top = 0 AutoSize = True Caption = #23548#20986 @@ -102,7 +102,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = TBExportClick end object ToolButton1: TToolButton - Left = 591 + Left = 671 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -110,7 +110,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 678 + Left = 774 Top = 0 AutoSize = True Caption = #20851#38381 @@ -364,6 +364,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitLeft = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T02贸易汇总仓库/U_TradeSampleClothInImport.dfm b/T02贸易汇总仓库/U_TradeSampleClothInImport.dfm index 2b35cef..d2a9e51 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInImport.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothInImport.dfm @@ -7,7 +7,6 @@ inherited frmTradeSampleClothInImport: TfrmTradeSampleClothInImport Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -16 - Font.Name = #24494#36719#38597#40657 Position = poScreenCenter OnClose = FormClose ExplicitWidth = 1798 @@ -22,8 +21,6 @@ inherited frmTradeSampleClothInImport: TfrmTradeSampleClothInImport Height = 508 Align = alClient TabOrder = 0 - ExplicitTop = 97 - ExplicitHeight = 441 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -482,6 +479,9 @@ inherited frmTradeSampleClothInImport: TfrmTradeSampleClothInImport Left = 104 Top = 144 end + inherited cxImageList_bar: TcxImageList + FormatVersion = 1 + end object DataSource3: TDataSource DataSet = CDS_Sub Left = 749 diff --git a/T02贸易汇总仓库/U_TradeSampleClothInImport.pas b/T02贸易汇总仓库/U_TradeSampleClothInImport.pas index 2ce8736..4a8d0b8 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInImport.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothInImport.pas @@ -9,26 +9,10 @@ uses cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxDateRanges, dxBarBuiltInMenu, U_BaseInput, - System.ImageList, Vcl.ImgList, ComObj, dxScrollbarAnnotations, - - - - - - - - - - - - - - - - cxContainer, dxCore, cxDateUtils, - cxMaskEdit; + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, + dxBarBuiltInMenu, U_BaseInput, System.ImageList, Vcl.ImgList, ComObj, + dxScrollbarAnnotations, cxContainer, dxCore, cxDateUtils, cxMaskEdit, + cxImageList; type TfrmTradeSampleClothInImport = class(TfrmBaseInput)