From b4038e88644183947803f73d8f5aed23f2106d63 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 25 Oct 2025 17:25:56 +0800 Subject: [PATCH] ~ --- 打卷检验管理/U_CKProductJYHZList.dfm | 16 +++ 打卷检验管理/U_CKProductJYHZList.pas | 188 +++++++++++++-------------- 打卷检验管理/U_JYOrderCDOne.dfm | 47 ++++--- 打卷检验管理/U_JYOrderCDOne.pas | 9 +- 4 files changed, 135 insertions(+), 125 deletions(-) diff --git a/打卷检验管理/U_CKProductJYHZList.dfm b/打卷检验管理/U_CKProductJYHZList.dfm index dce50f0..cd297b4 100644 --- a/打卷检验管理/U_CKProductJYHZList.dfm +++ b/打卷检验管理/U_CKProductJYHZList.dfm @@ -384,6 +384,22 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList item Kind = skSum Column = v1Column12 + end + item + Kind = skSum + Column = Tv1Column1 + end + item + Kind = skSum + Column = Tv1Column3 + end + item + Kind = skSum + Column = Tv1Column2 + end + item + Kind = skSum + Column = Tv1Column4 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False diff --git a/打卷检验管理/U_CKProductJYHZList.pas b/打卷检验管理/U_CKProductJYHZList.pas index 1ff2db3..6357815 100644 --- a/打卷检验管理/U_CKProductJYHZList.pas +++ b/打卷检验管理/U_CKProductJYHZList.pas @@ -4,28 +4,26 @@ 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, dxSkinsCore, - dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, - dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, - dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, - dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, - dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, - dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, - dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, - dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, - dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, - dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, - dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, - dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; + 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, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, + dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, + dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, + dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, + dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, + dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmCKProductJYHZList = class(TForm) @@ -115,19 +113,15 @@ type procedure TBExportClick(Sender: TObject); procedure TBFindClick(Sender: TObject); procedure PRTCodeNameChange(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 @@ -138,93 +132,95 @@ 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(); begin try - ADOQueryMain.DisableControls; + ADOQueryMain.DisableControls; with ADOQueryMain do begin - Close; - sql.Clear; - Filtered:=False; + Close; + sql.Clear; + 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.CustomerNoName,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4,D.PIH, '); 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),'); - sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('SkcROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); - sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('KCROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); +// sql.Add('JQty=(select count(*) from WFB_MJJY X where X.SubId=A.SubId),'); + sql.Add('SUM(CASE WHEN A.ckflag = ''ѳ'' THEN A.mjlen ELSE 0 END) AS SCKROLL,'); + sql.Add('SUM(CASE WHEN A.ckflag = ''δ'' THEN A.mjlen ELSE 0 END) AS SkcROLL,'); + sql.Add(' COUNT(CASE WHEN A.ckflag = ''ѳ'' THEN 1 END) AS CKROLL,'); + sql.Add(' COUNT(CASE WHEN A.ckflag = ''δ'' THEN 1 END) AS KCROLL,'); sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)'); 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.CustomerNoName,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4,D.PIH'); Open; - //ShowMessage(SQL.Text); +// ShowMessage(SQL.Text); end; - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); finally ADOQueryMain.EnableControls; end; + tbfind.Click; 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; @@ -233,17 +229,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; @@ -252,28 +249,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; @@ -290,49 +286,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 d0aa42e..8fb7dbd 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -604,7 +604,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = OrderNoKeyPress end object MJFK: TEdit - Tag = 1 + Tag = 2 Left = 350 Top = 11 Width = 76 @@ -618,7 +618,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 12 + TabOrder = 11 OnChange = PRTCodeNameChange end object CDList: TEdit @@ -647,7 +647,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Height = 20 Style = csDropDownList ItemHeight = 12 - TabOrder = 13 + TabOrder = 12 Visible = False OnChange = PRTCodeNameChange Items.Strings = ( @@ -683,16 +683,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False OnClick = RadioGroup1Click end - object PRTColor: TComboBox - Tag = 1 - Left = 484 - Top = 34 - Width = 77 - Height = 20 - ItemHeight = 12 - TabOrder = 11 - OnChange = PRTColorChange - end object CheckBox1: TCheckBox Left = 697 Top = 107 @@ -705,7 +695,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 18 + TabOrder = 17 Visible = False end object MJType: TEdit @@ -714,7 +704,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Width = 93 Height = 20 ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 - TabOrder = 17 + TabOrder = 16 Visible = False end object BAOID: TEdit @@ -723,7 +713,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 14 + TabOrder = 13 OnChange = PRTCodeNameChange end object BAONO: TEdit @@ -750,7 +740,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 15 + TabOrder = 14 OnChange = PRTCodeNameChange end object gangno: TEdit @@ -768,7 +758,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 16 + TabOrder = 15 OnChange = PRTCodeNameChange end object CheckBox2: TCheckBox @@ -783,7 +773,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 19 + TabOrder = 18 end object BegDate: TDateTimePicker Left = 84 @@ -803,7 +793,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Height = 20 Style = csDropDownList ItemHeight = 12 - TabOrder = 20 + TabOrder = 19 OnChange = PRTCodeNameChange Items.Strings = ( '' @@ -823,7 +813,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 21 + TabOrder = 20 OnClick = CheckBox3Click end object PIH: TEdit @@ -832,16 +822,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 10 Width = 77 Height = 20 - TabOrder = 22 + TabOrder = 21 OnChange = PRTCodeNameChange end object CustomerNoName: TEdit - Tag = 1 + Tag = 2 Left = 350 Top = 35 Width = 76 Height = 20 - TabOrder = 23 + TabOrder = 22 OnChange = PRTCodeNameChange end object MJSJKZ: TEdit @@ -850,6 +840,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 10 Width = 77 Height = 20 + TabOrder = 23 + OnChange = PRTCodeNameChange + end + object PRTColor: TEdit + Tag = 2 + Left = 485 + Top = 33 + Width = 75 + Height = 20 TabOrder = 24 OnChange = PRTCodeNameChange end diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 42cb56d..229653f 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -94,7 +94,6 @@ type v1Column24: TcxGridDBColumn; RadioGroup1: TRadioGroup; MovePanel2: TMovePanel; - PRTColor: TComboBox; v1Column27: TcxGridDBColumn; v1Column28: TcxGridDBColumn; ToolButton2: TToolButton; @@ -233,6 +232,7 @@ type CDS_12: TClientDataSet; DataSource2: TDataSource; ADOQuery1: TADOQuery; + PRTColor: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -431,7 +431,7 @@ begin ADOQueryMain.EnableControls; // TV2.EndUpdate(); end; -// tbfind.Click; + tbfind.Click; end; procedure TfrmJYOrderCDOne.InitSum(); @@ -505,7 +505,7 @@ begin begin fsj := ' HXFlag=0 '; end - else if RadioGroup1.ItemIndex = 1 then + else if RadioGroup1.ItemIndex = 1 then begin fsj := ' HXFlag=1 '; end @@ -521,6 +521,7 @@ begin begin fsj := SGetFilters(Panel1, 1, 2) + ' and ' + fsj; end; +// ShowMessage(fsj); SDofilter(ADOQueryMain, fsj); SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); @@ -927,7 +928,7 @@ procedure TfrmJYOrderCDOne.Tv1CellClick(Sender: TcxCustomGridTableView; ACellVie begin if Order_Main.IsEmpty = False then begin - InitOrderColor(Trim(Order_Main.fieldbyname('MainId').AsString), PRTColor, ADOQueryTemp); +// InitOrderColor(Trim(Order_Main.fieldbyname('MainId').AsString), PRTColor, ADOQueryTemp); //InitBCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),AOrdDefStr1,ADOQueryTemp); //InitRCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),GangNo,ADOQueryTemp); end;