From f46fb83cdf946085cba6039ae755cbbb0499cad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”> Date: Wed, 16 Apr 2025 10:09:14 +0800 Subject: [PATCH] 111 --- D01针织生产计划/U_DataLink.dfm | 1 + D01针织生产计划/U_KnitPlanList.dfm | 1 + D01针织生产计划/U_KnitPlanList.pas | 10 +++++++++ D01针织生产计划/U_TradeInspSet.dfm | 19 +++++++++++------ D01针织生产计划/U_TradeInspSet.pas | 33 ++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/D01针织生产计划/U_DataLink.dfm b/D01针织生产计划/U_DataLink.dfm index 7d62feb..b0e5269 100644 --- a/D01针织生产计划/U_DataLink.dfm +++ b/D01针织生产计划/U_DataLink.dfm @@ -1,4 +1,5 @@ inherited DataLink_KnitPlan: TDataLink_KnitPlan + OldCreateOrder = True OnDestroy = DataModuleDestroy Height = 349 Width = 482 diff --git a/D01针织生产计划/U_KnitPlanList.dfm b/D01针织生产计划/U_KnitPlanList.dfm index 476a6d6..9161cda 100644 --- a/D01针织生产计划/U_KnitPlanList.dfm +++ b/D01针织生产计划/U_KnitPlanList.dfm @@ -408,6 +408,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> + OnCellDblClick = Tv1CellDblClick OnCustomDrawCell = Tv1CustomDrawCell OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DS_1 diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas index cde0dff..1891036 100644 --- a/D01针织生产计划/U_KnitPlanList.pas +++ b/D01针织生产计划/U_KnitPlanList.pas @@ -197,6 +197,9 @@ type procedure ToolButton8Click(Sender: TObject); procedure ToolButton9Click(Sender: TObject); procedure ToolButton10Click(Sender: TObject); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; + ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; + AShift: TShiftState; var AHandled: Boolean); private FInt, PFInt: Integer; procedure InitGrid(); @@ -1089,6 +1092,13 @@ begin end; +procedure TfrmKnitPlanList.Tv1CellDblClick(Sender: TcxCustomGridTableView; + ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; + AShift: TShiftState; var AHandled: Boolean); +begin + TBView.Click; +end; + procedure TfrmKnitPlanList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); begin if cxTabControl1.TabIndex = 1 then diff --git a/D01针织生产计划/U_TradeInspSet.dfm b/D01针织生产计划/U_TradeInspSet.dfm index 7f5b3ec..84d7967 100644 --- a/D01针织生产计划/U_TradeInspSet.dfm +++ b/D01针织生产计划/U_TradeInspSet.dfm @@ -465,7 +465,6 @@ inherited frmTradeInspSet: TfrmTradeInspSet Options.DrawBorder = False Options.BorderPen.Color = clGray Options.BorderPen.Style = psDash - ExplicitTop = 40 end object ToolBar2: TToolBar Tag = 1 @@ -492,16 +491,24 @@ inherited frmTradeInspSet: TfrmTradeInspSet ImageIndex = 2 OnClick = TaddClick end - object Tupd: TToolButton + object btn1: TToolButton Left = 71 Top = 0 AutoSize = True + Caption = #22797#21046 + ImageIndex = 9 + OnClick = btn1Click + end + object Tupd: TToolButton + Left = 142 + Top = 0 + AutoSize = True Caption = #20462#25913 ImageIndex = 3 OnClick = TupdClick end object ToolButton4: TToolButton - Left = 142 + Left = 213 Top = 0 AutoSize = True Caption = #35774#35745#26631#31614 @@ -509,7 +516,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet OnClick = ToolButton4Click end object Tdel: TToolButton - Left = 237 + Left = 308 Top = 0 AutoSize = True Caption = #21024#38500 @@ -517,7 +524,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet OnClick = TdelClick end object ToolButton2: TToolButton - Left = 308 + Left = 379 Top = 0 AutoSize = True Caption = #35774#20026#21253#26631#31614 @@ -525,7 +532,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 415 + Left = 486 Top = 0 AutoSize = True Caption = #35774#20026#21367#26631#31614 diff --git a/D01针织生产计划/U_TradeInspSet.pas b/D01针织生产计划/U_TradeInspSet.pas index fe220ed..05372da 100644 --- a/D01针织生产计划/U_TradeInspSet.pas +++ b/D01针织生产计划/U_TradeInspSet.pas @@ -86,6 +86,7 @@ type RuleLenUnit: TComboBox; Label8: TLabel; RuleLaterTare: TEdit; + btn1: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -101,6 +102,7 @@ type procedure ToolButton4Click(Sender: TObject); procedure LabelTypeChange(Sender: TObject); procedure TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure btn1Click(Sender: TObject); private { Private declarations } procedure InitGrid(); @@ -235,6 +237,37 @@ begin frmTradeInspSet := nil; end; +procedure TfrmTradeInspSet.btn1Click(Sender: TObject); +var + MFromLabelId: string; +begin + MFromLabelId := trim(CDS_Label.fieldbyname('LabelId').asstring); + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + + if showModal = 1 then + begin + FLabelId := frmLabelInput.LabelCaption.Text; + with ADOQueryCmd do + begin + close; + sql.clear; + sql.Add(' exec P_BS_Label_Copy'); + sql.Add(' @FromLabelId=' + quotedstr(trim(MFromLabelId))); + sql.Add(',@ToLabelId=' + quotedstr(trim(FLabelId))); +// ShowMessage(sql.text); + execSql; + end; + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + procedure TfrmTradeInspSet.cxPageControl1Change(Sender: TObject); begin case cxPageControl1.ActivePageIndex of