111
This commit is contained in:
parent
9494acc603
commit
ef3eefe70d
|
|
@ -7,7 +7,7 @@ uses
|
|||
Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
|
||||
System.ImageList,U_BaseDataLink,
|
||||
dxCore, cxLocalization, dxLayoutLookAndFeels, cxImageList, cxGraphics, cxEdit,
|
||||
cxContainer, dxSkinsForm, dxSkinsCore;
|
||||
cxContainer, dxSkinsForm, dxSkinsCore, dxSkinWXI;
|
||||
|
||||
type
|
||||
TMyThread = class(TThread)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ uses
|
|||
Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls,
|
||||
cxLookAndFeels, cxLookAndFeelPainters,
|
||||
dxLayoutContainer, cxClasses, Vcl.Buttons, dxLayoutControl, cxGeometry,
|
||||
dxFramedControl, dxPanel, dxSkinsCore;
|
||||
dxFramedControl, dxPanel, dxSkinsCore, dxSkinWXI;
|
||||
|
||||
type
|
||||
TFrameKeyBoard = class(TFrame)
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
#26080#38656#36716#25442
|
||||
#38271#24230#36716#20844#26020
|
||||
#20928#37325#36716#38271#24230
|
||||
#27611#37325#36716#38271#24230)
|
||||
'')
|
||||
Properties.OnChange = lblRuleConversionPropertiesChange
|
||||
Style.HotTrack = False
|
||||
Style.LookAndFeel.SkinName = 'WXI'
|
||||
|
|
@ -912,15 +912,8 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
ImageIndex = 5
|
||||
OnClick = TrolldelClick
|
||||
end
|
||||
object ToolButton4: TToolButton
|
||||
Left = 142
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #30133#28857#31649#29702
|
||||
ImageIndex = 2
|
||||
end
|
||||
object ToolButton2: TToolButton
|
||||
Left = 245
|
||||
Left = 142
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #25171#21360#24211#23384#26631#31614
|
||||
|
|
@ -928,7 +921,7 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
OnClick = ToolButton2Click
|
||||
end
|
||||
object ToolButton1: TToolButton
|
||||
Left = 380
|
||||
Left = 277
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #25171#21367#35774#32622
|
||||
|
|
@ -936,14 +929,14 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
OnClick = ToolButton1Click
|
||||
end
|
||||
object Tlog: TToolButton
|
||||
Left = 483
|
||||
Left = 380
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #26085#24535
|
||||
ImageIndex = 30
|
||||
end
|
||||
object ToolButton8: TToolButton
|
||||
Left = 554
|
||||
Left = 451
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #20851#38381
|
||||
|
|
@ -954,32 +947,33 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
end
|
||||
end
|
||||
object cxGroupBox_keys: TcxGroupBox [2]
|
||||
Left = 83
|
||||
Top = 451
|
||||
Left = 778
|
||||
Top = 61
|
||||
Caption = #34394#25311#38190#30424
|
||||
Style.LookAndFeel.NativeStyle = False
|
||||
StyleDisabled.LookAndFeel.NativeStyle = False
|
||||
TabOrder = 2
|
||||
Transparent = True
|
||||
Visible = False
|
||||
Height = 245
|
||||
Width = 319
|
||||
Height = 285
|
||||
Width = 327
|
||||
inline FrameKeyBoard1: TFrameKeyBoard
|
||||
Left = 2
|
||||
Top = 26
|
||||
Width = 315
|
||||
Height = 217
|
||||
Left = 4
|
||||
Top = 23
|
||||
Width = 319
|
||||
Height = 246
|
||||
Align = alClient
|
||||
TabOrder = 0
|
||||
ExplicitLeft = 2
|
||||
ExplicitTop = 26
|
||||
ExplicitWidth = 315
|
||||
ExplicitHeight = 217
|
||||
ExplicitLeft = 4
|
||||
ExplicitTop = 23
|
||||
ExplicitWidth = 311
|
||||
ExplicitHeight = 206
|
||||
inherited dxPanel1: TdxPanel
|
||||
Width = 315
|
||||
Height = 217
|
||||
ExplicitWidth = 315
|
||||
ExplicitHeight = 217
|
||||
Width = 319
|
||||
Height = 246
|
||||
ExplicitTop = -8
|
||||
ExplicitWidth = 311
|
||||
ExplicitHeight = 261
|
||||
inherited SpeedButton1: TSpeedButton
|
||||
OnClick = FrameKeyBoard1SpeedButton1Click
|
||||
end
|
||||
|
|
@ -1031,8 +1025,8 @@ inherited frmMachRollMain: TfrmMachRollMain
|
|||
end
|
||||
end
|
||||
object MovePanel1: TMovePanel
|
||||
Left = 85
|
||||
Top = -29
|
||||
Left = 79
|
||||
Top = -28
|
||||
Width = 237
|
||||
Height = 45
|
||||
BevelOuter = bvNone
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ uses
|
|||
U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel,
|
||||
RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, frxBarcode, frxRich,
|
||||
frxOLE, frxTableObject, frxExportXLSX, frxClass, frxExportBaseDialog,
|
||||
frxExportPPTX, frxDBSet;
|
||||
frxExportPPTX, frxDBSet, dxSkinWXI;
|
||||
|
||||
type
|
||||
TfrmMachRollMain = class(TfrmBaseList)
|
||||
|
|
@ -152,7 +152,6 @@ type
|
|||
ToolBar2: TToolBar;
|
||||
ToolButton3: TToolButton;
|
||||
Trolldel: TToolButton;
|
||||
ToolButton4: TToolButton;
|
||||
ToolButton2: TToolButton;
|
||||
ToolButton1: TToolButton;
|
||||
Tlog: TToolButton;
|
||||
|
|
@ -509,12 +508,12 @@ begin
|
|||
end;
|
||||
if trim(fCanInputFs) = '1' then
|
||||
begin
|
||||
cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.6);
|
||||
// cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.6);
|
||||
frameKeyBoard1.SpeedButton10.Visible := true;
|
||||
end
|
||||
else
|
||||
begin
|
||||
cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.55);
|
||||
// cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.55);
|
||||
frameKeyBoard1.SpeedButton10.Visible := false;
|
||||
end;
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ begin
|
|||
pswd := 'rightsoft@5740';
|
||||
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
|
||||
// DParameters1:='高权限';
|
||||
Parameters1 := '管理';
|
||||
// Parameters2 := '梭织';
|
||||
Parameters4 := '新余';
|
||||
DCode := 'ADMIN';
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
List = True
|
||||
ShowCaptions = True
|
||||
TabOrder = 0
|
||||
ExplicitLeft = -8
|
||||
ExplicitTop = -6
|
||||
object TBSave: TToolButton
|
||||
Left = 0
|
||||
Top = 0
|
||||
|
|
@ -110,6 +112,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
Height = 478
|
||||
Align = alClient
|
||||
TabOrder = 0
|
||||
ExplicitLeft = -127
|
||||
ExplicitTop = 42
|
||||
object Tv1: TcxGridDBTableView
|
||||
OnMouseDown = Tv1MouseDown
|
||||
Navigator.Buttons.CustomButtons = <>
|
||||
|
|
@ -381,6 +385,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
Height = 41
|
||||
Align = alTop
|
||||
TabOrder = 0
|
||||
ExplicitLeft = -23
|
||||
ExplicitTop = 5
|
||||
object Label33: TLabel
|
||||
Left = 113
|
||||
Top = 10
|
||||
|
|
@ -397,7 +403,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
end
|
||||
object QtyMX: TcxTextEdit
|
||||
Left = 163
|
||||
Top = 6
|
||||
Top = 4
|
||||
TabOrder = 0
|
||||
OnKeyPress = QtyMXKeyPress
|
||||
Width = 89
|
||||
|
|
@ -411,6 +417,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
Align = alClient
|
||||
Caption = #21452#20987#21024#38500#26126#32454#20449#24687
|
||||
TabOrder = 1
|
||||
ExplicitLeft = -7
|
||||
ExplicitTop = 48
|
||||
object cxGrid2: TcxGrid
|
||||
Left = 2
|
||||
Top = 23
|
||||
|
|
@ -418,6 +426,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
Height = 412
|
||||
Align = alClient
|
||||
TabOrder = 0
|
||||
ExplicitLeft = -22
|
||||
ExplicitTop = 22
|
||||
object TvMX: TcxGridDBTableView
|
||||
Navigator.Buttons.CustomButtons = <>
|
||||
Navigator.Buttons.Delete.Enabled = False
|
||||
|
|
@ -490,6 +500,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
|
|||
ParentCtl3D = False
|
||||
TabOrder = 3
|
||||
OnClick = ScrollBox1Click
|
||||
ExplicitLeft = -8
|
||||
ExplicitTop = 56
|
||||
object Label3: TLabel
|
||||
Left = 730
|
||||
Top = 70
|
||||
|
|
|
|||
|
|
@ -517,8 +517,6 @@ begin
|
|||
end;
|
||||
|
||||
///////////////////// ±£´æÖ÷±í ///////////////////////////
|
||||
|
||||
|
||||
///////////////////// ±£´æ×Ó±í ///////////////////////////
|
||||
with CDS_1 do
|
||||
begin
|
||||
|
|
@ -561,6 +559,36 @@ begin
|
|||
///////////////////// ±£´æ×Ó±í ///////////////////////////
|
||||
|
||||
|
||||
// with CDS_MX do
|
||||
// begin
|
||||
// First;
|
||||
// while not Eof do
|
||||
// begin
|
||||
//
|
||||
// with ADOCmd do
|
||||
// begin
|
||||
// Close;
|
||||
// SQL.Clear;
|
||||
// sql.Add('select * from Trade_Market_Sub_Qty where TMSQID=' + quotedstr(Trim(CDS_MX.FieldByName('TMSQID').AsString)));
|
||||
// Open;
|
||||
// end;
|
||||
// with ADOCmd do
|
||||
// begin
|
||||
// if Trim(CDS_MX.fieldbyname('TMSQID').AsString) = '' then
|
||||
// Append
|
||||
// else
|
||||
// Edit;
|
||||
// RTSetSaveDataCDS(ADOCmd, TvMX, CDS_MX, 'Trade_Market_Sub_Qty', 0);
|
||||
// Post;
|
||||
// end;
|
||||
// Next;
|
||||
// end;
|
||||
// end;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
with ADOCmd do
|
||||
begin
|
||||
Close;
|
||||
|
|
|
|||
|
|
@ -408,6 +408,27 @@ inherited frmTradeMarketList: TfrmTradeMarketList
|
|||
HeaderAlignmentHorz = taCenter
|
||||
Width = 104
|
||||
end
|
||||
object Tv1Column22: TcxGridDBColumn
|
||||
Caption = #20986#24211#25968#37327
|
||||
DataBinding.FieldName = 'Qty2'
|
||||
DataBinding.IsNullValueType = True
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 84
|
||||
end
|
||||
object Tv1Column23: TcxGridDBColumn
|
||||
Caption = #21333#20215
|
||||
DataBinding.FieldName = 'Price'
|
||||
DataBinding.IsNullValueType = True
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 70
|
||||
end
|
||||
object Tv1Column24: TcxGridDBColumn
|
||||
Caption = #37329#39069
|
||||
DataBinding.FieldName = 'Amount'
|
||||
DataBinding.IsNullValueType = True
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 70
|
||||
end
|
||||
object Tv1Column13: TcxGridDBColumn
|
||||
Caption = #25253#21333#21333#20301
|
||||
DataBinding.FieldName = 'OrderUnit'
|
||||
|
|
|
|||
|
|
@ -115,6 +115,9 @@ type
|
|||
Tv1Column21: TcxGridDBColumn;
|
||||
N5: TMenuItem;
|
||||
N6: TMenuItem;
|
||||
Tv1Column22: TcxGridDBColumn;
|
||||
Tv1Column23: TcxGridDBColumn;
|
||||
Tv1Column24: TcxGridDBColumn;
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
|
|
@ -309,7 +312,7 @@ begin
|
|||
SqlStr := SqlStr + ' , @Status=''10'' ';
|
||||
end;
|
||||
end;
|
||||
|
||||
// ShowMessage(SqlStr);
|
||||
InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId');
|
||||
end;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user