From 677a2fc6b3f6fb8a840a9abc49c386cdac5b8ada Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 5 Feb 2026 17:23:20 +0800 Subject: [PATCH] ~ --- 检验管理/TradeManage.dpr | 4 ++-- 检验管理/U_JYOrderCDOne.pas | 33 +++++++++++++++++++++--------- 检验管理/U_ProductOrderNewList.dfm | 6 +++--- 检验管理/U_ProductOrderNewList.pas | 28 +++++++++++++++++++++---- 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/检验管理/TradeManage.dpr b/检验管理/TradeManage.dpr index e300ec3..2035220 100644 --- a/检验管理/TradeManage.dpr +++ b/检验管理/TradeManage.dpr @@ -2,9 +2,9 @@ library TradeManage; uses SysUtils, classes, - forms, + forms, WinTypes, - WinProcs, + WinProcs, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\..\..\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index a940427..bbfe4b3 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer,ShellAPI, - cxCurrencyEdit,MMSystem; + cxCurrencyEdit,MMSystem, 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 TfrmJYOrderCDOne = class(TForm) @@ -821,7 +834,7 @@ begin ADOQueryMain.DisableControls; with ADOQueryMain do begin - Close; + Close; Filtered := False; sql.Clear; sql.Add('select A.*,'); @@ -832,20 +845,20 @@ begin sql.Add('inner join JYOrder_sub B on B.subID=A.subID '); sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID '); sql.Add('where C.orderNo=' + quotedstr(trim(orderNo.Text))); - if CheckBox2.Checked = True then - begin - sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); - sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); - end; - Open; - end; +// if CheckBox2.Checked = True then +// begin +// sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); +// sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); +// end; + Open; + end; SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally ADOQueryMain.EnableControls; end; MovePanel2.Visible := False; - // JSbaoNum(); + JSbaoNum(); end; end; diff --git a/检验管理/U_ProductOrderNewList.dfm b/检验管理/U_ProductOrderNewList.dfm index 96bcdf2..ecd1f16 100644 --- a/检验管理/U_ProductOrderNewList.dfm +++ b/检验管理/U_ProductOrderNewList.dfm @@ -1,6 +1,6 @@ object frmProductOrderNewList: TfrmProductOrderNewList - Left = -8 - Top = -8 + Left = 218 + Top = 89 Width = 1382 Height = 754 Caption = #21253#35013#25351#31034#21333 @@ -405,8 +405,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + OnCellClick = Tv1CellClick OnCellDblClick = Tv1CellDblClick - OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> diff --git a/检验管理/U_ProductOrderNewList.pas b/检验管理/U_ProductOrderNewList.pas index 2fd2fc3..3d4ebde 100644 --- a/检验管理/U_ProductOrderNewList.pas +++ b/检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, 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 TfrmProductOrderNewList = class(TForm) @@ -186,6 +199,7 @@ type procedure ToolButton4Click(Sender: TObject); procedure TV2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure ToolButton5Click(Sender: TObject); + procedure Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); private DQdate: TDateTime; procedure InitGrid(); @@ -234,7 +248,8 @@ end; procedure TfrmProductOrderNewList.InitImage(fwbid: string); begin ADOQueryImage.close; - if fwbid = '' then exit; + if fwbid = '' then + exit; with ADOQueryImage do begin close; @@ -831,7 +846,7 @@ begin fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; with ADOQueryPrint do begin - Close; + Close; sql.Clear; sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId), '); sql.add('row_number() over(order by B.subID DESC)AS Row,'); @@ -855,7 +870,7 @@ begin // SQL.Add('from #Table1 A'); // SQL.Add('drop table #Table1'); // showmessage(sql.text); - Open; + Open; end; SCreateCDS20(ADOQueryPrint, CDS_Print); SInitCDSData20(ADOQueryPrint, CDS_Print); @@ -1068,5 +1083,10 @@ begin end; end; +procedure TfrmProductOrderNewList.Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +begin + InitSub(); +end; + end.