From b417e6f4c0cd238fcbf623002680cc2c42b82583 Mon Sep 17 00:00:00 2001 From: LZC <990351646@qq.com> Date: Wed, 19 Feb 2025 15:18:00 +0800 Subject: [PATCH] 123 --- A01基础公司管理/U_CustInput.dfm | 83 ++++++++------ A01基础公司管理/U_CustInput.pas | 26 +++++ A01基础公司管理/U_Customer.dfm | 15 ++- A01基础公司管理/U_Customer.pas | 2 +- A02基础产品管理/U_ClothInfo.dfm | 157 ++++++++++++++------------- A02基础产品管理/U_ClothInfo.pas | 8 +- A02基础产品管理/U_ClothInfoInput.dfm | 37 ++++++- A02基础产品管理/U_ClothInfoInput.pas | 29 +++++ A05基础资料管理/U_DataLink.pas | 3 +- A05基础资料管理/U_PositionInPut.dfm | 20 +++- A05基础资料管理/U_PositionInPut.pas | 4 +- A05基础资料管理/U_PositionList.dfm | 11 +- A05基础资料管理/U_PositionList.pas | 3 +- 13 files changed, 263 insertions(+), 135 deletions(-) diff --git a/A01基础公司管理/U_CustInput.dfm b/A01基础公司管理/U_CustInput.dfm index fbcafef..0419b64 100644 --- a/A01基础公司管理/U_CustInput.dfm +++ b/A01基础公司管理/U_CustInput.dfm @@ -69,39 +69,40 @@ inherited frmCustInput: TfrmCustInput TabOrder = 1 ExplicitTop = 31 object Label2: TLabel - Left = 17 + Left = 40 Top = 12 Width = 32 Height = 21 Caption = #32534#21495 end object Label6: TLabel - Left = 17 + Left = 40 Top = 49 Width = 32 Height = 21 Caption = #20840#31216 end object Label7: TLabel - Left = 17 + Left = 40 Top = 127 Width = 32 Height = 21 Caption = #22791#27880 end object Label1: TLabel - Left = 315 - Top = 10 + Left = 305 + Top = 7 Width = 32 Height = 21 Caption = #31616#31216 end object Label4: TLabel - Left = 17 - Top = 85 + Left = 416 + Top = 214 Width = 32 Height = 21 Caption = #21306#22495 + Visible = False end object Label8: TLabel Left = 949 @@ -112,21 +113,21 @@ inherited frmCustInput: TfrmCustInput Visible = False end object Label10: TLabel - Left = 605 + Left = 628 Top = 49 Width = 32 Height = 21 Caption = #31561#32423 end object Label3: TLabel - Left = 605 + Left = 628 Top = 12 Width = 32 Height = 21 Caption = #31867#22411 end object Label5: TLabel - Left = 870 + Left = 893 Top = 12 Width = 48 Height = 21 @@ -141,22 +142,22 @@ inherited frmCustInput: TfrmCustInput Visible = False end object Label11: TLabel - Left = 565 - Top = 85 + Left = 0 + Top = 87 Width = 71 Height = 21 Caption = #22320#21306'/'#22478#24066 end object Label12: TLabel - Left = 854 + Left = 877 Top = 48 Width = 64 Height = 21 Caption = #26376#32467#26041#24335 end object lbl2: TLabel - Left = 854 - Top = 83 + Left = 289 + Top = 89 Width = 64 Height = 21 Caption = #19994#21153#21592#65306 @@ -170,7 +171,7 @@ inherited frmCustInput: TfrmCustInput Visible = False end object Label13: TLabel - Left = 852 + Left = 875 Top = 128 Width = 80 Height = 21 @@ -178,21 +179,21 @@ inherited frmCustInput: TfrmCustInput end object CoName: TcxTextEdit Tag = 2 - Left = 55 - Top = 44 + Left = 78 + Top = 45 TabOrder = 1 - Width = 500 + Width = 488 end object CoAbbrName: TcxTextEdit Tag = 2 - Left = 353 + Left = 362 Top = 4 TabOrder = 2 Width = 200 end object CoCode: TcxTextEdit Tag = 2 - Left = 55 + Left = 78 Top = 6 Enabled = False TabOrder = 0 @@ -200,7 +201,7 @@ inherited frmCustInput: TfrmCustInput end object CoBusinessType: TcxButtonEdit Tag = 2 - Left = 645 + Left = 668 Top = 6 Hint = 'CoBusinessType/'#23458#25143#31867#22411 Properties.Buttons = < @@ -235,7 +236,7 @@ inherited frmCustInput: TfrmCustInput end object CoLevel: TcxComboBox Tag = 2 - Left = 644 + Left = 667 Top = 43 Properties.Items.Strings = ( 'A' @@ -247,7 +248,7 @@ inherited frmCustInput: TfrmCustInput end object ParentCoName: TcxButtonEdit Tag = 2 - Left = 927 + Left = 950 Top = 7 Hint = 'CoBusinessType/'#23458#25143#31867#22411 Properties.Buttons = < @@ -264,7 +265,7 @@ inherited frmCustInput: TfrmCustInput end object CoNote: TcxMemo Tag = 2 - Left = 55 + Left = 78 Top = 127 TabOrder = 7 Height = 77 @@ -290,8 +291,8 @@ inherited frmCustInput: TfrmCustInput end object Coarea: TcxButtonEdit Tag = 2 - Left = 643 - Top = 78 + Left = 78 + Top = 87 Hint = 'Coarea/'#22320#21306 Properties.Buttons = < item @@ -308,7 +309,7 @@ inherited frmCustInput: TfrmCustInput end object PayMentMonth: TcxComboBox Tag = 2 - Left = 927 + Left = 950 Top = 44 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -322,8 +323,8 @@ inherited frmCustInput: TfrmCustInput end object Saleser: TcxButtonEdit Tag = 2 - Left = 927 - Top = 80 + Left = 362 + Top = 86 Properties.Buttons = < item Default = True @@ -346,14 +347,14 @@ inherited frmCustInput: TfrmCustInput end object AMOUNTOWED: TcxTextEdit Tag = 2 - Left = 926 + Left = 949 Top = 125 TabOrder = 13 Width = 125 end object area: TcxMRUEdit - Left = 55 - Top = 86 + Left = 455 + Top = 216 Hint = 'area/'#21306#22495 ParentFont = False Properties.ImmediatePost = True @@ -366,6 +367,7 @@ inherited frmCustInput: TfrmCustInput Style.Font.Style = [] Style.IsFontAssigned = True TabOrder = 14 + Visible = False Width = 501 end end @@ -435,7 +437,6 @@ inherited frmCustInput: TfrmCustInput Align = alClient BorderStyle = cxcbsNone TabOrder = 1 - ExplicitTop = 32 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -521,6 +522,20 @@ inherited frmCustInput: TfrmCustInput HeaderAlignmentHorz = taCenter Width = 186 end + object TV2Column3: TcxGridDBColumn + Caption = #21306#22495 + DataBinding.FieldName = 'mxarea' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = TV2Column3PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 73 + end end object cxGridLevel2: TcxGridLevel GridView = TV2 diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas index d9826a2..6e743ec 100644 --- a/A01基础公司管理/U_CustInput.pas +++ b/A01基础公司管理/U_CustInput.pas @@ -87,6 +87,7 @@ type Label13: TLabel; AMOUNTOWED: TcxTextEdit; area: TcxMRUEdit; + TV2Column3: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -105,6 +106,7 @@ type procedure ToolButton8Click(Sender: TObject); procedure ToolButton4Click(Sender: TObject); procedure areaPropertiesButtonClick(Sender: TObject); + procedure TV2Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private { Private declarations } procedure InitGrid(); @@ -712,6 +714,30 @@ begin ClientDataSet1.Delete; end; +procedure TfrmCustInput.TV2Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := 'Cust'; + flag := 'AREA'; + flagname := ''; + if ShowModal = 1 then + begin + with CDS_LXR do + begin + Edit; + FieldByName('mxAREA').AsString := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + end; + + end; + end; + finally + frmZDYHelp.Free; + end; +end; + procedure TfrmCustInput.ToolButton1Click(Sender: TObject); begin WriteCxGrid(trim(self.caption) + 'Tv2', Tv2, 'ͻ'); diff --git a/A01基础公司管理/U_Customer.dfm b/A01基础公司管理/U_Customer.dfm index 2d679f8..b74d663 100644 --- a/A01基础公司管理/U_Customer.dfm +++ b/A01基础公司管理/U_Customer.dfm @@ -313,14 +313,6 @@ inherited frmCustomer: TfrmCustomer Options.Editing = False Width = 163 end - object v2Column3: TcxGridDBColumn - Caption = #21306#22495 - DataBinding.FieldName = 'area' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end object Tv1Column2: TcxGridDBColumn Caption = #23458#25143#31561#32423 DataBinding.FieldName = 'CoLevel' @@ -508,6 +500,13 @@ inherited frmCustomer: TfrmCustomer HeaderAlignmentHorz = taCenter Width = 77 end + object Tv2Column3: TcxGridDBColumn + Caption = #21306#22495 + DataBinding.FieldName = 'mxarea' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 74 + end end object cxGridLevel2: TcxGridLevel GridView = Tv2 diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas index e5fdf51..abafa4e 100644 --- a/A01基础公司管理/U_Customer.pas +++ b/A01基础公司管理/U_Customer.pas @@ -55,7 +55,6 @@ type CDS_2: TClientDataSet; DS_2: TDataSource; btnSaleser: TToolButton; - v2Column3: TcxGridDBColumn; OpenDialog1: TOpenDialog; Tv1Column3: TcxGridDBColumn; Tv1Column4: TcxGridDBColumn; @@ -98,6 +97,7 @@ type cxGridDBColumn6: TcxGridDBColumn; cxGridLevel3: TcxGridLevel; Tv2Column2: TcxGridDBColumn; + Tv2Column3: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index e528d24..9d2cf9b 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -10,6 +10,7 @@ inherited frmClothInfo: TfrmClothInfo FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitTop = -87 ExplicitWidth = 1556 ExplicitHeight = 884 PixelsPerInch = 96 @@ -524,99 +525,40 @@ inherited frmClothInfo: TfrmClothInfo Caption = 'Panel9' TabOrder = 0 object GroupBox1: TGroupBox - Left = 606 + Left = 1 Top = 1 - Width = 699 + Width = 1304 Height = 201 Align = alClient Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289 TabOrder = 0 + ExplicitLeft = 606 + ExplicitWidth = 699 object ScrollBox1: TScrollBox Left = 2 Top = 23 - Width = 695 + Width = 1300 Height = 176 Align = alClient BevelInner = bvLowered BorderStyle = bsNone TabOrder = 0 - end - end - object cxGrid2: TcxGrid - Left = 1 - Top = 1 - Width = 605 - Height = 201 - Align = alLeft - TabOrder = 1 - object Tv2: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_2 - DataController.Filter.AutoDataSetFilter = True - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] - DataController.Summary.DefaultGroupSummaryItems = < - item - Format = 'C_Code' - end> - DataController.Summary.FooterSummaryItems = < - item - Kind = skSum - end> - DataController.Summary.SummaryGroups = <> - OptionsBehavior.FocusCellOnTab = True - OptionsBehavior.GoToNextCellOnEnter = True - OptionsBehavior.FocusCellOnCycle = True - OptionsCustomize.ColumnFiltering = False - OptionsView.Footer = True - OptionsView.GroupByBox = False - object cxGridDBColumn1: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 150 - end - object cxGridDBColumn2: TcxGridDBColumn - Caption = #33394#21495 - DataBinding.FieldName = 'C_ColorNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 150 - end - object cxGridDBColumn3: TcxGridDBColumn - Caption = #33457#22411 - DataBinding.FieldName = 'C_Pattern' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 150 - end - object cxGridDBColumn4: TcxGridDBColumn - Caption = #27454#21495 - DataBinding.FieldName = 'C_StyleNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 150 - end - end - object cxGridLevel2: TcxGridLevel - GridView = Tv2 + ExplicitWidth = 695 end end end end object cxGrid1: TcxGrid - Left = 2 + Left = 10 Top = 42 - Width = 1308 + Width = 1088 Height = 451 Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitLeft = 2 + ExplicitTop = 43 + ExplicitWidth = 1104 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -667,8 +609,9 @@ inherited frmClothInfo: TfrmClothInfo Width = 119 end object Tv1Column24: TcxGridDBColumn - Caption = #33521#25991#21697#21517 - DataBinding.FieldName = 'C_EName' + AlternateCaption = 'qtyunit' + Caption = #21333#20301 + DataBinding.FieldName = 'qtyunit' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -850,6 +793,75 @@ inherited frmClothInfo: TfrmClothInfo GridView = Tv1 end end + object cxGrid2: TcxGrid + Left = 1106 + Top = 42 + Width = 204 + Height = 451 + Align = alRight + TabOrder = 3 + ExplicitLeft = 1107 + ExplicitTop = 43 + object Tv2: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_2 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = < + item + Format = 'C_Code' + end> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end> + DataController.Summary.SummaryGroups = <> + OptionsBehavior.FocusCellOnTab = True + OptionsBehavior.GoToNextCellOnEnter = True + OptionsBehavior.FocusCellOnCycle = True + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + object cxGridDBColumn1: TcxGridDBColumn + Caption = #39068#33394 + DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 105 + end + object cxGridDBColumn2: TcxGridDBColumn + Caption = #33394#21495 + DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 92 + end + end + object cxGridLevel2: TcxGridLevel + GridView = Tv2 + end + end + object cxSplitter2: TcxSplitter + Left = 2 + Top = 42 + Width = 8 + Height = 451 + HotZoneClassName = 'TcxMediaPlayer9Style' + end + object cxSplitter3: TcxSplitter + Left = 1098 + Top = 42 + Width = 8 + Height = 451 + AlignSplitter = salRight + Control = cxGrid2 + ExplicitLeft = 588 + ExplicitTop = 380 + ExplicitHeight = 100 + end end inherited loadProcess: TPanel Left = 886 @@ -1025,7 +1037,6 @@ inherited frmClothInfo: TfrmClothInfo Top = 392 end object GPM_2: TcxGridPopupMenu - Grid = cxGrid2 PopupMenus = <> Left = 554 Top = 540 diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 3976af2..145798a 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -143,14 +143,14 @@ type Tv1Column21: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; DS_2: TDataSource; + ADO_2: TADOQuery; cxGrid2: TcxGrid; Tv2: TcxGridDBTableView; cxGridDBColumn1: TcxGridDBColumn; cxGridDBColumn2: TcxGridDBColumn; - cxGridDBColumn3: TcxGridDBColumn; - cxGridDBColumn4: TcxGridDBColumn; cxGridLevel2: TcxGridLevel; - ADO_2: TADOQuery; + cxSplitter2: TcxSplitter; + cxSplitter3: TcxSplitter; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBDelClick(Sender: TObject); @@ -224,6 +224,8 @@ begin SqlStr := 'select * from BS_Cloth_Info_Sub A where BCIID =' + quotedstr((CDS_1.fieldbyname('BCIID').AsString)); + SqlStr := SqlStr + 'order by dbo.getNum( C_ColorNo) '; + InitAdoData(ADO_2, Tv1, SqlStr, '', ''); end; diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 891dbe6..ba1447c 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -75,6 +75,7 @@ object frmClothInfoInput: TfrmClothInfoInput Ctl3D = False ParentCtl3D = False TabOrder = 1 + ExplicitTop = 31 object Label1: TLabel Left = 37 Top = 18 @@ -135,7 +136,7 @@ object frmClothInfoInput: TfrmClothInfoInput end object Label9: TLabel Left = 39 - Top = 287 + Top = 322 Width = 32 Height = 21 Caption = #22791#27880 @@ -172,7 +173,7 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = #24037#33402 end object Label18: TLabel - Left = 37 + Left = 39 Top = 210 Width = 80 Height = 21 @@ -201,8 +202,8 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = #26579#33394#26041#24335 end object Label2: TLabel - Left = 37 - Top = 249 + Left = 39 + Top = 246 Width = 64 Height = 21 Caption = #26631#20934#25253#20215 @@ -251,6 +252,13 @@ object frmClothInfoInput: TfrmClothInfoInput Caption = #21697#21517'2' Visible = False end + object Label25: TLabel + Left = 39 + Top = 281 + Width = 32 + Height = 21 + Caption = #21333#20301 + end object C_Code: TcxTextEdit Tag = 2 Left = 119 @@ -382,7 +390,7 @@ object frmClothInfoInput: TfrmClothInfoInput object CINote: TcxMemo Tag = 2 Left = 119 - Top = 283 + Top = 318 TabOrder = 9 Height = 57 Width = 622 @@ -525,6 +533,23 @@ object frmClothInfoInput: TfrmClothInfoInput TabOrder = 22 Width = 233 end + object qtyunit: TcxMRUEdit + Left = 120 + Top = 282 + Hint = 'qtyunit/'#25968#37327#21333#20301 + ParentFont = False + Properties.ImmediatePost = True + Properties.ReadOnly = False + Properties.OnButtonClick = StkPositionPropertiesButtonClick + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] + Style.IsFontAssigned = True + TabOrder = 23 + Width = 233 + end end object Panel1: TPanel Left = 751 @@ -571,6 +596,8 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 461 Align = alClient TabOrder = 1 + ExplicitLeft = 2 + ExplicitTop = 32 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index cee2603..23274e2 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -85,6 +85,8 @@ type TV1Column3: TcxGridDBColumn; TV1Column4: TcxGridDBColumn; StkPosition: TcxMRUEdit; + Label25: TLabel; + qtyunit: TcxMRUEdit; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); @@ -163,6 +165,7 @@ begin sql.Clear; sql.Add('select A.* from BS_Cloth_Info_Sub A '); sql.Add(' where A.BCIID=''' + Trim(FBCIID) + ''''); + sql.Add('order by dbo.getNum( C_ColorNo)'); Open; end; SCreateCDS(ADOQueryTemp, CDS_1); @@ -182,6 +185,7 @@ begin SCSHData(ADOQueryTemp, ScrollBox1, 2); StkPosition.Text := ADOQueryTemp.FieldByName('StkPosition').AsString; + qtyunit.Text := ADOQueryTemp.FieldByName('qtyunit').AsString; // SCSHData(ADOQueryTemp, ScrollBox1, 0); C_FromName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); // C_FromName.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName').AsString); // @@ -304,6 +308,29 @@ begin StkPosition.ItemIndex := -1; end; + + with ADOQueryTemp do + begin + close; + sql.Clear; + sql.Add('select * from KH_ZDY where type=''qtyunit'''); + + Open; + if isEmpty then + begin + exit; + end; + qtyunit.Properties.LookupItems.Clear; + while not Eof do + begin + + qtyunit.Properties.LookupItems.Add(Trim(fieldByName('zdyName').AsString)); + Next; + end; + + qtyunit.ItemIndex := -1; + end; + InitGrid1(); InitGrid(); @@ -386,6 +413,8 @@ begin FieldByName('BCIID').Value := Trim(MaxBCIID); FieldByName('StkPosition').Value := Trim(StkPosition.text); + FieldByName('QTYUNIT').Value := Trim(QTYUNIT.text); + if trim(C_Code.Text) = '' then C_Code.Text := Trim(MaxBCIID); RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', ScrollBox1, 2); diff --git a/A05基础资料管理/U_DataLink.pas b/A05基础资料管理/U_DataLink.pas index f5ae9cb..c25e7d2 100644 --- a/A05基础资料管理/U_DataLink.pas +++ b/A05基础资料管理/U_DataLink.pas @@ -6,7 +6,8 @@ uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, System.ImageList, U_BaseDataLink, dxCore, cxLocalization, dxLayoutLookAndFeels, - cxImageList, cxGraphics, cxEdit, cxContainer, dxSkinsForm; + cxImageList, cxGraphics, cxEdit, cxContainer, dxSkinsForm, dxSkinsCore, + dxSkinsDefaultPainters; type TMyThread = class(TThread) diff --git a/A05基础资料管理/U_PositionInPut.dfm b/A05基础资料管理/U_PositionInPut.dfm index fc97c50..a7e9ab5 100644 --- a/A05基础资料管理/U_PositionInPut.dfm +++ b/A05基础资料管理/U_PositionInPut.dfm @@ -18,6 +18,7 @@ inherited frmPositionInPut: TfrmPositionInPut Height = 254 Align = alClient TabOrder = 0 + ExplicitTop = 80 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -56,6 +57,13 @@ inherited frmPositionInPut: TfrmPositionInPut HeaderAlignmentHorz = taCenter Width = 216 end + object Tv1Column2: TcxGridDBColumn + Caption = #36890#36947 + DataBinding.FieldName = 'entrance' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 81 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -69,7 +77,7 @@ inherited frmPositionInPut: TfrmPositionInPut Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' Images = DataLink_BaseInfo.cxImageList_bar List = True @@ -84,7 +92,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = TBSaveClick end object TBAdd: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #26032#22686 @@ -92,7 +100,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = TBAddClick end object ToolButton2: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #23548#20837 @@ -100,7 +108,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = ToolButton2Click end object TBDel: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #21024#38500 @@ -108,7 +116,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = TBDelClick end object ToolButton1: TToolButton - Left = 252 + Left = 284 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -116,7 +124,7 @@ inherited frmPositionInPut: TfrmPositionInPut OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 339 + Left = 387 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/A05基础资料管理/U_PositionInPut.pas b/A05基础资料管理/U_PositionInPut.pas index b8d5c38..7e0070f 100644 --- a/A05基础资料管理/U_PositionInPut.pas +++ b/A05基础资料管理/U_PositionInPut.pas @@ -11,7 +11,8 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, StrUtils, U_BaseInput, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxScrollbarAnnotations, cxContainer, dxBarBuiltInMenu, - System.ImageList, Vcl.ImgList, cxImageList, System.Win.ComObj; + System.ImageList, Vcl.ImgList, cxImageList, System.Win.ComObj, dxSkinsCore, + dxSkinsDefaultPainters; type TfrmPositionInPut = class(TfrmBaseInput) @@ -44,6 +45,7 @@ type CDS_LM: TClientDataSet; OpenDialog1: TOpenDialog; ToolButton2: TToolButton; + Tv1Column2: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/A05基础资料管理/U_PositionList.dfm b/A05基础资料管理/U_PositionList.dfm index 63a443b..2b0dbda 100644 --- a/A05基础资料管理/U_PositionList.dfm +++ b/A05基础资料管理/U_PositionList.dfm @@ -158,6 +158,13 @@ inherited frmPositionList: TfrmPositionList Options.Editing = False Width = 180 end + object Tv2Column1: TcxGridDBColumn + Caption = #36890#36947 + DataBinding.FieldName = 'entrance' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 96 + end end object cxGridLevel1: TcxGridLevel GridView = Tv2 @@ -205,8 +212,8 @@ inherited frmPositionList: TfrmPositionList end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_BaseInfo.ADOLink - Left = 417 - Top = 104 + Left = 415 + Top = 147 end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_BaseInfo.ADOLink diff --git a/A05基础资料管理/U_PositionList.pas b/A05基础资料管理/U_PositionList.pas index eea8375..f46ba8d 100644 --- a/A05基础资料管理/U_PositionList.pas +++ b/A05基础资料管理/U_PositionList.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, RM_BarCode, dxScrollbarAnnotations, cxContainer, - cxProgressBar; + cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters; type TfrmPositionList = class(TfrmBaseList) @@ -51,6 +51,7 @@ type v2Column1: TcxGridDBColumn; ToolButton6: TToolButton; RMBarCodeObject1: TRMBarCodeObject; + Tv2Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject);