From 8d628b933697fe87d3118cd823aa219171d8bcc4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 17 Mar 2026 09:01:06 +0800 Subject: [PATCH] 1234 --- 打卷检验管理/TradeManage.dof | 2 +- 打卷检验管理/TradeManage.dpr | 24 ++++++---- 打卷检验管理/U_JYOrderCDOne.dfm | 71 +++++++++++++++-------------- 打卷检验管理/U_JYOrderCDOne.pas | 3 +- 打卷检验管理/U_MJManageNewFDNew.pas | 11 +++-- 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index a6e8bfb..1c1459f 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\D7DJxiaoqiang\\testDll.exe +HostApplication=D:\D7W\Ŀ\D7DJxiaoqiang\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/TradeManage.dpr b/打卷检验管理/TradeManage.dpr index ab999ad..88ddb0b 100644 --- a/打卷检验管理/TradeManage.dpr +++ b/打卷检验管理/TradeManage.dpr @@ -1,12 +1,14 @@ library TradeManage; + uses SysUtils, classes, forms, WinTypes, WinProcs, + midaslib, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, - U_GetDllForm in 'U_GetDllForm.pas', + U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\..\..\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, U_SelExportField in '..\..\..\ThreeFun\Fun\U_SelExportField.pas' {frmSelExportField}, U_ColumnSet in '..\..\..\ThreeFun\Form\U_ColumnSet.pas' {frmColumnSet}, @@ -53,7 +55,7 @@ uses {$R *.res} -procedure DllEnterPoint(dwReason: DWORD);far;stdcall; +procedure DllEnterPoint(dwReason: DWORD); far; stdcall; begin DLLProc := @DLLEnterPoint; DllEnterPoint(DLL_PROCESS_ATTACH); @@ -64,14 +66,16 @@ begin // if (Reason = DLL_PROCESS_DETACH) or (Reason=DLL_THREAD_DETACH) then // Application:=NewDllApp; end; -exports - GetDllForm; -begin - try - NewDllApp:=Application; - DLLProc := @DLLUnloadProc; - except - end; +exports + GetDllForm; + +begin + try + NewDllApp := Application; + DLLProc := @DLLUnloadProc; + except + + end; end. diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 4e7cbac..0738147 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1384 - Height = 62 + Height = 92 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -110,34 +110,35 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne AutoSize = True Caption = #25764#38144#20986#24211 ImageIndex = 86 + Wrap = True OnClick = ToolButton7Click end object ToolButton11: TToolButton - Left = 639 - Top = 0 + Left = 0 + Top = 30 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 758 - Top = 0 + Left = 119 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 869 - Top = 0 + Left = 230 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 980 - Top = 0 + Left = 341 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -145,16 +146,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 1103 - Top = 0 + Left = 464 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 - Wrap = True OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 0 + Left = 575 Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 @@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 87 + Left = 662 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 174 + Left = 749 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -178,24 +178,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 273 + Left = 848 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 + Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 384 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 447 - Top = 30 + Left = 63 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -209,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 515 - Top = 33 + Left = 131 + Top = 63 Width = 149 Height = 24 Style = csDropDownList @@ -234,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 664 - Top = 30 + Left = 280 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -248,32 +249,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 785 - Top = 30 + Left = 401 + Top = 60 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 904 - Top = 30 + Left = 520 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 991 - Top = 30 + Left = 607 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1054 - Top = 30 + Left = 670 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -282,7 +283,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -805,9 +806,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 150 + Top = 180 Width = 1384 - Height = 568 + Height = 538 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 427a2a0..6e2ec2b 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1159,6 +1159,7 @@ begin sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), '); sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), '); sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); + sql.Add('SORDDEFSTR5=DBO.F_Get_Order_SubStr(BaoID,''SORDDEFSTR5''), '); sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); @@ -1625,7 +1626,7 @@ begin end; end; if (trim(ComboBox1.Text) = '뵥') then - begin + begin with ADOQueryTemp do begin Close; diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index 603224f..82f7bd3 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -1,8 +1,8 @@ unit U_MJManageNewFDNew; -interface +interface -uses +uses Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, cxCalendar, cxGridLevel, @@ -14900,13 +14900,13 @@ begin begin for i := 0 to ControlCount - 1 do begin - if Controls[i] is TSpeedButton then + if Controls[i] is TSpeedButton then begin TSpeedButton(Controls[i]).Hint := Trim(TEdit(Sender).Name); end; end; end; - Panel1.Visible := True; + Panel1.Visible := True; end; procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject); @@ -15148,6 +15148,7 @@ begin sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), '); sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), '); sql.Add('KHORDERNO=DBO.F_Get_Order_SubStr(BaoID,''BNKHORDERNO''), '); + sql.Add('SORDDEFSTR5=DBO.F_Get_Order_SubStr(BaoID,''SORDDEFSTR5''), '); sql.Add('PRTCODENAME=DBO.F_Get_Order_SubStr(BaoID,''BNPRTCODENAME''), '); sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), '); sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); @@ -18444,7 +18445,7 @@ begin end else exit; - + if Trim(Edit6.Text) = '' then begin PrtData(FFFMJID);