From 25b142e907090ecb4eed53844cc6feb695d13d88 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 30 Apr 2026 19:08:10 +0800 Subject: [PATCH] 20260430 --- 打卷检验管理/U_JYOrderCDOne.dfm | 12 ++--- 打卷检验管理/U_JYOrderCDOne.pas | 42 +++++++++++----- 打卷检验管理/U_ProductOrderNewList.dfm | 66 +++++++++++++------------- 打卷检验管理/U_ProductOrderNewList.pas | 15 +++++- 4 files changed, 84 insertions(+), 51 deletions(-) diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index a6985b8..3fb6511 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 296 - Top = 178 + Left = 292 + Top = 351 Width = 1400 Height = 757 Caption = #26816#39564#25253#21578 @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1384 + Width = 1392 Height = 62 AutoSize = True ButtonHeight = 30 @@ -268,7 +268,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1384 + Width = 1392 Height = 88 Align = alTop BevelInner = bvRaised @@ -783,8 +783,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1384 - Height = 568 + Width = 1392 + Height = 576 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index fa0c776..1dcb1f2 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1621,15 +1621,13 @@ begin sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; - end; + end; end; - if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥(ɫ)') - or (trim(ComboBox1.Text) = '뵥(ų)') or (trim(ComboBox1.Text) = '뵥(ų)') - or (trim(ComboBox1.Text) = '뵥(ɫųȰ)') then + if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥(ɫ)') or (trim(ComboBox1.Text) = '뵥(ų)') or (trim(ComboBox1.Text) = '뵥(ų)') or (trim(ComboBox1.Text) = '뵥(ɫųȰ)') then begin - with ADOQueryTemp do + with ADOQueryTemp do begin - Close; + Close; sql.Clear; sql.add('exec P_Print_CKMDYDL_B '); sql.add('@DName=' + quotedstr(Trim(DCode))); @@ -1649,8 +1647,7 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') - or (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin @@ -1659,7 +1656,7 @@ begin sql.add('exec P_Print_CKMDYDL '); sql.add('@DName=' + quotedstr(Trim(DCode))); Open; - end; + end; SCreateCDS20(ADOQueryTemp, CDS_HZ); SInitCDSData20(ADOQueryTemp, CDS_HZ); @@ -1706,9 +1703,8 @@ begin begin Close; sql.Clear; - sql.add('exec P_Print_CKMD '); - sql.add('@mainID=' + quotedstr(Trim(''))); - sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add('exec P_Print_CKMDYH '); + sql.add('@DName=' + quotedstr(Trim(DCode))); Open; end; SCreateCDS20(ADOQueryTemp, CDS_HZ); @@ -1724,6 +1720,28 @@ begin sql.add(',@flag=''2'' '); Open; end; +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.add('exec P_Print_CKMD '); +// sql.add('@mainID=' + quotedstr(Trim(''))); +// sql.add(',@DName=' + quotedstr(Trim(DCode))); +// Open; +// end; +// SCreateCDS20(ADOQueryTemp, CDS_HZ); +// SInitCDSData20(ADOQueryTemp, CDS_HZ); +// +// with ADOQueryPrint do +// begin +// Close; +// sql.Clear; +// sql.add('exec P_Do_PrintMd_HZ '); +// sql.add('@mainID=' + quotedstr(Trim(''))); +// sql.add(',@DName=' + quotedstr(Trim(DCode))); +// sql.add(',@flag=''2'' '); +// Open; +// end; end; if FileExists(fPrintFile) then begin diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm index cc20e5f..bcd3696 100644 --- a/打卷检验管理/U_ProductOrderNewList.dfm +++ b/打卷检验管理/U_ProductOrderNewList.dfm @@ -20,7 +20,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 + 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,8 +188,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1366 + Top = 62 + Width = 1374 Height = 40 Align = alTop BevelInner = bvRaised @@ -415,8 +417,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxGrid1: TcxGrid Left = 0 - Top = 95 - Width = 1366 + Top = 125 + Width = 1374 Height = 333 Align = alTop TabOrder = 3 @@ -764,8 +766,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 451 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -773,8 +775,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 459 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -782,7 +784,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 @@ -1097,7 +1099,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1126,8 +1128,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxTabControl1: TcxTabControl Left = 0 - Top = 72 - Width = 1366 + Top = 102 + Width = 1374 Height = 23 Align = alTop TabOrder = 2 @@ -1140,7 +1142,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas index 39022d2..db91e14 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)