From 554f3380043a206e7ad92205efcd5f776a97f473 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 27 Jun 2025 17:30:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- A00通用方法/U_ProgressUpdate.pas | 61 + A01基础公司管理/U_CustInput.dfm | 220 ++-- A01基础公司管理/U_CustInput.pas | 42 +- A02基础产品管理/U_ClothInfo.dfm | 41 +- A02基础产品管理/U_ClothInfo.pas | 1 - A02基础产品管理/U_ClothInfoInput.dfm | 10 +- T02贸易汇总仓库/U_ItemizedListInPut.dfm | 22 +- T02贸易汇总仓库/U_ItemizedListInPut.pas | 38 +- T02贸易汇总仓库/U_ItemizedListList.dfm | 29 +- T02贸易汇总仓库/U_ItemizedListList.pas | 33 +- T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm | 2 - T02贸易汇总仓库/U_ItemizedListQtyInPut.pas | 21 +- T02贸易汇总仓库/U_TradeClothTotalInList.pas | 2 + T02贸易汇总仓库/U_TradeClothTotalOutList.dfm | 6 +- T02贸易汇总仓库/U_TradeClothTotalOutList.pas | 4 +- T03贸易布匹检验/DjdMachineInsp.dpr | 3 +- T03贸易布匹检验/DjdMachineInsp.dproj | 1 + T03贸易布匹检验/U_MachRollMain.dfm | 1243 ++++++------------ T03贸易布匹检验/U_MachRollMain.pas | 216 +-- T05贸易门市管理/TradeMarket.dpr | 3 +- T05贸易门市管理/TradeMarket.dproj | 1 + T05贸易门市管理/U_TradeMarketInPut.dfm | 74 +- T05贸易门市管理/U_TradeMarketInPut.pas | 11 +- T05贸易门市管理/U_TradeMarketList.dfm | 98 +- T05贸易门市管理/U_TradeMarketList.pas | 45 +- 25 files changed, 1065 insertions(+), 1162 deletions(-) create mode 100644 A00通用方法/U_ProgressUpdate.pas diff --git a/A00通用方法/U_ProgressUpdate.pas b/A00通用方法/U_ProgressUpdate.pas new file mode 100644 index 0000000..88290aa --- /dev/null +++ b/A00通用方法/U_ProgressUpdate.pas @@ -0,0 +1,61 @@ +unit U_ProgressUpdate; + +interface + +uses + System.SysUtils, ADODB; + +function TradeMarketProgressUpdate(AdoCmd: TADOQuery; MTMSIdS: string): Boolean; + +function TradeMarketProgressUpdateByTMMID(AdoCmd: TADOQuery; MTMMID: string): Boolean; + +implementation + +function TradeMarketProgressUpdate(AdoCmd: TADOQuery; MTMSIdS: string): Boolean; +begin + with AdoCmd do + begin + close; + sql.Clear; + sql.Add('exec P_Trade_Market_UpOut'); + sql.Add('@TMSIdS=' + quotedstr(Trim(MTMSIdS))); + Open; + end; + Result := True; +end; + +function TradeMarketProgressUpdateByTMMID(AdoCmd: TADOQuery; MTMMID: string): Boolean; +var + MTMSIdS: string; +begin + with AdoCmd do + begin + close; + sql.Clear; + sql.Add('select distinct TMSId from Trade_Market_sub A '); + sql.Add('where EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(Trim(MTMMID)) + ','','') X where X.RTValue=A.TMSId ) '); + Open; + while not Eof do + begin + if Trim(MTMSIdS) = '' then + MTMSIdS := FieldByName('TMSId').AsString + else + MTMSIdS := MTMSIdS + ',' + FieldByName('TMSId').AsString; + end; + end; + + with AdoCmd do + begin + close; + sql.Clear; + sql.Add('exec P_Trade_Market_UpOut'); + sql.Add('@TMSIdS=' + quotedstr(Trim(MTMSIdS))); + Open; + end; + + Result := True; + +end; + +end. + diff --git a/A01基础公司管理/U_CustInput.dfm b/A01基础公司管理/U_CustInput.dfm index 1e68fdc..38b33ad 100644 --- a/A01基础公司管理/U_CustInput.dfm +++ b/A01基础公司管理/U_CustInput.dfm @@ -59,7 +59,7 @@ inherited frmCustInput: TfrmCustInput Left = 0 Top = 30 Width = 1540 - Height = 255 + Height = 211 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -67,45 +67,44 @@ inherited frmCustInput: TfrmCustInput Ctl3D = False ParentCtl3D = False TabOrder = 1 - ExplicitTop = 26 object Label2: TLabel - Left = 40 + Left = 48 Top = 12 Width = 32 Height = 21 Caption = #32534#21495 end object Label6: TLabel - Left = 40 + Left = 48 Top = 49 Width = 32 Height = 21 Caption = #20840#31216 end object Label7: TLabel - Left = 40 + Left = 48 Top = 127 Width = 32 Height = 21 Caption = #22791#27880 end object Label1: TLabel - Left = 305 - Top = 7 + Left = 332 + Top = 11 Width = 32 Height = 21 Caption = #31616#31216 end object Label4: TLabel - Left = 416 - Top = 214 + Left = 1240 + Top = 310 Width = 32 Height = 21 Caption = #21306#22495 Visible = False end object Label8: TLabel - Left = 949 + Left = 1277 Top = 180 Width = 32 Height = 21 @@ -134,7 +133,7 @@ inherited frmCustInput: TfrmCustInput Caption = #21697#29260#21830 end object Label9: TLabel - Left = 915 + Left = 1243 Top = 196 Width = 16 Height = 21 @@ -142,7 +141,7 @@ inherited frmCustInput: TfrmCustInput Visible = False end object Label11: TLabel - Left = 0 + Left = 8 Top = 90 Width = 71 Height = 21 @@ -150,20 +149,20 @@ inherited frmCustInput: TfrmCustInput end object Label12: TLabel Left = 877 - Top = 48 + Top = 49 Width = 64 Height = 21 Caption = #26376#32467#26041#24335 end object lbl2: TLabel - Left = 289 - Top = 90 - Width = 64 + Left = 316 + Top = 89 + Width = 48 Height = 21 - Caption = #19994#21153#21592#65306 + Caption = #19994#21153#21592 end object lblSalesId: TLabel - Left = 921 + Left = 1249 Top = 250 Width = 80 Height = 21 @@ -171,21 +170,21 @@ inherited frmCustInput: TfrmCustInput Visible = False end object Label13: TLabel - Left = 875 + Left = 877 Top = 128 - Width = 80 + Width = 64 Height = 21 - Caption = #27424#27454#39069#24230#65306 + Caption = #27424#27454#39069#24230 end object Label14: TLabel - Left = 598 + Left = 596 Top = 90 Width = 64 Height = 21 Caption = #22810#20154#31614#25910 end object Label15: TLabel - Left = 878 + Left = 877 Top = 90 Width = 64 Height = 21 @@ -193,22 +192,22 @@ inherited frmCustInput: TfrmCustInput end object CoName: TcxTextEdit Tag = 2 - Left = 78 + Left = 86 Top = 45 TabOrder = 1 - Width = 488 + Width = 484 end object CoAbbrName: TcxTextEdit Tag = 2 - Left = 362 - Top = 4 + Left = 370 + Top = 8 TabOrder = 2 Width = 200 end object CoCode: TcxTextEdit Tag = 2 - Left = 78 - Top = 6 + Left = 86 + Top = 8 Enabled = False TabOrder = 0 Width = 200 @@ -216,7 +215,7 @@ inherited frmCustInput: TfrmCustInput object CoBusinessType: TcxButtonEdit Tag = 2 Left = 668 - Top = 6 + Top = 8 Hint = 'CoBusinessType/'#23458#25143#31867#22411 Properties.Buttons = < item @@ -232,7 +231,7 @@ inherited frmCustInput: TfrmCustInput end object cocountry: TcxButtonEdit Tag = 2 - Left = 987 + Left = 1315 Top = 173 Hint = 'CoCountry/'#22269#23478 Properties.Buttons = < @@ -250,8 +249,8 @@ inherited frmCustInput: TfrmCustInput end object CoLevel: TcxComboBox Tag = 2 - Left = 667 - Top = 43 + Left = 668 + Top = 45 Properties.Items.Strings = ( 'A' 'B' @@ -263,7 +262,7 @@ inherited frmCustInput: TfrmCustInput object ParentCoName: TcxButtonEdit Tag = 2 Left = 950 - Top = 7 + Top = 8 Hint = 'CoBusinessType/'#23458#25143#31867#22411 Properties.Buttons = < item @@ -279,7 +278,7 @@ inherited frmCustInput: TfrmCustInput end object CoNote: TcxMemo Tag = 2 - Left = 78 + Left = 86 Top = 127 TabOrder = 7 Height = 77 @@ -287,7 +286,7 @@ inherited frmCustInput: TfrmCustInput end object Continent: TcxButtonEdit Tag = 2 - Left = 935 + Left = 1263 Top = 208 Hint = 'Continent/'#27954 Properties.Buttons = < @@ -305,8 +304,8 @@ inherited frmCustInput: TfrmCustInput end object Coarea: TcxButtonEdit Tag = 2 - Left = 78 - Top = 84 + Left = 86 + Top = 86 Hint = 'Coarea/'#22320#21306 Properties.Buttons = < item @@ -324,7 +323,7 @@ inherited frmCustInput: TfrmCustInput object PayMentMonth: TcxComboBox Tag = 2 Left = 950 - Top = 44 + Top = 45 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( '' @@ -337,8 +336,8 @@ inherited frmCustInput: TfrmCustInput end object Saleser: TcxButtonEdit Tag = 2 - Left = 362 - Top = 84 + Left = 370 + Top = 86 Properties.Buttons = < item Default = True @@ -353,7 +352,7 @@ inherited frmCustInput: TfrmCustInput end object SalesId: TcxTextEdit Tag = 2 - Left = 1002 + Left = 1330 Top = 247 TabOrder = 12 Visible = False @@ -361,14 +360,14 @@ inherited frmCustInput: TfrmCustInput end object AMOUNTOWED: TcxTextEdit Tag = 2 - Left = 949 + Left = 950 Top = 125 TabOrder = 13 Width = 125 end object area: TcxMRUEdit - Left = 455 - Top = 216 + Left = 1278 + Top = 310 Hint = 'area/'#21306#22495 ParentFont = False Properties.ImmediatePost = True @@ -382,12 +381,12 @@ inherited frmCustInput: TfrmCustInput Style.IsFontAssigned = True TabOrder = 14 Visible = False - Width = 501 + Width = 185 end object MoreFlag: TcxComboBox Tag = 2 Left = 668 - Top = 84 + Top = 86 Properties.Items.Strings = ( #26159 #21542) @@ -397,8 +396,8 @@ inherited frmCustInput: TfrmCustInput end object SealFlag: TcxComboBox Tag = 2 - Left = 951 - Top = 84 + Left = 950 + Top = 86 Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( #26159 @@ -410,20 +409,23 @@ inherited frmCustInput: TfrmCustInput end object Panel1: TPanel [2] Left = 0 - Top = 285 + Top = 241 Width = 1540 - Height = 388 + Height = 432 Align = alClient Caption = 'Panel1' TabOrder = 2 + ExplicitTop = 285 + ExplicitHeight = 388 object Panel3: TPanel Left = 1 Top = 1 Width = 1078 - Height = 386 + Height = 430 Align = alClient Caption = 'Panel1' TabOrder = 0 + ExplicitHeight = 386 object ToolBar3: TToolBar Tag = 1 Left = 1 @@ -470,10 +472,11 @@ inherited frmCustInput: TfrmCustInput Left = 1 Top = 31 Width = 1076 - Height = 354 + Height = 398 Align = alClient BorderStyle = cxcbsNone TabOrder = 1 + ExplicitHeight = 354 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -514,13 +517,6 @@ inherited frmCustInput: TfrmCustInput HeaderAlignmentHorz = taCenter Width = 77 end - object cxGridDBColumn5: TcxGridDBColumn - Caption = #32844#20301 - DataBinding.FieldName = 'position' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end object cxGridDBColumn6: TcxGridDBColumn Caption = #32852#31995#30005#35805 DataBinding.FieldName = 'Telephone' @@ -528,7 +524,7 @@ inherited frmCustInput: TfrmCustInput PropertiesClassName = 'TcxTextEditProperties' Properties.CharCase = ecUpperCase HeaderAlignmentHorz = taCenter - Width = 86 + Width = 100 end object cxGridDBColumn7: TcxGridDBColumn Caption = #25163#26426#21495 @@ -539,6 +535,34 @@ inherited frmCustInput: TfrmCustInput HeaderAlignmentHorz = taCenter Width = 109 end + object TV2Column1: TcxGridDBColumn + Caption = #22320#22336 + DataBinding.FieldName = 'mxaddress' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 128 + 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 = 88 + end + object cxGridDBColumn5: TcxGridDBColumn + Caption = #32844#20301 + DataBinding.FieldName = 'position' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end object cxGridDBColumn8: TcxGridDBColumn DataBinding.FieldName = 'EMAIL' DataBinding.IsNullValueType = True @@ -552,27 +576,6 @@ inherited frmCustInput: TfrmCustInput HeaderAlignmentHorz = taCenter Width = 66 end - object TV2Column1: TcxGridDBColumn - Caption = #22320#22336 - DataBinding.FieldName = 'mxaddress' - DataBinding.IsNullValueType = True - 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 @@ -583,18 +586,20 @@ inherited frmCustInput: TfrmCustInput Left = 1079 Top = 1 Width = 460 - Height = 386 + Height = 430 Align = alRight Caption = 'Panel1' TabOrder = 1 + ExplicitHeight = 386 object cxGrid1: TcxGrid Left = 1 Top = 31 Width = 458 - Height = 354 + Height = 398 Align = alClient BorderStyle = cxcbsNone TabOrder = 0 + ExplicitHeight = 354 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -670,66 +675,69 @@ inherited frmCustInput: TfrmCustInput end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_Company.ADOLink - Left = 828 - Top = 405 + Left = 592 + Top = 260 end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_Company.ADOLink - Left = 763 - Top = 377 + Left = 674 + Top = 260 end inherited ImageList_new32: TImageList - Left = 551 - Top = 433 + Left = 674 + Top = 384 end inherited cxImageList_bar: TcxImageList FormatVersion = 1 + Left = 838 + Top = 322 + DesignInfo = 21103430 end object ADOQueryTemp: TADOQuery Connection = DataLink_Company.ADOLink LockType = ltReadOnly Parameters = <> - Left = 963 - Top = 344 + Left = 920 + Top = 260 end object ADOQueryCmd: TADOQuery Connection = DataLink_Company.ADOLink Parameters = <> - Left = 1055 - Top = 387 + Left = 756 + Top = 260 end object ADOQueryMain: TADOQuery Connection = DataLink_Company.ADOLink LockType = ltReadOnly Parameters = <> - Left = 872 - Top = 312 + Left = 838 + Top = 260 end object cxGridPopupMenu2: TcxGridPopupMenu PopupMenus = <> - Left = 294 - Top = 502 + Left = 756 + Top = 322 end object CDS_LXR: TClientDataSet Aggregates = <> Params = <> - Left = 377 - Top = 503 + Left = 592 + Top = 322 end object DSLXR: TDataSource DataSet = CDS_LXR - Left = 464 - Top = 511 + Left = 592 + Top = 384 end object ClientDataSet1: TClientDataSet Aggregates = <> Params = <> - Left = 774 - Top = 469 + Left = 674 + Top = 322 end object DataSource1: TDataSource DataSet = ClientDataSet1 - Left = 909 - Top = 461 + Left = 920 + Top = 322 end end diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas index 25aad38..949f95f 100644 --- a/A01基础公司管理/U_CustInput.pas +++ b/A01基础公司管理/U_CustInput.pas @@ -227,7 +227,9 @@ begin frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - MainType := 'Cust'; fnote:=True; V1Note.caption := ''; + MainType := 'Cust'; + fnote := True; + V1Note.caption := ''; flag := Copy(fsj, 1, FWZ - 1); flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); if ShowModal = 1 then @@ -616,9 +618,45 @@ begin end; if Trim(CoName.Text) = '' then begin - Application.MessageBox('ƲΪ!', 'ʾ', 0); + Application.MessageBox('ȫƲΪ!', 'ʾ', 0); Exit; end; + + with CDS_LXR do + begin + DisableControls; + while not Eof do + begin + if Trim(FieldByName('Contacts').AsString) = '' then + begin + Application.MessageBox('ϵ˲Ϊ!', 'ʾ', 0); + Exit; + end; + if Trim(FieldByName('PhoneNumber').AsString) = '' then + begin + Application.MessageBox('ֻŲΪ!', 'ʾ', 0); + Exit; + end; + if Trim(FieldByName('Telephone').AsString) = '' then + begin + Application.MessageBox('ϵ绰Ϊ!', 'ʾ', 0); + Exit; + end; + if Trim(FieldByName('mxaddress').AsString) = '' then + begin + Application.MessageBox('ַΪ!', 'ʾ', 0); + Exit; + end; + if Trim(FieldByName('mxarea').AsString) = '' then + begin + Application.MessageBox('Ϊ!', 'ʾ', 0); + Exit; + end; + Next; + end; + EnableControls; + end; + if SaveData() then begin Application.MessageBox('ɹ!', 'ʾ', 0); diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index eabf76e..2e04d49 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -2,7 +2,7 @@ inherited frmClothInfo: TfrmClothInfo Left = 117 Top = 154 Caption = #20135#21697#26723#26696 - ClientHeight = 581 + ClientHeight = 808 ClientWidth = 1540 Color = clBtnFace Font.Charset = ANSI_CHARSET @@ -11,7 +11,7 @@ inherited frmClothInfo: TfrmClothInfo Position = poScreenCenter Visible = True ExplicitWidth = 1556 - ExplicitHeight = 620 + ExplicitHeight = 847 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -162,9 +162,10 @@ inherited frmClothInfo: TfrmClothInfo Left = 220 Top = 75 Width = 8 - Height = 506 + Height = 733 HotZoneClassName = 'TcxMediaPlayer9Style' Control = Panel5 + ExplicitHeight = 506 end object Panel1: TPanel [2] Left = 0 @@ -265,16 +266,17 @@ inherited frmClothInfo: TfrmClothInfo Left = 0 Top = 75 Width = 220 - Height = 506 + Height = 733 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 2 + ExplicitHeight = 506 object cxDBTreeList1: TcxDBTreeList Left = 2 Top = 2 Width = 216 - Height = 502 + Height = 729 Align = alClient Bands = < item @@ -292,6 +294,7 @@ inherited frmClothInfo: TfrmClothInfo ScrollbarAnnotations.CustomAnnotations = <> TabOrder = 0 OnDblClick = cxDBTreeList1DblClick + ExplicitHeight = 502 object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn DataBinding.FieldName = 'CTName' Width = 210 @@ -307,12 +310,13 @@ inherited frmClothInfo: TfrmClothInfo Left = 228 Top = 75 Width = 1108 - Height = 506 + Height = 733 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Panel3' TabOrder = 4 + ExplicitHeight = 506 object Panel7: TPanel Left = 2 Top = 2 @@ -397,12 +401,13 @@ inherited frmClothInfo: TfrmClothInfo end object Panel9: TPanel Left = 2 - Top = 299 + Top = 526 Width = 1104 Height = 205 Align = alBottom Caption = 'Panel9' TabOrder = 1 + ExplicitTop = 299 object Panel10: TPanel Left = 1 Top = 1 @@ -433,13 +438,16 @@ inherited frmClothInfo: TfrmClothInfo end end object cxGrid1: TcxGrid - Left = 10 + Left = 2 Top = 42 - Width = 1088 - Height = 257 + Width = 1096 + Height = 484 Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitLeft = 10 + ExplicitWidth = 1088 + ExplicitHeight = 257 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick OnMouseDown = Tv1MouseDown @@ -682,19 +690,13 @@ inherited frmClothInfo: TfrmClothInfo GridView = Tv1 end end - object cxSplitter2: TcxSplitter - Left = 2 - Top = 42 - Width = 8 - Height = 257 - HotZoneClassName = 'TcxMediaPlayer9Style' - end object cxSplitter3: TcxSplitter Left = 1098 Top = 42 Width = 8 - Height = 257 + Height = 484 AlignSplitter = salRight + ExplicitHeight = 257 end end inherited loadProcess: TPanel @@ -714,9 +716,10 @@ inherited frmClothInfo: TfrmClothInfo Left = 1336 Top = 75 Width = 204 - Height = 506 + Height = 733 Align = alRight TabOrder = 8 + ExplicitHeight = 506 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 93cbd7f..e3fa526 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -129,7 +129,6 @@ type cxGrid1Level1: TcxGridLevel; DS_2: TDataSource; ADO_2: TADOQuery; - cxSplitter2: TcxSplitter; cxSplitter3: TcxSplitter; ToolButton7: TToolButton; Tv1Column11: TcxGridDBColumn; diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 971890f..2d729c9 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -152,7 +152,7 @@ object frmClothInfoInput: TfrmClothInfoInput Left = 66 Top = 274 Width = 32 - Height = 22 + Height = 21 Caption = #22791#27880 end object Label11: TLabel @@ -472,8 +472,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 441 Align = alClient TabOrder = 2 - ExplicitTop = 345 - ExplicitHeight = 423 object Panel4: TPanel Left = 1 Top = 185 @@ -482,7 +480,6 @@ object frmClothInfoInput: TfrmClothInfoInput Align = alLeft Caption = 'Panel4' TabOrder = 0 - ExplicitHeight = 237 object ToolBar3: TToolBar Left = 1 Top = 1 @@ -521,7 +518,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 223 Align = alClient TabOrder = 1 - ExplicitHeight = 205 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -577,7 +573,6 @@ object frmClothInfoInput: TfrmClothInfoInput Align = alClient Caption = 'Panel5' TabOrder = 1 - ExplicitHeight = 237 object ToolBar4: TToolBar Left = 1 Top = 1 @@ -616,7 +611,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 223 Align = alClient TabOrder = 1 - ExplicitHeight = 205 object TV3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -671,8 +665,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 184 Align = alTop TabOrder = 2 - ExplicitLeft = -2 - ExplicitTop = -1 object lbl1: TLabel Left = 61 Top = 3 diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.dfm b/T02贸易汇总仓库/U_ItemizedListInPut.dfm index 4387d9a..fa2a0b8 100644 --- a/T02贸易汇总仓库/U_ItemizedListInPut.dfm +++ b/T02贸易汇总仓库/U_ItemizedListInPut.dfm @@ -3,11 +3,11 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut Top = 4 Caption = #35746#21333#24405#20837 ClientHeight = 593 - ClientWidth = 1153 + ClientWidth = 1240 Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poMainFormCenter - ExplicitWidth = 1169 + ExplicitWidth = 1256 ExplicitHeight = 632 PixelsPerInch = 96 TextHeight = 21 @@ -15,7 +15,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut Tag = 1 Left = 0 Top = 0 - Width = 1153 + Width = 1240 Height = 30 AutoSize = True ButtonHeight = 30 @@ -27,6 +27,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut List = True ShowCaptions = True TabOrder = 0 + ExplicitWidth = 1153 object TBSave: TToolButton Left = 0 Top = 0 @@ -72,7 +73,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut Tag = 1 Left = 0 Top = 193 - Width = 1153 + Width = 1240 Height = 30 ButtonHeight = 30 ButtonWidth = 99 @@ -83,6 +84,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut List = True ShowCaptions = True TabOrder = 1 + ExplicitWidth = 1153 object btnAdd: TToolButton Left = 0 Top = 0 @@ -112,27 +114,30 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut object Panel2: TPanel [2] Left = 0 Top = 223 - Width = 1153 + Width = 1240 Height = 370 Align = alClient Caption = 'Panel2' TabOrder = 2 + ExplicitWidth = 1153 object Panel3: TPanel Left = 1 Top = 1 - Width = 1151 + Width = 1238 Height = 368 Align = alClient Caption = 'Panel2' TabOrder = 0 + ExplicitWidth = 1151 object cxGrid1: TcxGrid Left = 1 Top = 1 - Width = 1149 + Width = 1236 Height = 366 Align = alClient PopupMenu = PopupMenu2 TabOrder = 0 + ExplicitWidth = 1149 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick OnMouseDown = Tv1MouseDown @@ -344,7 +349,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut object ScrollBox1: TScrollBox [3] Left = 0 Top = 30 - Width = 1153 + Width = 1240 Height = 163 Align = alTop BevelInner = bvNone @@ -353,6 +358,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut Ctl3D = False ParentCtl3D = False TabOrder = 3 + ExplicitWidth = 1153 object Label3: TLabel Left = 377 Top = 11 diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.pas b/T02贸易汇总仓库/U_ItemizedListInPut.pas index 0004219..d75e67d 100644 --- a/T02贸易汇总仓库/U_ItemizedListInPut.pas +++ b/T02贸易汇总仓库/U_ItemizedListInPut.pas @@ -398,8 +398,17 @@ end; function TfrmItemizedListInPut.SaveData(): Boolean; var - maxno, Smaxno, maxTMMNo, MaxFNo: string; + maxno, Smaxno, maxTMMNo, MaxFNo, MFtyPCId, MSJQZ: string; begin + + with ADOTemp do + begin + Close; + sql.Clear; + SQL.Add('select SJQZ=format(SYSDATETIME(),''yyMMddhhmm'')'); + Open; + MSJQZ := Trim(ADOTemp.FieldByName('SJQZ').AsString); + end; try ADOCmd.Connection.BeginTrans; /// @@ -478,7 +487,12 @@ begin Edit; RTSetSaveDataCDS(ADOCmd, Tv1, CDS_1, 'Trade_ItemizedList_Sub', 0); - + if Trim(CDS_1.FieldByName('FtyPCId').AsString) = '' then + begin + if GetLSNo(ADOCmd, MFtyPCId, MSJQZ, 'FtyPCId', 3, 0) = False then + raise Exception.Create('ȡ׺ʧ!'); + FieldByName('FtyPCId').Value := MFtyPCId; + end; FieldByName('TIMID').Value := Trim(maxno); FieldByName('TISId').Value := Trim(Smaxno); Post; @@ -499,6 +513,17 @@ begin if ADOCmd.RecordCount > 1 then raise Exception.Create('ظ!'); + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('select A.FtyPCId from Trade_ItemizedList_Sub A where TIMID<>''' + Trim(maxno) + ''''); + sql.Add(' and A.FtyPCId in( select X.FtyPCId from Trade_ItemizedList_Sub X where TIMID=''' + Trim(maxno) + ''' and isnull(X.FtyPCId,'''')<>'''' ) '); + Open; + end; + if not ADOCmd.IsEmpty then + raise Exception.Create(pchar('׺' + trim(ADOCmd.FieldByName('FtyPCId').AsString) + 'ظ!')); + with ADOCmd do begin Close; @@ -561,6 +586,14 @@ begin begin Application.MessageBox('ɹ', 'ʾ', 0); + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('delete Trade_ItemizedList_Sub where ISNULL(TISPiece, 0)+ISNULL(TISQty, 0) =0 and TIMID=' + QuotedStr(Trim(FTIMID))); + ExecSQL; + end; + // CDS_1.EmptyDataSet; // PState := 0; // FTIMID := ''; @@ -1269,7 +1302,6 @@ end; procedure TfrmItemizedListInPut.Tv1DblClick(Sender: TObject); var MTISId, MQtyUnit: string; - begin if Trim(CDS_1.FieldByName('TISUnit').AsString) = '' then begin diff --git a/T02贸易汇总仓库/U_ItemizedListList.dfm b/T02贸易汇总仓库/U_ItemizedListList.dfm index d52413b..71241a4 100644 --- a/T02贸易汇总仓库/U_ItemizedListList.dfm +++ b/T02贸易汇总仓库/U_ItemizedListList.dfm @@ -87,20 +87,28 @@ inherited frmItemizedListList: TfrmItemizedListList Left = 561 Top = 0 AutoSize = True - Caption = #30721#21333#25171#21360 + Caption = #25353#21333#25171#21360 ImageIndex = 21 OnClick = TBPrintClick end - object TBCK: TToolButton + object ToolButton5: TToolButton Left = 664 Top = 0 AutoSize = True + Caption = #21246#36873#25171#21360 + ImageIndex = 21 + OnClick = ToolButton5Click + end + object TBCK: TToolButton + Left = 767 + Top = 0 + AutoSize = True Caption = #26597#30475 ImageIndex = 8 OnClick = TBCKClick end object ToolButton4: TToolButton - Left = 735 + Left = 838 Top = 0 AutoSize = True Caption = #38468#20214 @@ -108,15 +116,23 @@ inherited frmItemizedListList: TfrmItemizedListList OnClick = ToolButton4Click end object ToolButton2: TToolButton - Left = 806 + Left = 909 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton2Click end + object ToolButton3: TToolButton + Left = 1012 + Top = 0 + AutoSize = True + Caption = #23548#20986 + ImageIndex = 28 + OnClick = ToolButton3Click + end object TBClose: TToolButton - Left = 909 + Left = 1083 Top = 0 AutoSize = True Caption = #20851#38381 @@ -286,6 +302,7 @@ inherited frmItemizedListList: TfrmItemizedListList Width = 1540 Height = 584 Align = alClient + PopupMenu = pm1 TabOrder = 5 object TV1: TcxGridDBTableView OnDblClick = TV1DblClick @@ -635,7 +652,7 @@ inherited frmItemizedListList: TfrmItemizedListList Left = 597 Top = 495 end - object PopupMenu2: TPopupMenu + object pm1: TPopupMenu Left = 785 Top = 495 object N3: TMenuItem diff --git a/T02贸易汇总仓库/U_ItemizedListList.pas b/T02贸易汇总仓库/U_ItemizedListList.pas index 26d4245..1cb9999 100644 --- a/T02贸易汇总仓库/U_ItemizedListList.pas +++ b/T02贸易汇总仓库/U_ItemizedListList.pas @@ -45,7 +45,7 @@ type ADOQueryImage: TADOQuery; DSImage: TDataSource; IdFTP1: TIdFTP; - PopupMenu2: TPopupMenu; + pm1: TPopupMenu; N3: TMenuItem; N4: TMenuItem; Label1: TLabel; @@ -94,6 +94,8 @@ type C_ColorNo: TcxTextEdit; Label2: TLabel; FtyPCId: TcxTextEdit; + ToolButton3: TToolButton; + ToolButton5: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -127,6 +129,8 @@ type procedure ToolButton1Click(Sender: TObject); procedure TV1DblClick(Sender: TObject); procedure TV1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure ToolButton3Click(Sender: TObject); + procedure ToolButton5Click(Sender: TObject); private DQdate: TDateTime; procedure InitGrid(); @@ -392,7 +396,7 @@ var MPrintJson: string; begin MFiltration := Trim(Self.Order_Main.fieldbyname('TIMNo').AsString); - MPrintJson := ' {"LMType": "TradeFinishClothOutPrt1" '; + MPrintJson := ' {"LMType": "ItemizedListList1" '; MPrintJson := MPrintJson + ' ,"PreviewPrint": true '; MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; @@ -598,6 +602,22 @@ begin end; end; +procedure TfrmItemizedListList.ToolButton5Click(Sender: TObject); +var + MFiltration: string; + MPrintJson: string; +begin + MFiltration := SelCDSKey(Order_Main, ['TISId'])[0]; + MPrintJson := ' {"LMType": "ItemizedListList2" '; + MPrintJson := MPrintJson + ' ,"PreviewPrint": true '; + MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } '; + FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson)); +end; + procedure TfrmItemizedListList.cxTabControl1Change(Sender: TObject); begin SetStatus(); @@ -678,12 +698,12 @@ end; procedure TfrmItemizedListList.N3Click(Sender: TObject); begin - SelOKNoFiler(Tv1, True); //ȫѡ + SelOKNo(Order_Main, True); //ȫѡ end; procedure TfrmItemizedListList.N4Click(Sender: TObject); begin - SelOKNoFiler(Tv1, False); //ȫ + SelOKNo(Order_Main, False); //ȫ end; procedure TfrmItemizedListList.ComboBox1Change(Sender: TObject); @@ -747,5 +767,10 @@ begin WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ'); end; +procedure TfrmItemizedListList.ToolButton3Click(Sender: TObject); +begin + TcxGridToExcel(Trim(Self.Caption), cxGrid1); +end; + end. diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm index 23e0a7d..c325734 100644 --- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm +++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm @@ -29,8 +29,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitLeft = 0 - ExplicitTop = 69 object Tv1: TcxGridDBTableView OnKeyDown = Tv1KeyDown Navigator.Buttons.CustomButtons = <> diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas index 52f232d..40bfe10 100644 --- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas +++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas @@ -65,7 +65,6 @@ type private { Private declarations } function SaveData(): Boolean; - procedure NianTie(); function Split(const s: string; Separator: char): TStringDynArray; public @@ -140,7 +139,6 @@ begin // Ȱзֳ Lines := Split(ClipboardText, #13); // Windowsϵͳлзͨ#13#10 - // ÿһ for i := 0 to Length(Lines) - 1 do begin @@ -591,7 +589,6 @@ begin First; while not Eof do begin - Edit; if FQtyUnit = 'M' then begin @@ -605,12 +602,28 @@ begin begin FieldByName('Qty').Value := FieldByName('NetWeight').Value; end; - Post; Next; end; EnableControls; end; + + with CDS_Sub do + begin + DisableControls; + First; + while not Eof do + begin + if FieldByName('Meter').AsFloat + FieldByName('Yardage').AsFloat + FieldByName('NetWeight').AsFloat = 0 then + begin + Delete; + end + else + Next; + end; + EnableControls; + end; + if CDS_Sub.Locate('Qty', null, []) = True then begin Application.MessageBox('Ϊ!', 'ʾ', 0); diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas index 9d79062..ece7f8f 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas @@ -458,10 +458,12 @@ begin raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); ADOQueryCmd.Connection.CommitTrans; InitGrid2(); + InitGrid1(); except ADOQueryCmd.Connection.RollbackTrans; application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); InitGrid2(); + InitGrid1(); end; end; diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm index 900680b..dcfe19d 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm @@ -9,8 +9,8 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitWidth = 1289 - ExplicitHeight = 521 + ExplicitWidth = 1297 + ExplicitHeight = 529 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -322,7 +322,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList Height = 342 Align = alClient TabOrder = 4 - Properties.ActivePage = cxTabSheet2 + Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas index eea2ded..7269715 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas @@ -563,10 +563,12 @@ begin raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); ADOQueryCmd.Connection.CommitTrans; InitGrid2(); + InitGrid1(); except ADOQueryCmd.Connection.RollbackTrans; application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); InitGrid2(); + InitGrid1(); end; end; @@ -650,7 +652,7 @@ begin FstkName := Self.FstkName; if ShowModal = 1 then begin - Self.InitGrid2(); + Self.InitGrid1(); end; end; finally diff --git a/T03贸易布匹检验/DjdMachineInsp.dpr b/T03贸易布匹检验/DjdMachineInsp.dpr index ad45858..f262757 100644 --- a/T03贸易布匹检验/DjdMachineInsp.dpr +++ b/T03贸易布匹检验/DjdMachineInsp.dpr @@ -50,7 +50,8 @@ uses U_printPdf in '..\..\..\public10\ThreeFun\Fun\U_printPdf.pas', U_TradeClothTotalOutSel in 'U_TradeClothTotalOutSel.pas' {frmTradeClothTotalOutSel}, U_CustomFun in '..\A00ͨ÷\U_CustomFun.pas', - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_ProgressUpdate in '..\A00ͨ÷\U_ProgressUpdate.pas'; {$R *.res} diff --git a/T03贸易布匹检验/DjdMachineInsp.dproj b/T03贸易布匹检验/DjdMachineInsp.dproj index cacb3fa..e721798 100644 --- a/T03贸易布匹检验/DjdMachineInsp.dproj +++ b/T03贸易布匹检验/DjdMachineInsp.dproj @@ -303,6 +303,7 @@ + Cfg_2 Base diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm index 5b1aaec..ca5d76e 100644 --- a/T03贸易布匹检验/U_MachRollMain.dfm +++ b/T03贸易布匹检验/U_MachRollMain.dfm @@ -1,101 +1,281 @@ inherited frmMachRollMain: TfrmMachRollMain Caption = #26426#21488#26816#39564 - ClientHeight = 661 - ClientWidth = 1149 + ClientHeight = 756 + ClientWidth = 1791 Color = clBtnFace Font.Charset = ANSI_CHARSET Font.Height = -16 FormStyle = fsMDIChild Visible = True - ExplicitWidth = 1165 - ExplicitHeight = 700 + ExplicitWidth = 1807 + ExplicitHeight = 795 PixelsPerInch = 96 TextHeight = 21 - object dxLayoutControl_pack: TdxLayoutControl [0] - Tag = 999 + object Panel1: TPanel [0] Left = 0 Top = 0 - Width = 443 - Height = 661 - Margins.Left = 0 - Margins.Top = 0 - Margins.Right = 0 - Margins.Bottom = 0 + Width = 499 + Height = 756 Align = alLeft - TabOrder = 3 - LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1 - OptionsItem.SizableHorz = True - OptionsItem.SizableVert = True - OnClick = FrameKeyBoard1SpeedButton1Click - OnDblClick = dxLayoutControl_packDblClick - object Qty: TcxTextEdit - Left = 81 - Top = 147 + TabOrder = 4 + object Label1: TLabel + Left = 15 + Top = 30 + Width = 64 + Height = 21 + Caption = #25195#25551#20837#21475 + Font.Charset = ANSI_CHARSET + Font.Color = clRed + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label2: TLabel + Left = 31 + Top = 85 + Width = 48 + Height = 21 + Caption = #25351#31034#21333 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label3: TLabel + Left = 47 + Top = 119 + Width = 32 + Height = 21 + Caption = #33394#21495 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label4: TLabel + Left = 15 + Top = 154 + Width = 64 + Height = 21 + Caption = #26579#21378#32568#21495 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label5: TLabel + Left = 47 + Top = 188 + Width = 32 + Height = 21 + Caption = #25968#37327 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label6: TLabel + Left = 271 + Top = 85 + Width = 32 + Height = 21 + Caption = #21697#21517 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label7: TLabel + Left = 271 + Top = 119 + Width = 32 + Height = 21 + Caption = #39068#33394 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label8: TLabel + Left = 271 + Top = 154 + Width = 32 + Height = 21 + Caption = #21345#21495 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label9: TLabel + Left = 33 + Top = 259 + Width = 42 + Height = 28 + Caption = #38271#24230 + Font.Charset = ANSI_CHARSET + Font.Color = clRed + Font.Height = -21 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object lblLenUnit: TLabel + Left = 250 + Top = 262 + Width = 16 + Height = 21 + Caption = 'M' + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label10: TLabel + Left = 33 + Top = 318 + Width = 42 + Height = 28 + Caption = #37325#37327 + Font.Charset = ANSI_CHARSET + Font.Color = clRed + Font.Height = -21 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label11: TLabel + Left = 250 + Top = 321 + Width = 22 + Height = 21 + Caption = 'KG' + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label12: TLabel + Left = 41 + Top = 388 + Width = 32 + Height = 21 + Caption = #31995#25968 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object edtScan: TcxTextEdit + Tag = 999 + Left = 85 + Top = 27 + Properties.CharCase = ecUpperCase + Style.HotTrack = False + Style.LookAndFeel.Kind = lfUltraFlat + Style.LookAndFeel.SkinName = 'WXI' + Style.TransparentBorder = False + StyleDisabled.LookAndFeel.Kind = lfUltraFlat + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.Kind = lfUltraFlat + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.Kind = lfUltraFlat + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 0 + OnClick = edtScanEnter + OnDblClick = edtScanDblClick + OnKeyPress = edtScanKeyPress + Width = 384 + end + object OrderNo: TcxTextEdit + Left = 85 + Top = 81 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 4 - Width = 111 + TabOrder = 1 + Width = 160 + end + object ColorNo: TcxTextEdit + Left = 85 + Top = 115 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 2 + Width = 160 end object FtyPCId: TcxTextEdit - Left = 81 - Top = 118 + Left = 85 + Top = 150 Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 3 OnClick = edtScanEnter - Width = 111 + Width = 160 end - object Color: TcxTextEdit - Left = 241 - Top = 89 + object Qty: TcxTextEdit + Left = 85 + Top = 184 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 6 - Width = 161 + TabOrder = 4 + Width = 160 end - object ColorNo: TcxTextEdit - Left = 81 - Top = 89 - Properties.ReadOnly = True - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 2 - Width = 111 - end - object CodeName: TcxTextEdit - Left = 241 - Top = 60 + object BCIOID: TcxTextEdit + Left = 309 + Top = 150 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 5 - Width = 161 + Width = 160 end - object OrderNo: TcxTextEdit - Left = 81 - Top = 60 + object Color: TcxTextEdit + Left = 309 + Top = 115 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 1 - Width = 111 + TabOrder = 6 + Width = 160 end - object BCIOID: TcxTextEdit - Left = 241 - Top = 118 + object CodeName: TcxTextEdit + Left = 309 + Top = 81 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 7 - Width = 161 + Width = 160 end object InputLen: TcxTextEdit Tag = 999 - Left = 81 - Top = 202 + Left = 85 + Top = 255 AutoSize = False Properties.ReadOnly = False Properties.OnChange = InputLenPropertiesChange @@ -105,49 +285,12 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 35 - Width = 132 - end - object BTPrint: TButton - Left = 261 - Top = 246 - Width = 120 - Height = 59 - Caption = #25552' '#20132 - TabOrder = 11 - OnClick = BTPrintClick - end - object Tare: TcxTextEdit - Tag = 999 - Left = 160 - Top = 246 - AutoSize = False - Properties.OnChange = InputLenPropertiesChange - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 10 - OnClick = edtScanEnter - OnKeyPress = InputLenKeyPress - Height = 59 - Width = 57 - end - object Coefficient: TcxTextEdit - Tag = 999 - Left = 81 - Top = 314 - AutoSize = False - Properties.ReadOnly = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 12 - OnClick = edtScanEnter - OnKeyPress = InputLenKeyPress - Height = 37 - Width = 52 + Width = 158 end object InputWeight: TcxTextEdit Tag = 999 - Left = 81 - Top = 246 + Left = 85 + Top = 314 AutoSize = False Properties.OnChange = InputLenPropertiesChange Style.HotTrack = False @@ -155,55 +298,50 @@ inherited frmMachRollMain: TfrmMachRollMain TabOrder = 9 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress - Height = 59 - Width = 70 + Height = 35 + Width = 96 end - object OutPutWeight: TcxTextEdit + object Tare: TcxTextEdit Tag = 999 - Left = 9726 - Top = 10000 + Left = 187 + Top = 314 AutoSize = False + Properties.OnChange = InputLenPropertiesChange Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 16 - Visible = False + TabOrder = 10 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress - Height = 44 - Width = 191 + Height = 35 + Width = 57 end - object AOrdDefNote1: TcxRichEdit - Left = 1 - Top = 369 - Properties.ReadOnly = True - Properties.ScrollBars = ssBoth + object BTPrint: TButton + Left = 309 + Top = 314 + Width = 150 + Height = 59 + Caption = #24320' '#35009 + TabOrder = 11 + OnClick = BTPrintClick + end + object Coefficient: TcxTextEdit + Tag = 999 + Left = 83 + Top = 381 + AutoSize = False + Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 14 - Height = 206 - Width = 181 - end - object cxDBImage1: TcxDBImage - Left = 9726 - Top = 10000 - Hint = 'FileName' - DataBinding.DataField = 'FilesOther' - DataBinding.DataSource = DS_IMAGE - Properties.GraphicClassName = 'TdxSmartImage' - Properties.GraphicTransparency = gtTransparent - Properties.ReadOnly = True - Properties.ShowFocusRect = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 17 - Visible = False - Height = 122 - Width = 280 + TabOrder = 12 + OnClick = edtScanEnter + OnKeyPress = InputLenKeyPress + Height = 35 + Width = 84 end object lblRuleConversion: TcxComboBox Tag = 2 - Left = 142 - Top = 314 + Left = 187 + Top = 381 AutoSize = False Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -220,13 +358,24 @@ inherited frmMachRollMain: TfrmMachRollMain StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 13 Text = #26080#38656#36716#25442 - Height = 37 + Height = 35 Width = 102 end + object AOrdDefNote1: TcxRichEdit + Left = 33 + Top = 483 + Properties.ReadOnly = True + Properties.ScrollBars = ssBoth + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 14 + Height = 206 + Width = 181 + end object packnote: TcxMemo Tag = 999 - Left = 191 - Top = 369 + Left = 259 + Top = 483 Properties.ReadOnly = True Properties.ScrollBars = ssVertical Style.HotTrack = False @@ -235,65 +384,89 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 206 Width = 199 end - object edtScan: TcxTextEdit - Tag = 999 - Left = 73 - Top = 11 - Properties.CharCase = ecUpperCase + object unitPieces: TcxTextEdit + Left = 632 + Top = 769 Style.HotTrack = False - Style.LookAndFeel.Kind = lfUltraFlat - Style.LookAndFeel.SkinName = 'WXI' Style.TransparentBorder = False - StyleDisabled.LookAndFeel.Kind = lfUltraFlat - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.Kind = lfUltraFlat - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.Kind = lfUltraFlat - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 0 + TabOrder = 16 + Visible = False OnClick = edtScanEnter - OnDblClick = edtScanDblClick - OnKeyPress = edtScanKeyPress - Width = 148 + Width = 121 end - object C_Pattern: TcxTextEdit - Left = 9726 - Top = 10000 - Properties.ReadOnly = True + object presentWeight: TcxTextEdit + Left = 632 + Top = 725 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 17 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object presentLen: TcxTextEdit + Left = 632 + Top = 703 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 18 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object bt_printmd: TButton + Left = 632 + Top = 681 + Width = 48 + Height = 33 + Caption = #30721#21333 + TabOrder = 19 + Visible = False + OnClick = bt_printmdClick + end + object addWet: TcxTextEdit + Left = 632 + Top = 659 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 20 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object addLen: TcxTextEdit + Left = 632 + Top = 637 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 21 Visible = False - Width = 124 + OnClick = edtScanEnter + Width = 121 end - object RuleYardstick: TcxTextEdit - Left = 9565 - Top = 10000 - AutoSize = False - Properties.ReadOnly = True + object C_GramWeight: TcxTextEdit + Left = 632 + Top = 615 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 22 - Text = '100' Visible = False OnClick = edtScanEnter - OnKeyPress = InputLenKeyPress - Height = 29 - Width = 69 + Width = 121 end - object C_StyleNo: TcxTextEdit - Left = 9565 - Top = 10000 - Properties.ReadOnly = True + object C_Width: TcxTextEdit + Left = 632 + Top = 593 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 23 Visible = False - Width = 168 + OnClick = edtScanEnter + Width = 121 end - object customStrField1: TcxTextEdit - Left = 9726 - Top = 10000 + object customStrField2: TcxTextEdit + Left = 632 + Top = 571 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 24 @@ -301,9 +474,9 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object customStrField2: TcxTextEdit - Left = 9726 - Top = 10000 + object customStrField1: TcxTextEdit + Left = 632 + Top = 549 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 25 @@ -311,629 +484,96 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object C_Width: TcxTextEdit - Left = 9726 - Top = 10000 + object C_StyleNo: TcxTextEdit + Left = 680 + Top = 505 + Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 26 Visible = False - OnClick = edtScanEnter - Width = 121 + Width = 168 end - object C_GramWeight: TcxTextEdit - Left = 9726 - Top = 10000 + object RuleYardstick: TcxTextEdit + Left = 632 + Top = 505 + AutoSize = False + Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 27 + Text = '100' Visible = False OnClick = edtScanEnter - Width = 121 + OnKeyPress = InputLenKeyPress + Height = 29 + Width = 69 end - object addLen: TcxTextEdit - Left = 9726 - Top = 10000 + object C_Pattern: TcxTextEdit + Left = 632 + Top = 483 + Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 28 Visible = False - OnClick = edtScanEnter - Width = 121 + Width = 124 end - object addWet: TcxTextEdit - Left = 9726 - Top = 10000 + object OutPutWeight: TcxTextEdit + Tag = 999 + Left = 632 + Top = 439 + AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 29 Visible = False OnClick = edtScanEnter - Width = 121 + OnKeyPress = InputLenKeyPress + Height = 44 + Width = 191 end - object bt_printmd: TButton - Left = 9726 - Top = 10000 - Width = 48 - Height = 33 - Caption = #30721#21333 + object cxDBImage1: TcxDBImage + Left = 592 + Top = 263 + Hint = 'FileName' + DataBinding.DataField = 'FilesOther' + DataBinding.DataSource = DS_IMAGE + Properties.GraphicClassName = 'TdxSmartImage' + Properties.GraphicTransparency = gtTransparent + Properties.ReadOnly = True + Properties.ShowFocusRect = False + Style.HotTrack = False + Style.TransparentBorder = False TabOrder = 30 Visible = False - OnClick = bt_printmdClick + Height = 122 + Width = 280 end - object presentLen: TcxTextEdit - Left = 9726 - Top = 10000 - Style.HotTrack = False - Style.TransparentBorder = False + object Button1: TButton + Left = 309 + Top = 244 + Width = 150 + Height = 59 + Caption = #20986' '#24211 TabOrder = 31 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object presentWeight: TcxTextEdit - Left = 9726 - Top = 10000 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 32 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object unitPieces: TcxTextEdit - Left = 9726 - Top = 10000 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 33 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object dxLayoutControl_packGroup_Root: TdxLayoutGroup - AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = #26681#30446#24405 - CaptionOptions.Visible = False - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - AllowRemove = False - Hidden = True - ItemIndex = 1 - Padding.Left = -15 - Padding.Top = -5 - Padding.AssignedValues = [lpavLeft, lpavTop] - ShowBorder = False - UseIndent = False - Index = -1 - end - object dxLayoutGroup_scan: TdxLayoutGroup - Parent = dxLayoutControl_packGroup_Root - AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = #25195#25551#26465#30721#32452 - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 697 - AllowRemove = False - Hidden = True - ItemIndex = 1 - LayoutDirection = ldHorizontal - Padding.Bottom = -10 - Padding.Top = -10 - Padding.AssignedValues = [lpavBottom, lpavTop] - ShowBorder = False - Index = 0 - end - object dxLayoutItem1: TdxLayoutItem - Parent = dxLayoutGroup_scan - SizeOptions.AssignedValues = [sovSizableHorz] - SizeOptions.SizableHorz = True - SizeOptions.Width = 220 - AllowRemove = False - CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=12]'#25195#25551#26465#30721'[/SIZE][/COLOR][/B]' - Control = edtScan - ControlOptions.OriginalHeight = 27 - ControlOptions.OriginalWidth = 148 - ControlOptions.ShowBorder = False - OnCaptionClick = dxLayoutItem1CaptionClick - Index = 0 - end - object dxLayoutItem3: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 - Offsets.Left = 5 - AllowRemove = False - CaptionOptions.Text = #25351#31034#21333 - Control = OrderNo - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutGroup_plan: TdxLayoutGroup - Parent = dxLayoutControl_packGroup_Root - AlignHorz = ahRight - CaptionOptions.Text = #35746#21333#20449#24687#32452 - CaptionOptions.Visible = False - SizeOptions.Width = 721 - AllowRemove = False - LayoutDirection = ldHorizontal - Padding.Bottom = -10 - Padding.Left = -15 - Padding.Top = -10 - Padding.AssignedValues = [lpavBottom, lpavLeft, lpavTop] - Index = 1 - end - object dxLayoutItem4: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 - Offsets.Left = 5 - CaptionOptions.Text = #26579#21378#32568#21495 - Control = FtyPCId - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 2 - end - object dxLayoutItem5: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 - Offsets.Left = 5 - CaptionOptions.Text = #33394#21495 - Control = ColorNo - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 1 - end - object dxLayoutItem6: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 - Offsets.Left = 5 - AllowRemove = False - CaptionOptions.Text = #25968#37327 - Control = Qty - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 3 - end - object dxLayoutGroup_plan_1: TdxLayoutGroup - Parent = dxLayoutGroup_plan - AlignHorz = ahLeft - AlignVert = avClient - CaptionOptions.Text = #35745#21010#21333#20449#24687#32452'1' - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 188 - Hidden = True - ItemIndex = 3 - ShowBorder = False - UseIndent = False - Index = 0 - end - object dxLayoutGroup_plan_2: TdxLayoutGroup - Parent = dxLayoutGroup_plan - CaptionOptions.Text = #35745#21010#21333#20449#24687#32452'2' - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 201 - Hidden = True - ItemIndex = 2 - ShowBorder = False - UseIndent = False - Index = 1 - end - object dxLayoutItem7: TdxLayoutItem - Parent = dxLayoutGroup_plan_2 - AllowRemove = False - CaptionOptions.Text = #21697#21517 - Control = CodeName - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutItem8: TdxLayoutItem - Parent = dxLayoutGroup_plan_2 - AllowRemove = False - CaptionOptions.Text = #39068#33394 - Control = Color - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 1 - end - object dxLayoutItem10: TdxLayoutItem - Parent = dxLayoutGroup_plan_2 - CaptionOptions.Text = #21345#21495 - Control = BCIOID - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 2 - end - object dxLayoutEmptySpaceItem1: TdxLayoutEmptySpaceItem - Parent = dxLayoutGroup_scan - SizeOptions.AssignedValues = [sovSizableHorz] - SizeOptions.SizableHorz = True - SizeOptions.Height = 10 - CaptionOptions.Text = #20998#21106#26465 - Index = 1 - end - object dxLayoutGroup_do2: TdxLayoutGroup - Parent = dxLayoutControl_packGroup_Root - AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = #25171#21367#25968#25454#32452 - CaptionOptions.Visible = False - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 747 - AllowRemove = False - LayoutDirection = ldHorizontal - Padding.Left = -10 - Padding.Top = -10 - Padding.AssignedValues = [lpavLeft, lpavTop] - Index = 2 - end - object dxLayoutItem15: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup5 - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 204 - CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=14]'#38271#24230'[/SIZE][/COLOR][/B]' - Control = InputLen - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 132 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutItem16: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup3 - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 142 - CaptionOptions.Text = '[COLOR=Red][SIZE=14]'#37325#37327'[/COLOR][/SIZE]' - Control = InputWeight - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 70 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutItem_outweight: TdxLayoutItem - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - CaptionOptions.Text = '[COLOR=Red][SIZE=14]'#20928#37325'[/COLOR][/SIZE]' - Control = OutPutWeight - ControlOptions.OriginalHeight = 44 - ControlOptions.OriginalWidth = 191 - ControlOptions.ShowBorder = False - Index = -1 - end - object lblLenUnit: TdxLayoutLabeledItem - Tag = 999 - Parent = dxLayoutAutoCreatedGroup5 - AlignVert = avBottom - SizeOptions.AssignedValues = [sovSizableHorz] - SizeOptions.SizableHorz = False - SizeOptions.Width = 36 - CaptionOptions.Hint = 'M' - CaptionOptions.ShowAccelChar = False - CaptionOptions.Text = '[B][SIZE=12]M[/SIZE][/B]' - Index = 1 - end - object dxLayoutItem18: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup3 - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 57 - Control = Tare - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 57 - ControlOptions.ShowBorder = False - Index = 1 - end - object dxLayoutLabeledItem2: TdxLayoutLabeledItem - Parent = dxLayoutAutoCreatedGroup3 - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz] - SizeOptions.SizableHorz = True - SizeOptions.Width = 26 - CaptionOptions.Hint = 'KG' - CaptionOptions.Text = '[B][SIZE=12]KG[/SIZE][/B]' - Index = 2 - end - object dxLayoutItem21: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup3 - AlignHorz = ahClient - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Height = 59 - AllowRemove = False - CaptionOptions.Text = 'New Item' - CaptionOptions.Visible = False - Control = BTPrint - ControlOptions.OriginalHeight = 59 - ControlOptions.OriginalWidth = 120 - ControlOptions.ShowBorder = False - Index = 3 - end - object dxLayoutEmptySpaceItem3: TdxLayoutEmptySpaceItem - Parent = dxLayoutGroup_do2 - AlignHorz = ahLeft - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz] - SizeOptions.SizableHorz = True - SizeOptions.Height = 10 - SizeOptions.Width = 2 - CaptionOptions.Text = #20998#21106#26465 - Index = 1 - end - object dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup - Parent = dxLayoutAutoCreatedGroup2 - AlignVert = avTop - Index = 0 - end - object dxLayoutAutoCreatedGroup3: TdxLayoutAutoCreatedGroup - Parent = dxLayoutAutoCreatedGroup1 - AlignVert = avTop - LayoutDirection = ldHorizontal - Index = 1 - end - object dxLayoutAutoCreatedGroup5: TdxLayoutAutoCreatedGroup - Parent = dxLayoutAutoCreatedGroup1 - AlignVert = avClient - LayoutDirection = ldHorizontal - Index = 0 - end - object dxLayoutGroup1: TdxLayoutGroup - Parent = dxLayoutGroup_do2 - AlignHorz = ahLeft - AlignVert = avClient - CaptionOptions.Text = #31354#30333#32452 - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Height = 121 - SizeOptions.Width = 114 - Hidden = True - ShowBorder = False - Index = 2 - end - object dxLayoutEmptySpaceItem5: TdxLayoutEmptySpaceItem - Parent = dxLayoutGroup1 - SizeOptions.Height = 10 - SizeOptions.Width = 10 - CaptionOptions.Text = #20998#21106#26465 - Index = 0 - end - object dxLayoutItem24: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup4 - AlignHorz = ahLeft - AlignVert = avClient - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 124 - CaptionOptions.Text = #31995#25968 - Control = Coefficient - ControlOptions.OriginalHeight = 37 - ControlOptions.OriginalWidth = 52 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutGroup2: TdxLayoutGroup - Parent = dxLayoutControl_packGroup_Root - CaptionOptions.Text = #35746#21333#20449#24687#32452'3' - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Width = 74 - AllowRemove = False - Hidden = True - ItemIndex = 1 - LayoutDirection = ldHorizontal - ShowBorder = False - Index = 3 - end - object dxLayoutItem_zhfield: TdxLayoutItem - Parent = dxLayoutGroup2 - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Height = 206 - SizeOptions.Width = 181 - CaptionOptions.Text = #35746#21333#32452#21512#23383#27573 - CaptionOptions.Visible = False - Control = AOrdDefNote1 - ControlOptions.OriginalHeight = 206 - ControlOptions.OriginalWidth = 181 - ControlOptions.ShowBorder = False - Index = 0 - end - object dxLayoutItem_pic: TdxLayoutItem - AlignHorz = ahClient - AlignVert = avTop - SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] - SizeOptions.SizableHorz = True - SizeOptions.SizableVert = True - SizeOptions.Height = 122 - CaptionOptions.Text = #22270#29255'1' - CaptionOptions.Visible = False - Control = cxDBImage1 - ControlOptions.OriginalHeight = 122 - ControlOptions.OriginalWidth = 280 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutAutoCreatedGroup2: TdxLayoutAutoCreatedGroup - Parent = dxLayoutGroup_do2 - Index = 0 - end - object dxLayoutItem14: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup4 - AlignVert = avClient - SizeOptions.Width = 102 - CaptionOptions.Text = #31995#25968#36716#25442 - CaptionOptions.Visible = False - Control = lblRuleConversion - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 102 - ControlOptions.ShowBorder = False - Index = 1 - end - object dxLayoutAutoCreatedGroup4: TdxLayoutAutoCreatedGroup - Parent = dxLayoutAutoCreatedGroup2 - AlignVert = avClient - LayoutDirection = ldHorizontal - Index = 1 - end - object dxLayoutItem_packnote: TdxLayoutItem - Parent = dxLayoutGroup2 - SizeOptions.Height = 206 - SizeOptions.Width = 199 - CaptionOptions.Text = #21253#35013#35201#27714 - CaptionOptions.Visible = False - Control = packnote - ControlOptions.OriginalHeight = 206 - ControlOptions.OriginalWidth = 199 - ControlOptions.ShowBorder = False - Index = 1 - end - object dxLayoutItem_Pattern: TdxLayoutItem - CaptionOptions.Text = #33457#22411 - Control = C_Pattern - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 124 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_RuleYardstick: TdxLayoutItem - CaptionOptions.Text = #30721#23610 - Control = RuleYardstick - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 69 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_StyleNo: TdxLayoutItem - CaptionOptions.Text = #27454#21495 - Control = C_StyleNo - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 168 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_customStrField1: TdxLayoutItem - CaptionOptions.Text = #33258#23450#20041#36755#20837'1' - Control = customStrField1 - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_customStrField2: TdxLayoutItem - CaptionOptions.Text = #33258#23450#20041#36755#20837'2' - Control = customStrField2 - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_width: TdxLayoutItem - CaptionOptions.Text = #38376#24133 - Control = C_Width - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_gram: TdxLayoutItem - CaptionOptions.Text = #20811#37325 - Control = C_GramWeight - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_addlen: TdxLayoutItem - CaptionOptions.Text = #21152#38271 - Control = addLen - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_addwet: TdxLayoutItem - CaptionOptions.Text = #21152#37325 - Control = addWet - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_btprintmd: TdxLayoutItem - CaptionOptions.Text = #25171#21360#30721#21333 - CaptionOptions.Visible = False - Control = bt_printmd - ControlOptions.OriginalHeight = 33 - ControlOptions.OriginalWidth = 48 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_presentLen: TdxLayoutItem - CaptionOptions.Text = #36192#36865#38271#24230 - Control = presentLen - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_presentWeight: TdxLayoutItem - CaptionOptions.Text = #36192#36865#37325#37327 - Control = presentWeight - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 - end - object dxLayoutItem_unitPieces: TdxLayoutItem - CaptionOptions.Text = #25340#21305 - Control = unitPieces - ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 121 - ControlOptions.ShowBorder = False - Index = -1 + OnClick = Button1Click end end object Panel_right: TPanel [1] - Left = 443 + Left = 499 Top = 0 - Width = 706 - Height = 661 + Width = 1292 + Height = 756 Align = alClient Caption = 'Panel_right' - TabOrder = 4 + TabOrder = 3 object ToolBar2: TToolBar Tag = 1000 Left = 1 - Top = 326 - Width = 704 - Height = 60 + Top = 451 + Width = 1290 + Height = 30 Align = alBottom AutoSize = True ButtonHeight = 30 @@ -974,35 +614,26 @@ inherited frmMachRollMain: TfrmMachRollMain AutoSize = True Caption = #25171#21360#24211#23384#26631#31614 ImageIndex = 21 - Wrap = True OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 0 - Top = 30 + Left = 380 + Top = 0 AutoSize = True Caption = #25171#21367#35774#32622 ImageIndex = 25 OnClick = ToolButton1Click end - object ToolButton7: TToolButton - Left = 103 - Top = 30 - AutoSize = True - Caption = #20445#23384#26684#24335 - ImageIndex = 16 - OnClick = ToolButton7Click - end object Tlog: TToolButton - Left = 206 - Top = 30 + Left = 483 + Top = 0 AutoSize = True Caption = #26085#24535 ImageIndex = 30 end object ToolButton8: TToolButton - Left = 277 - Top = 30 + Left = 554 + Top = 0 AutoSize = True Caption = #20851#38381 ImageIndex = 7 @@ -1012,8 +643,8 @@ inherited frmMachRollMain: TfrmMachRollMain object cxGrid3: TcxGrid Tag = 9999 Left = 1 - Top = 386 - Width = 704 + Top = 481 + Width = 1290 Height = 274 Align = alBottom TabOrder = 1 @@ -1150,8 +781,8 @@ inherited frmMachRollMain: TfrmMachRollMain object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 704 - Height = 325 + Width = 1290 + Height = 450 Align = alClient TabOrder = 2 object TV2: TcxGridDBTableView @@ -1181,7 +812,6 @@ inherited frmMachRollMain: TfrmMachRollMain end item Kind = skSum - Column = TV2Column6 end> DataController.Summary.SummaryGroups = <> OptionsBehavior.FocusCellOnTab = True @@ -1262,32 +892,31 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 60 end object TV2Column7: TcxGridDBColumn - Caption = #35746#21333#25968 - DataBinding.FieldName = 'TMSQty' + Caption = #25253#21333#25968 + DataBinding.FieldName = 'OrderQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 end + object TV2Column8: TcxGridDBColumn + Caption = #25253#21333#21333#20301 + DataBinding.FieldName = 'OrderUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 78 + end object v1PRTOrderQty: TcxGridDBColumn Caption = #27424#21333#25968 - DataBinding.FieldName = 'QDQty' + DataBinding.FieldName = 'OrderOweQty' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 84 end - object TV2Column6: TcxGridDBColumn - Caption = #37197#36135#25968#37327 - DataBinding.FieldName = 'Qty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 92 - end object v1OrderUnit: TcxGridDBColumn - Caption = #21333#20301 + Caption = #24211#23384#21333#20301 DataBinding.FieldName = 'TMSUnit' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' @@ -1297,7 +926,7 @@ inherited frmMachRollMain: TfrmMachRollMain 'Kg') HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 110 end object cxGridDBColumn7: TcxGridDBColumn Caption = #22791#27880 @@ -1314,8 +943,8 @@ inherited frmMachRollMain: TfrmMachRollMain end end object cxGroupBox_keys: TcxGroupBox [2] - Left = 8 - Top = 390 + Left = 83 + Top = 451 Caption = #34394#25311#38190#30424 Style.LookAndFeel.NativeStyle = False StyleDisabled.LookAndFeel.NativeStyle = False @@ -1402,18 +1031,18 @@ inherited frmMachRollMain: TfrmMachRollMain end end inherited loadProcess: TPanel - Left = 531 - Top = 173 + Left = 560 + Top = 326 Width = 177 - ExplicitLeft = 531 - ExplicitTop = 173 + ExplicitLeft = 560 + ExplicitTop = 326 ExplicitWidth = 177 end inherited cxProgressBar2: TcxProgressBar - Left = 531 - Top = 125 - ExplicitLeft = 531 - ExplicitTop = 125 + Left = 560 + Top = 238 + ExplicitLeft = 560 + ExplicitTop = 238 ExplicitHeight = 29 end inherited ADOQueryBaseCmd: TADOQuery diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas index 734ab72..cfba3aa 100644 --- a/T03贸易布匹检验/U_MachRollMain.pas +++ b/T03贸易布匹检验/U_MachRollMain.pas @@ -22,63 +22,12 @@ uses type TfrmMachRollMain = class(TfrmBaseList) - dxLayoutControl_packGroup_Root: TdxLayoutGroup; - dxLayoutControl_pack: TdxLayoutControl; - Qty: TcxTextEdit; - FtyPCId: TcxTextEdit; - Color: TcxTextEdit; - ColorNo: TcxTextEdit; - CodeName: TcxTextEdit; - OrderNo: TcxTextEdit; - edtScan: TcxTextEdit; - BCIOID: TcxTextEdit; - dxLayoutGroup_scan: TdxLayoutGroup; - dxLayoutItem1: TdxLayoutItem; - dxLayoutItem3: TdxLayoutItem; - dxLayoutGroup_plan: TdxLayoutGroup; - dxLayoutItem4: TdxLayoutItem; - dxLayoutItem5: TdxLayoutItem; - dxLayoutItem6: TdxLayoutItem; - dxLayoutGroup_plan_1: TdxLayoutGroup; - dxLayoutGroup_plan_2: TdxLayoutGroup; - dxLayoutItem7: TdxLayoutItem; - dxLayoutItem8: TdxLayoutItem; - dxLayoutItem10: TdxLayoutItem; - dxLayoutEmptySpaceItem1: TdxLayoutEmptySpaceItem; - InputLen: TcxTextEdit; - BTPrint: TButton; - Tare: TcxTextEdit; - Coefficient: TcxTextEdit; - InputWeight: TcxTextEdit; - OutPutWeight: TcxTextEdit; - dxLayoutGroup_do2: TdxLayoutGroup; - dxLayoutItem15: TdxLayoutItem; - dxLayoutItem16: TdxLayoutItem; - dxLayoutItem_outweight: TdxLayoutItem; - lblLenUnit: TdxLayoutLabeledItem; - dxLayoutItem18: TdxLayoutItem; - dxLayoutLabeledItem2: TdxLayoutLabeledItem; - dxLayoutItem21: TdxLayoutItem; - dxLayoutEmptySpaceItem3: TdxLayoutEmptySpaceItem; - dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup; - dxLayoutAutoCreatedGroup3: TdxLayoutAutoCreatedGroup; - dxLayoutAutoCreatedGroup5: TdxLayoutAutoCreatedGroup; - dxLayoutGroup1: TdxLayoutGroup; - dxLayoutEmptySpaceItem5: TdxLayoutEmptySpaceItem; - dxLayoutItem24: TdxLayoutItem; - dxLayoutGroup2: TdxLayoutGroup; - cxDBImage1: TcxDBImage; Panel_right: TPanel; ToolBar2: TToolBar; ToolButton3: TToolButton; Trolldel: TToolButton; ToolButton4: TToolButton; - ToolButton7: TToolButton; ToolButton8: TToolButton; - dxLayoutItem_zhfield: TdxLayoutItem; - AOrdDefNote1: TcxRichEdit; - dxLayoutItem_pic: TdxLayoutItem; - dxLayoutAutoCreatedGroup2: TdxLayoutAutoCreatedGroup; cds_params: TClientDataSet; cds_paramsdabao: TStringField; cds_paramspackRolls: TIntegerField; @@ -110,24 +59,13 @@ type cds_paramsFixedLength: TIntegerField; cds_paramspacknoMake: TStringField; cds_paramspieceOrder: TBooleanField; - lblRuleConversion: TcxComboBox; - dxLayoutItem14: TdxLayoutItem; - dxLayoutAutoCreatedGroup4: TdxLayoutAutoCreatedGroup; cds_paramsLabVolume: TStringField; cds_paramsLabPackage: TStringField; - dxLayoutItem_packnote: TdxLayoutItem; - packnote: TcxMemo; Tlog: TToolButton; cxGroupBox_keys: TcxGroupBox; FrameKeyBoard1: TFrameKeyBoard; - dxLayoutItem_Pattern: TdxLayoutItem; - C_Pattern: TcxTextEdit; - RuleYardstick: TcxTextEdit; - dxLayoutItem_RuleYardstick: TdxLayoutItem; cds_paramsAddwetPresent: TFloatField; cds_paramsAddLenPresent: TFloatField; - C_StyleNo: TcxTextEdit; - dxLayoutItem_StyleNo: TdxLayoutItem; GPM_3: TcxGridPopupMenu; MovePanel1: TMovePanel; ADOQueryImage: TADOQuery; @@ -135,26 +73,6 @@ type cds_paramspackPrintPreview: TBooleanField; cds_paramspacklabNumber: TIntegerField; cds_paramspackPostAction: TStringField; - customStrField1: TcxTextEdit; - dxLayoutItem_customStrField1: TdxLayoutItem; - dxLayoutItem_customStrField2: TdxLayoutItem; - customStrField2: TcxTextEdit; - dxLayoutItem_width: TdxLayoutItem; - dxLayoutItem_gram: TdxLayoutItem; - C_Width: TcxTextEdit; - C_GramWeight: TcxTextEdit; - dxLayoutItem_addlen: TdxLayoutItem; - dxLayoutItem_addwet: TdxLayoutItem; - addLen: TcxTextEdit; - addWet: TcxTextEdit; - bt_printmd: TButton; - dxLayoutItem_btprintmd: TdxLayoutItem; - dxLayoutItem_presentLen: TdxLayoutItem; - dxLayoutItem_presentWeight: TdxLayoutItem; - presentLen: TcxTextEdit; - presentWeight: TcxTextEdit; - unitPieces: TcxTextEdit; - dxLayoutItem_unitPieces: TdxLayoutItem; ADO_CJ: TADOQuery; ToolButton1: TToolButton; cxGrid3: TcxGrid; @@ -190,8 +108,54 @@ type TV2Column4: TcxGridDBColumn; ADO_2: TADOQuery; TV2Column5: TcxGridDBColumn; - TV2Column6: TcxGridDBColumn; TV2Column7: TcxGridDBColumn; + Panel1: TPanel; + edtScan: TcxTextEdit; + Label1: TLabel; + OrderNo: TcxTextEdit; + ColorNo: TcxTextEdit; + FtyPCId: TcxTextEdit; + Qty: TcxTextEdit; + BCIOID: TcxTextEdit; + Color: TcxTextEdit; + CodeName: TcxTextEdit; + Label2: TLabel; + Label3: TLabel; + Label4: TLabel; + Label5: TLabel; + Label6: TLabel; + Label7: TLabel; + Label8: TLabel; + Label9: TLabel; + InputLen: TcxTextEdit; + lblLenUnit: TLabel; + Label10: TLabel; + InputWeight: TcxTextEdit; + Tare: TcxTextEdit; + Label11: TLabel; + BTPrint: TButton; + Coefficient: TcxTextEdit; + lblRuleConversion: TcxComboBox; + Label12: TLabel; + AOrdDefNote1: TcxRichEdit; + packnote: TcxMemo; + unitPieces: TcxTextEdit; + presentWeight: TcxTextEdit; + presentLen: TcxTextEdit; + bt_printmd: TButton; + addWet: TcxTextEdit; + addLen: TcxTextEdit; + C_GramWeight: TcxTextEdit; + C_Width: TcxTextEdit; + customStrField2: TcxTextEdit; + customStrField1: TcxTextEdit; + C_StyleNo: TcxTextEdit; + RuleYardstick: TcxTextEdit; + C_Pattern: TcxTextEdit; + OutPutWeight: TcxTextEdit; + cxDBImage1: TcxDBImage; + Button1: TButton; + TV2Column8: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -201,7 +165,6 @@ type procedure ToolButton8Click(Sender: TObject); procedure edtScanEnter(Sender: TObject); procedure BTPrintClick(Sender: TObject); - procedure ToolButton7Click(Sender: TObject); procedure TrolldelClick(Sender: TObject); procedure ToolButton3Click(Sender: TObject); procedure Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); @@ -215,6 +178,7 @@ type procedure ToolButton1Click(Sender: TObject); procedure FrameKeyBoard1SpeedButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); + procedure Button1Click(Sender: TObject); private FCIID, FCIFName, FWorkshop: string; FBCIOID, FC_Code, FC_ColorNo, FQtyUnit, FLenUnit: string; @@ -266,7 +230,7 @@ implementation uses U_DataLink, U_ControlData, U_ParamSet, U_RTFun, U_globalVar, U_FormLayOutDesign, U_ZDYHelp, U_iniParam, U_ProductListHelp, U_SysLogList, - U_LabelPrint, U_TradeClothTotalOutSel; + U_ProgressUpdate, U_LabelPrint, U_TradeClothTotalOutSel; {$R *.dfm} procedure TfrmMachRollMain.InitGrid2(); @@ -295,7 +259,7 @@ begin if trim(CKType) = 'ύ' then begin - if trim(lblLenUnit.CaptionOptions.Hint) = '' then + if trim(lblLenUnit.Caption) = '' then raise Exception.create('ȵλΪ!'); if trim(InputWeight.Text) <> '' then @@ -438,6 +402,58 @@ begin end; end; +procedure TfrmMachRollMain.Button1Click(Sender: TObject); +var + fPrintFile, MPacketId, MTMSId: string; + mvalue: double; + i: Integer; +begin + try + BTPrint.Enabled := false; + MTMSId := Trim(SelTVKey(Tv2, ['TMSId'])[0]); + edtScan.SetFocus; + + try + ADOQueryBaseCmd.Connection.BeginTrans; + + if trim(FBCIOID) = '' then + raise Exception.create('ɨ̿'); + with ADOQueryBaseCmd do + begin + Close; + sql.Clear; + Sql.Add('exec P_BS_Cloth_Out_DistributionAll '); + Sql.Add(' @StkID=' + quotedstr(Trim(FBCIOID))); + Sql.Add(' ,@TMSId =' + quotedstr(MTMSId)); + Sql.Add(' ,@Dcode=' + quotedstr(Trim(Dcode))); + Sql.Add(' ,@DName=' + quotedstr(Trim(DName))); + open; + end; + + if ADOQueryBaseCmd.fieldbyName('intReturn').AsInteger = -1 then + begin + raise Exception.create(pchar(trim(ADOQueryBaseCmd.fieldbyName('ShowMsg').AsString))); + end; + + FCIID := trim(trim(ADOQueryBaseCmd.fieldbyName('MaxIOID2').AsString)); + + ADOQueryBaseCmd.Connection.CommitTrans; + TradeMarketProgressUpdate(ADOQueryBaseCmd, MTMSId); + except + ADOQueryBaseCmd.Connection.RollbackTrans; + Application.MessageBox(pchar(Exception(ExceptObject).Message), 'ʾϢ', 0); + + end; + InputLen.SetFocus; + setFocusCtrol(InputLen.Name); + InitJYGrid(); + InitGrid2(); + FCIID := ''; + finally + BTPrint.Enabled := true; + end; +end; + procedure TfrmMachRollMain.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -651,7 +667,7 @@ begin SetUnit(FLenUnit); - FCDUnit := lblLenUnit.CaptionOptions.Hint; + FCDUnit := lblLenUnit.Caption; FBCIOID := trim(fieldbyName('BCIOID').AsString); @@ -744,8 +760,7 @@ end; procedure TfrmMachRollMain.SetUnit(MUnit: string); begin - lblLenUnit.CaptionOptions.Hint := MUnit; - lblLenUnit.CaptionOptions.Text := '[B][SIZE=16]' + MUnit + '[/SIZE][/B]'; + lblLenUnit.Caption := MUnit; end; @@ -865,16 +880,6 @@ begin ACanvas.Brush.Color := clRed; end; -procedure TfrmMachRollMain.ToolButton7Click(Sender: TObject); -begin - - WriteCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption); - if gIsCanDesign then - begin - saveLayOut(application, dxLayoutControl_pack, ADOQueryBaseCmd, PWideChar(fDllFileName + '|' + Self.Name + '|' + dxLayoutControl_pack.Name + '.ini')); - end; -end; - procedure TfrmMachRollMain.ToolButton8Click(Sender: TObject); begin inherited; @@ -944,11 +949,6 @@ end; procedure TfrmMachRollMain.setFormCtrol(); begin - if cds_params.fieldbyName('weightRule').AsInteger = 0 then - dxLayoutItem_outweight.Caption := '[COLOR=Red][SIZE=18][/COLOR][/SIZE]' - else - dxLayoutItem_outweight.Caption := '[COLOR=Red][SIZE=18]ë[/COLOR][/SIZE]'; - FrameKeyBoard1.SpeedButton_zdykey1.Caption := gZdyKey1; // FrameKeyBoard1.SpeedButton_zdykey2.Caption := gZdyKey2; FrameKeyBoard1.SpeedButton_zdykey2.Caption := gZdyKey2; @@ -1156,8 +1156,10 @@ var MInputWeight, MGrossWeight, MNetWeight, MTare, Maddwet, maddLen: double; mYardStick: double; mPresentLen, mpresentWeight: double; + MTMSId: string; begin Result := false; + MTMSId := Trim(SelTVKey(Tv2, ['TMSId'])[0]); Maddwet := strTofloatDef(trim(addwet.text), 0); // Faddwet; maddLen := strTofloatDef(trim(addlen.text), 0); // faddlen; mYardStick := strtofloatdef(trim(RuleYardstick.Text), 100); @@ -1184,7 +1186,7 @@ begin MInputLen := RoundFloat(strtofloatdef(trim(InputLen.Text), 0), 4); // +mAddLen - if (uppercase(lblLenUnit.CaptionOptions.Hint) = 'M') or (lblLenUnit.CaptionOptions.Hint = '') then + if (uppercase(lblLenUnit.Caption) = 'M') or (lblLenUnit.Caption = '') then begin MMeter := RoundFloat((MInputLen + maddLen + mPresentLen) / (mYardStick / 100), cds_params.fieldbyName('MPlace').AsInteger); MYardage := RoundFloat(MMeter / 0.9144, cds_params.fieldbyName('YPlace').AsInteger); @@ -1206,7 +1208,7 @@ begin Sql.Add(' ,@Meter=' + quotedstr(Trim(FloatToStr(MMeter)))); Sql.Add(' ,@Yardage=' + quotedstr(Trim(FloatToStr(MYardage)))); Sql.Add(' ,@StkID=' + quotedstr(Trim(FBCIOID))); - Sql.Add(' ,@TMSId =' + quotedstr(Trim(SelTVKey(Tv2,['TMSId'])[0]))); + Sql.Add(' ,@TMSId =' + quotedstr(MTMSId)); Sql.Add(' ,@Dcode=' + quotedstr(Trim(Dcode))); Sql.Add(' ,@DName=' + quotedstr(Trim(DName))); // ShowMessage(sql.Text); @@ -1221,7 +1223,7 @@ begin FCIID := trim(trim(ADOQueryBaseCmd.fieldbyName('MaxIOID2').AsString)); ADOQueryBaseCmd.Connection.CommitTrans; - + TradeMarketProgressUpdate(ADOQueryBaseCmd, MTMSId); Result := true; except ADOQueryBaseCmd.Connection.RollbackTrans; diff --git a/T05贸易门市管理/TradeMarket.dpr b/T05贸易门市管理/TradeMarket.dpr index 59e8b4d..ab7fdd0 100644 --- a/T05贸易门市管理/TradeMarket.dpr +++ b/T05贸易门市管理/TradeMarket.dpr @@ -40,7 +40,8 @@ uses U_TradeMarketList in 'U_TradeMarketList.pas' {frmTradeMarketList}, U_TradeDispatchedList in 'U_TradeDispatchedList.pas' {frmTradeDispatchedList}, U_TradeMarketDisSel in 'U_TradeMarketDisSel.pas' {frmTradeMarketDisSel}, - U_ComContactSel in '..\A00ͨô\U_ComContactSel.pas' {frmComContactSel}; + U_ComContactSel in '..\A00ͨô\U_ComContactSel.pas' {frmComContactSel}, + U_ProgressUpdate in '..\A00ͨ÷\U_ProgressUpdate.pas'; {$R *.res} diff --git a/T05贸易门市管理/TradeMarket.dproj b/T05贸易门市管理/TradeMarket.dproj index 8d25c6f..b2dc92a 100644 --- a/T05贸易门市管理/TradeMarket.dproj +++ b/T05贸易门市管理/TradeMarket.dproj @@ -232,6 +232,7 @@
frmComContactSel
dfm + Cfg_2 Base diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index d33125e..988e593 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 = 1787 + ClientWidth = 1913 Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poMainFormCenter WindowState = wsMaximized - ExplicitWidth = 1803 + ExplicitWidth = 1929 ExplicitHeight = 691 PixelsPerInch = 96 TextHeight = 21 @@ -16,7 +16,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 1 Left = 0 Top = 0 - Width = 1787 + Width = 1913 Height = 30 AutoSize = True ButtonHeight = 30 @@ -28,7 +28,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1360 object TBSave: TToolButton Left = 0 Top = 0 @@ -58,7 +57,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 1 Left = 0 Top = 185 - Width = 1787 + Width = 1913 Height = 24 ButtonHeight = 30 ButtonWidth = 67 @@ -69,7 +68,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 1 - ExplicitWidth = 1360 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -90,29 +88,28 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object Panel2: TPanel [2] Left = 0 Top = 209 - Width = 1787 + Width = 1913 Height = 443 Align = alClient Caption = 'Panel2' TabOrder = 2 - ExplicitWidth = 1360 object Panel3: TPanel Left = 1 Top = 1 - Width = 1499 + Width = 1625 Height = 441 Align = alClient Caption = 'Panel2' TabOrder = 0 - ExplicitWidth = 1072 object cxGrid1: TcxGrid Left = 1 Top = 1 - Width = 1497 + Width = 1623 Height = 439 Align = alClient TabOrder = 0 - ExplicitWidth = 1070 + ExplicitLeft = -1 + ExplicitTop = 5 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -129,7 +126,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut item Format = '0' Position = spFooter - Column = v1PRTOrderQty end item Format = '0' @@ -138,7 +134,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = v1PRTOrderQty end item Kind = skSum @@ -148,7 +143,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end item Kind = skSum - Column = VC_PRTPs end> DataController.Summary.SummaryGroups = <> OptionsBehavior.FocusCellOnTab = True @@ -274,23 +268,20 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut HeaderAlignmentHorz = taCenter Width = 70 end - object VC_PRTPs: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'TMSPiece' + object Tv1Column15: TcxGridDBColumn + Caption = #25253#21333#25968#37327 DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 112 + Width = 86 end - object v1PRTOrderQty: TcxGridDBColumn - Caption = #25968#37327 - DataBinding.FieldName = 'TMSQty' + object Tv1Column16: TcxGridDBColumn + Caption = #25253#21333#21333#20301 DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter - Width = 98 + Width = 110 end object Tv1Column8: TcxGridDBColumn - Caption = #25968#37327#21333#20301 + Caption = #24211#23384#21333#20301 DataBinding.FieldName = 'TMSUnit' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -325,6 +316,18 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut HeaderAlignmentHorz = taCenter Width = 70 end + object Tv1Column17: TcxGridDBColumn + Caption = #32039#24613#31243#24230 + DataBinding.FieldName = 'Urgent' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsEditFixedList + Properties.Items.Strings = ( + #27491#24120 + #32039#24613) + HeaderAlignmentHorz = taCenter + Width = 95 + end object Tv1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'OrdSNote' @@ -332,6 +335,20 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut HeaderAlignmentHorz = taCenter Width = 105 end + object Tv1Column18: TcxGridDBColumn + Caption = #22791#36135#29366#24577 + DataBinding.FieldName = 'StkStatus' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsEditFixedList + Properties.Items.Strings = ( + #26377 + #23436#25104 + #27809#36135 + #27424#21333 + #21462#28040#21333) + HeaderAlignmentHorz = taCenter + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -339,14 +356,13 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end end object Panel4: TPanel - Left = 1500 + Left = 1626 Top = 1 Width = 286 Height = 441 Align = alRight Caption = 'Panel4' TabOrder = 1 - ExplicitLeft = 1073 object Panel5: TPanel Left = 1 Top = 1 @@ -453,7 +469,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object ScrollBox1: TScrollBox [3] Left = 0 Top = 30 - Width = 1787 + Width = 1913 Height = 155 Align = alTop BevelInner = bvNone @@ -463,8 +479,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut ParentCtl3D = False TabOrder = 3 OnClick = ScrollBox1Click - ExplicitLeft = -1 - ExplicitTop = 24 object Label3: TLabel Left = 730 Top = 70 diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index ef70843..11c4cd3 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -44,8 +44,6 @@ type Tv1: TcxGridDBTableView; v1Column11: TcxGridDBColumn; v1PRTColor: TcxGridDBColumn; - VC_PRTPs: TcxGridDBColumn; - v1PRTOrderQty: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; Tv1Column1: TcxGridDBColumn; @@ -103,6 +101,10 @@ type CustName: TcxMRUEdit; CDS_KH: TClientDataSet; ADO_KH: TADOQuery; + Tv1Column15: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; + Tv1Column17: TcxGridDBColumn; + Tv1Column18: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -165,7 +167,7 @@ implementation uses U_DataLink, U_ZDYHelp, U_ZDYHelpSel, U_RTFun, U_CompanySel, U_PictureUpload, - U_ClothInfoSel, U_ComContactSel; + U_ProgressUpdate, U_ClothInfoSel, U_ComContactSel; {$R *.dfm} @@ -534,6 +536,9 @@ begin FTMMID := Trim(maxno); ADOCmd.Connection.CommitTrans; + + TradeMarketProgressUpdateByTMMID(ADOCmd, FTMMID); + with ADO_1 do begin Close; diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index 3f85a5e..b0530f0 100644 --- a/T05贸易门市管理/U_TradeMarketList.dfm +++ b/T05贸易门市管理/U_TradeMarketList.dfm @@ -3,13 +3,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList Top = 13 Caption = #22823#36135#21333 ClientHeight = 594 - ClientWidth = 1540 + ClientWidth = 1791 Color = clBtnFace Font.Height = -16 FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitWidth = 1556 + ExplicitWidth = 1807 ExplicitHeight = 633 PixelsPerInch = 96 TextHeight = 21 @@ -17,7 +17,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList Tag = 1 Left = 0 Top = 0 - Width = 1540 + Width = 1791 Height = 30 AutoSize = True ButtonHeight = 30 @@ -147,10 +147,18 @@ inherited frmTradeMarketList: TfrmTradeMarketList ImageIndex = 16 OnClick = ToolButton2Click end - object TBClose: TToolButton + object ToolButton1: TToolButton Left = 1193 Top = 0 AutoSize = True + Caption = #23548#20986 + ImageIndex = 28 + OnClick = ToolButton1Click + end + object TBClose: TToolButton + Left = 1264 + Top = 0 + AutoSize = True Caption = #20851#38381 ImageIndex = 7 OnClick = TBCloseClick @@ -159,7 +167,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1540 + Width = 1791 Height = 91 Align = alTop BevelInner = bvRaised @@ -229,7 +237,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList inline frmFrameDateSel1: TfrmFrameDateSel Left = 2 Top = 2 - Width = 1536 + Width = 1787 Height = 37 Align = alTop Color = clWhite @@ -238,7 +246,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList TabOrder = 4 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 1536 + ExplicitWidth = 1787 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -251,7 +259,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList object cxGrid1: TcxGrid [2] Left = 0 Top = 152 - Width = 1540 + Width = 1791 Height = 442 Align = alClient PopupMenu = PM_1 @@ -378,44 +386,72 @@ inherited frmTradeMarketList: TfrmTradeMarketList Width = 77 end object Tv1Column12: TcxGridDBColumn - Caption = #20013#25991#39068#33394 + Caption = #39068#33394 DataBinding.FieldName = 'C_Color' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 end - object Tv1Column13: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'TMSPiece' + object Tv1Column17: TcxGridDBColumn + Caption = #33394#21495 + DataBinding.FieldName = 'C_ColorNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 58 + end + object Tv1Column11: TcxGridDBColumn + Caption = #25253#21333#25968#37327 + DataBinding.FieldName = 'OrderQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 104 + end + object Tv1Column13: TcxGridDBColumn + Caption = #25253#21333#21333#20301 + DataBinding.FieldName = 'OrderUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 91 + end + object Tv1Column19: TcxGridDBColumn + Caption = #27424#21333#25968 + DataBinding.FieldName = 'OrderOweQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 84 end object Tv1Column14: TcxGridDBColumn - Caption = #25968#37327 + Caption = #24211#23384#38656#27714 DataBinding.FieldName = 'TMSQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 95 + end + object Tv1Column18: TcxGridDBColumn + Caption = #22791#36135#25968#37327 + DataBinding.FieldName = 'StkQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 111 end object Tv1Column15: TcxGridDBColumn - Caption = #21333#20301 + Caption = #22791#36135#21333#20301 DataBinding.FieldName = 'TMSUnit' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 93 end - object Tv1Column16: TcxGridDBColumn - Caption = #22791#27880 - DataBinding.FieldName = 'OrdSNote' + object Tv1Column21: TcxGridDBColumn + Caption = #22791#36135#29366#24577 + DataBinding.FieldName = 'StkStatus' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 92 end object Tv1Column10: TcxGridDBColumn Caption = #27004#23618 @@ -425,6 +461,22 @@ inherited frmTradeMarketList: TfrmTradeMarketList Options.Editing = False Width = 95 end + object Tv1Column16: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column20: TcxGridDBColumn + Caption = #32039#24613#31243#24230 + DataBinding.FieldName = 'Urgent' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 88 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -433,7 +485,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList object cxTabControl1: TcxTabControl [3] Left = 0 Top = 121 - Width = 1540 + Width = 1791 Height = 31 Align = alTop TabOrder = 2 @@ -448,7 +500,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList ' '#20840#37096' ') OnChange = cxTabControl1Change ClientRectBottom = 31 - ClientRectRight = 1540 + ClientRectRight = 1791 ClientRectTop = 28 end inherited loadProcess: TPanel diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 7074180..8c9fea6 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -85,11 +85,18 @@ type Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; Tv1Column12: TcxGridDBColumn; - Tv1Column13: TcxGridDBColumn; Tv1Column14: TcxGridDBColumn; Tv1Column15: TcxGridDBColumn; Tv1Column16: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; + ToolButton1: TToolButton; + Tv1Column11: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; + Tv1Column17: TcxGridDBColumn; + Tv1Column18: TcxGridDBColumn; + Tv1Column19: TcxGridDBColumn; + Tv1Column20: TcxGridDBColumn; + Tv1Column21: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -126,6 +133,7 @@ type procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); procedure ToolButton2Click(Sender: TObject); procedure N1Click(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); private DQdate: TDateTime; procedure InitGrid(); @@ -252,42 +260,30 @@ var begin FilterStr := SGetFilters(Panel1, 1, 2); - SqlStr := ' select A.*,B.*,C.StkPosition '; - SqlStr := SqlStr + ' from Trade_Market_Main A '; - SqlStr := SqlStr + ' inner join Trade_Market_Sub B on B.TMMId=A.TMMId '; - SqlStr := SqlStr + ' inner join BS_Cloth_Info C on C.C_Code=B.C_Code '; - - SqlStr := SqlStr + ' where A.TMMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date))); - SqlStr := SqlStr + ' and A.TMMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1))); - if canshu2 <> '' then - begin - SqlStr := SqlStr + ' and C.StkPosition= ' + QuotedStr(Trim(canshu2)); - end; + SqlStr := ' exec P_Trade_Market_View '; + SqlStr := SqlStr + ' @BegDate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date))); + SqlStr := SqlStr + ' ,@EndDate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1))); + SqlStr := SqlStr + ' ,@StkPosition= ' + QuotedStr(Trim(canshu2)); if canshu1 = '¼' then - begin - SqlStr := SqlStr + ' and A.Filler= ' + QuotedStr(Trim(DName)); - end; + SqlStr := SqlStr + ' ,@Filler= ' + QuotedStr(Trim(DName)); case cxTabControl1.TabIndex of 0: begin - SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' '; + SqlStr := SqlStr + ' , @Status=''0'' '; end; 1: begin - SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' '; + SqlStr := SqlStr + ' , @Status=''1'' '; end; 2: begin - SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' '; + SqlStr := SqlStr + ' , @Status=''9'' '; end; 3: begin - SqlStr := SqlStr + ' and isnull(A.status,''0'')=''10'' '; + SqlStr := SqlStr + ' , @Status=''10'' '; end; end; - SqlStr := SqlStr + ' and ordtype=''' + FOrdType + ''' '; - - SqlStr := SqlStr + ' order by filltime desc'; InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId'); end; @@ -957,6 +953,11 @@ begin application.MessageBox('ɹ', 'ʾϢ', 0); end; +procedure TfrmTradeMarketList.ToolButton1Click(Sender: TObject); +begin + TcxGridToExcel(Trim(Self.Caption), cxGrid1); +end; + procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject); begin WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ');