diff --git a/打卷检验管理/U_CKProductJYHZList.dfm b/打卷检验管理/U_CKProductJYHZList.dfm index cd03ff0..9498e31 100644 --- a/打卷检验管理/U_CKProductJYHZList.dfm +++ b/打卷检验管理/U_CKProductJYHZList.dfm @@ -1,6 +1,6 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList - Left = 239 - Top = 140 + Left = 395 + Top = 378 Width = 1517 Height = 511 Caption = #25104#21697#26816#39564#27719#24635#20449#24687 @@ -20,7 +20,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1501 + Width = 1509 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -91,7 +91,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList object Panel1: TPanel Left = 0 Top = 33 - Width = 1501 + Width = 1509 Height = 68 Align = alTop BevelInner = bvRaised @@ -323,8 +323,8 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList object cxGrid2: TcxGrid Left = 0 Top = 101 - Width = 1501 - Height = 371 + Width = 1509 + Height = 379 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView diff --git a/打卷检验管理/U_CKProductJYHZList.pas b/打卷检验管理/U_CKProductJYHZList.pas index 1a48f91..24d097a 100644 --- a/打卷检验管理/U_CKProductJYHZList.pas +++ b/打卷检验管理/U_CKProductJYHZList.pas @@ -4,14 +4,14 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, - cxDataStorage, cxEdit, DB, cxDBData, cxGridCustomTableView, - cxGridTableView, cxGridBandedTableView, cxGridDBBandedTableView, - cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridDBTableView, - cxGrid, StdCtrls, ComCtrls, ExtCtrls, ToolWin, cxGridCustomPopupMenu, - cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, MovePanel, cxButtonEdit, - cxCalendar, RM_System, RM_Common, RM_Class, RM_GridReport, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses, + cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, + ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, + cxDropDownEdit, MovePanel, cxButtonEdit, cxCalendar, RM_System, RM_Common, + RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, + cxCheckBox; type TfrmCKProductJYHZList = class(TForm) @@ -95,19 +95,15 @@ type procedure TBExportClick(Sender: TObject); procedure TBFindClick(Sender: TObject); procedure MPRTCodeNameChange(Sender: TObject); - procedure v1Column5PropertiesButtonClick(Sender: TObject; - AButtonIndex: Integer); + procedure v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure PRTColorChange(Sender: TObject); procedure Image2Click(Sender: TObject); - procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); - procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure TBPrintClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); private - FLeft,FTop:Integer; + FLeft, FTop: Integer; procedure InitGrid(); { Private declarations } public @@ -118,27 +114,27 @@ var frmCKProductJYHZList: TfrmCKProductJYHZList; implementation + uses - U_DataLink,U_Fun,U_ZDYHelp,U_JYOrderCDOne; + U_DataLink, U_Fun, U_ZDYHelp, U_JYOrderCDOne; {$R *.dfm} procedure TfrmCKProductJYHZList.FormDestroy(Sender: TObject); begin - frmCKProductJYHZList:=nil; + frmCKProductJYHZList := nil; end; -procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; - var Action: TCloseAction); +procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmCKProductJYHZList.FormCreate(Sender: TObject); begin //cxGrid1.Align:=alClient; - BegDate.DateTime:=SGetServerDateTime(ADOQueryTemp); - EndDate.DateTime:=SGetServerDateTime(ADOQueryTemp) + BegDate.DateTime := SGetServerDateTime(ADOQueryTemp); + EndDate.DateTime := SGetServerDateTime(ADOQueryTemp) end; procedure TfrmCKProductJYHZList.InitGrid(); @@ -149,7 +145,7 @@ begin begin Close; sql.Clear; - Filtered:=False; + Filtered := False; sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4, '); sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as MJQty4,'); sql.Add('JQty=(select count(*) from WFB_MJJY X where X.SubId=A.SubId),'); @@ -161,14 +157,14 @@ begin sql.Add('from WFB_MJJY A '); sql.Add('inner join JYOrder_Main C on C.MainId=A.MainId '); sql.Add('inner join JYOrder_sub D on D.subID=A.subID '); - Sql.add('where A.fillTime>='''+formatdateTime('yyyy-MM-dd',begdate.Date)+''' '); - Sql.add('and A.fillTime<'''+formatdateTime('yyyy-MM-dd',enddate.Date+1)+''' '); + Sql.add('where A.fillTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); + Sql.add('and A.fillTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); Sql.add('group by convert(char(10),A.fillTime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4'); Open; //ShowMessage(SQL.Text); end; - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); finally ADOQueryMain.EnableControls; end; @@ -177,34 +173,35 @@ end; procedure TfrmCKProductJYHZList.TBRafreshClick(Sender: TObject); begin //BegDate.SetFocus; - MovePanel2.Visible:=True; + MovePanel2.Visible := True; MovePanel2.Refresh; InitGrid(); - MovePanel2.Visible:=False; + MovePanel2.Visible := False; end; procedure TfrmCKProductJYHZList.ConNoMChange(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); end; end; procedure TfrmCKProductJYHZList.TBCloseClick(Sender: TObject); begin - WriteCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); + WriteCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); Close; end; procedure TfrmCKProductJYHZList.FormShow(Sender: TObject); begin - ReadCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); - if Trim(DParameters2)='' then + ReadCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); + if Trim(DParameters2) = '' then begin //v1Column5.Options.Focusing:=True; - end else + end + else begin //v1Column5.Options.Focusing:=False; end; @@ -213,17 +210,18 @@ end; procedure TfrmCKProductJYHZList.TBExportClick(Sender: TObject); begin - if ADOQueryMain.IsEmpty then exit; - TcxGridToExcel('б',cxGrid2); + if ADOQueryMain.IsEmpty then + exit; + TcxGridToExcel('б', cxGrid2); end; procedure TfrmCKProductJYHZList.TBFindClick(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); end; end; @@ -232,28 +230,27 @@ begin TBFind.Click; end; -procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick( - Sender: TObject; AButtonIndex: Integer); +procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='SOrdDefStr10'; - flagname:='ŵص'; - if ShowModal=1 then + flag := 'SOrdDefStr10'; + flagname := 'ŵص'; + if ShowModal = 1 then begin with CDS_Main do begin Edit; - FieldByName('SOrdDefStr10').Value:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + FieldByName('SOrdDefStr10').Value := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('Update JYOrder_Sub Set SOrdDefStr10='''+Trim(ClientDataSet1.fieldbyname('ZdyName').AsString)+''''); - sql.Add(' where SubId='''+Trim(Self.CDS_Main.fieldbyname('SubId').AsString)+''''); + sql.Add('Update JYOrder_Sub Set SOrdDefStr10=''' + Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) + ''''); + sql.Add(' where SubId=''' + Trim(Self.CDS_Main.fieldbyname('SubId').AsString) + ''''); ExecSQL; end; end; @@ -270,49 +267,47 @@ end; procedure TfrmCKProductJYHZList.Image2Click(Sender: TObject); begin - Panel4.Visible:=False; + Panel4.Visible := False; end; -procedure TfrmCKProductJYHZList.Tv1CellDblClick( - Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); +procedure TfrmCKProductJYHZList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin - Panel4.Left:=FLeft; - Panel4.Top:=FTop+110; - Panel4.Visible:=True; - Panel10.Caption:=Trim(TV1.Controller.FocusedColumn.Caption); - RichEdit1.Text:=CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; + Panel4.Left := FLeft; + Panel4.Top := FTop + 110; + Panel4.Visible := True; + Panel10.Caption := Trim(TV1.Controller.FocusedColumn.Caption); + RichEdit1.Text := CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; application.ProcessMessages; end; -procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); +procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - FLeft:=X; - FTop:=Y; + FLeft := X; + FTop := Y; end; procedure TfrmCKProductJYHZList.TBPrintClick(Sender: TObject); begin - RMGridReport1.PreviewButtons:=[pbZoom,pbLoad,pbSave,pbPrint,pbFind,pbPageSetup,pbExit,pbExport,pbNavigator]; + RMGridReport1.PreviewButtons := [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbPageSetup, pbExit, pbExport, pbNavigator]; end; procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject); begin - if cds_main.IsEmpty then Exit; - frmJYOrderCDOne:=TfrmJYOrderCDOne.Create(Application); - with frmJYOrderCDOne do + if cds_main.IsEmpty then + Exit; + frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application); + with frmJYOrderCDOne do + begin + orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring); + gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring); + PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring); + if ShowModal = 1 then begin - orderno.Text:=trim(self.CDS_Main.fieldbyname('orderno').asstring); - gangno.Text:=trim(self.CDS_Main.fieldbyname('MJStr4').asstring); - PRTColor.Text:=trim(self.CDS_Main.fieldbyname('PRTColor').asstring); - if ShowModal=1 then - begin // InitGrid(); - end; - free; end; + free; + end; end; end. + diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 89f2ca3..ea1981c 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 266 - Top = 359 + Left = 383 + Top = 471 Width = 1400 Height = 757 Caption = #26816#39564#25253#21578 @@ -1193,8 +1193,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object MovePanel2: TMovePanel - Left = 416 - Top = 192 + Left = 456 + Top = 240 Width = 289 Height = 49 BevelInner = bvLowered @@ -1210,8 +1210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object Panel5: TPanel - Left = 736 - Top = 188 + Left = 1008 + Top = 276 Width = 273 Height = 101 Color = clSkyBlue @@ -1318,8 +1318,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object Panel3: TPanel - Left = 503 - Top = 203 + Left = 863 + Top = 443 Width = 231 Height = 216 TabOrder = 6 @@ -1418,8 +1418,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object Panel7: TPanel - Left = 409 - Top = 207 + Left = 281 + Top = 287 Width = 231 Height = 170 TabOrder = 7 @@ -1652,8 +1652,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object Panel_SMCK: TPanel - Left = 412 - Top = 180 + Left = 420 + Top = 532 Width = 317 Height = 97 Color = clSkyBlue diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 1b1667f..b3edc88 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -375,7 +375,7 @@ end; procedure TfrmJYOrderCDOne.TBCloseClick(Sender: TObject); begin Close; - WriteCxGrid('鱨JF', Tv1, ''); + WriteCxGrid('鱨JF', Tv1, ''); end; procedure TfrmJYOrderCDOne.InitGrid(); @@ -466,7 +466,7 @@ procedure TfrmJYOrderCDOne.InitForm(); var fsj, Strmd: string; begin - ReadCxGrid('鱨JF', Tv1, ''); + ReadCxGrid('鱨JF', Tv1, ''); fsj := 'select distinct(Filler) name from WFB_MJJY '; Strmd := 'select distinct(text) name,index1 from A_MaDan order by index1 '; SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj); diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm index bc081ea..a86e2fb 100644 --- a/打卷检验管理/U_ProductOrderNewList.dfm +++ b/打卷检验管理/U_ProductOrderNewList.dfm @@ -21,6 +21,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList Left = 0 Top = 0 Width = 1357 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -109,66 +110,67 @@ object frmProductOrderNewList: TfrmProductOrderNewList AutoSize = True Caption = #35746#21333#23436#25104 ImageIndex = 41 + Wrap = True OnClick = TWCClick end object TNoWC: TToolButton - Left = 591 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25764#38144#23436#25104 ImageIndex = 86 OnClick = TNoWCClick end object TBExport: TToolButton - Left = 678 - Top = 0 + Left = 87 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TFJ: TToolButton - Left = 741 - Top = 0 + Left = 150 + Top = 30 AutoSize = True Caption = #25351#31034#21333#38468#20214 ImageIndex = 57 OnClick = TFJClick end object TBPrint: TToolButton - Left = 840 - Top = 0 + Left = 249 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = TBPrintClick end object ToolButton4: TToolButton - Left = 903 - Top = 0 + Left = 312 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton4Click end object ToolButton5: TToolButton - Left = 990 - Top = 0 + Left = 399 + Top = 30 Caption = #30133#28857#31649#29702 ImageIndex = 132 OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 1085 - Top = 0 + Left = 494 + Top = 30 AutoSize = True Caption = #26085#24535 ImageIndex = 72 OnClick = ToolButton6Click end object ToolButton7: TToolButton - Left = 1148 - Top = 0 + Left = 557 + Top = 30 AutoSize = True Caption = #37325#36830 ImageIndex = 73 @@ -176,8 +178,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList OnClick = ToolButton7Click end object TBClose: TToolButton - Left = 1211 - Top = 0 + Left = 620 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -186,7 +188,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel1: TPanel Left = 0 - Top = 32 + Top = 62 Width = 1357 Height = 40 Align = alTop @@ -415,7 +417,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxGrid1: TcxGrid Left = 0 - Top = 95 + Top = 125 Width = 1357 Height = 370 Align = alTop @@ -782,7 +784,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 465 + Top = 495 Width = 1357 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' @@ -791,7 +793,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 473 + Top = 503 Width = 1357 Height = 256 Align = alBottom @@ -1144,7 +1146,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxTabControl1: TcxTabControl Left = 0 - Top = 72 + Top = 102 Width = 1357 Height = 23 Align = alTop