From 5ed14ec006f949dbd45779545e79e61e7a839362 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 20 Mar 2025 17:15:10 +0800 Subject: [PATCH] ~ --- 打卷检验管理/TradeManage.dof | 2 +- 打卷检验管理/U_JYOrderCDOne.dfm | 324 ++++++++++++++++++++++++---- 打卷检验管理/U_JYOrderCDOne.pas | 180 ++++++++++++++-- 打卷检验管理/U_MJManageNewFDNew.dfm | 46 +++- 打卷检验管理/U_MJManageNewFDNew.pas | 29 +-- 5 files changed, 502 insertions(+), 79 deletions(-) diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index c1ca8e6..fd1f39a 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\Ȩ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJquanchao\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 160079d..1fba060 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 296 - Top = 178 + Left = 302 + Top = 296 Width = 1400 Height = 757 Caption = #26816#39564#25253#21578 @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1384 - Height = 92 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -109,28 +109,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 - Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 0 - Top = 30 + Left = 671 + Top = 0 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 111 - Top = 30 + Left = 782 + Top = 0 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 222 - Top = 30 + Left = 893 + Top = 0 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -138,23 +137,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 345 - Top = 30 + Left = 1016 + Top = 0 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton15: TToolButton - Left = 456 - Top = 30 + Left = 1127 + Top = 0 AutoSize = True Caption = #20462#25913#31995#25968 ImageIndex = 54 + Wrap = True OnClick = ToolButton15Click end object ToolButton1: TToolButton - Left = 543 + Left = 0 Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 @@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 630 + Left = 87 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 717 + Left = 174 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -179,25 +179,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 816 + Left = 273 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 - Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 0 - Top = 60 + Left = 384 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 63 - Top = 60 + Left = 447 + Top = 30 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -211,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 131 - Top = 63 + Left = 515 + Top = 33 Width = 149 Height = 24 Style = csDropDownList @@ -236,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 280 - Top = 60 + Left = 664 + Top = 30 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -250,41 +249,48 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 401 - Top = 60 + Left = 785 + Top = 30 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 520 - Top = 60 + Left = 904 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 607 - Top = 60 + Left = 991 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 670 - Top = 60 + Left = 1054 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 OnClick = TBCloseClick end + object ToolButton16: TToolButton + Left = 1117 + Top = 30 + Caption = #25209#37327#20462#25913 + ImageIndex = 56 + OnClick = ToolButton16Click + end end object Panel1: TPanel Left = 0 - Top = 92 + Top = 62 Width = 1384 Height = 88 Align = alTop @@ -849,9 +855,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 180 + Top = 150 Width = 1384 - Height = 538 + Height = 568 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -1996,6 +2002,248 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Width = 121 end end + object Panel15: TPanel + Left = 838 + Top = 356 + Width = 359 + Height = 293 + Color = clSkyBlue + TabOrder = 15 + Visible = False + object Label39: TLabel + Left = 37 + Top = 37 + Width = 56 + Height = 14 + Caption = #26579#21378#32568#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object Label40: TLabel + Left = 37 + Top = 79 + Width = 28 + Height = 14 + Caption = #31995#25968 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object Label41: TLabel + Left = 37 + Top = 121 + Width = 49 + Height = 14 + Caption = #31867' '#22411 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object Label42: TLabel + Left = 37 + Top = 163 + Width = 42 + Height = 14 + Caption = #31561' '#32423 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object Label43: TLabel + Left = 37 + Top = 204 + Width = 49 + Height = 14 + Caption = #32568' '#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + Visible = False + end + object Button17: TButton + Left = 236 + Top = 28 + Width = 60 + Height = 25 + Caption = #20462#25913#21517#31216 + TabOrder = 0 + Visible = False + OnClick = Button3Click + end + object Button18: TButton + Left = 210 + Top = 246 + Width = 60 + Height = 25 + Caption = #20851#38381 + TabOrder = 1 + OnClick = Button18Click + end + object Button19: TButton + Left = 236 + Top = 71 + Width = 60 + Height = 25 + Caption = #20462#25913#39068#33394 + TabOrder = 2 + Visible = False + OnClick = Button5Click + end + object Edit_RG: TEdit + Left = 100 + Top = 35 + Width = 121 + Height = 20 + TabOrder = 3 + end + object Button20: TButton + Left = 236 + Top = 114 + Width = 60 + Height = 25 + Caption = #20462#25913#20928#37325 + TabOrder = 4 + Visible = False + OnClick = Button6Click + end + object Button21: TButton + Left = 236 + Top = 157 + Width = 60 + Height = 25 + Caption = #20462#25913#25968#37327 + TabOrder = 5 + Visible = False + OnClick = Button7Click + end + object Button22: TButton + Left = 237 + Top = 198 + Width = 60 + Height = 25 + Caption = #20462#25913#32568#21495 + TabOrder = 6 + Visible = False + OnClick = Button8Click + end + object Edit_C_MJstr4: TEdit + Left = 100 + Top = 202 + Width = 121 + Height = 20 + TabOrder = 7 + Visible = False + end + object CheckBox4: TCheckBox + Left = 12 + Top = 37 + Width = 20 + Height = 17 + TabOrder = 8 + end + object CheckBox5: TCheckBox + Left = 12 + Top = 79 + Width = 20 + Height = 17 + TabOrder = 9 + end + object CheckBox6: TCheckBox + Left = 12 + Top = 121 + Width = 20 + Height = 17 + TabOrder = 10 + end + object CheckBox7: TCheckBox + Left = 12 + Top = 163 + Width = 20 + Height = 17 + TabOrder = 11 + end + object CheckBox8: TCheckBox + Left = 12 + Top = 205 + Width = 20 + Height = 17 + TabOrder = 12 + Visible = False + end + object Button23: TButton + Left = 65 + Top = 246 + Width = 60 + Height = 25 + Caption = #20462#25913 + TabOrder = 13 + OnClick = Button23Click + end + object edit_DJ: TComboBox + Left = 100 + Top = 161 + Width = 81 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ItemHeight = 20 + ItemIndex = 0 + ParentFont = False + TabOrder = 14 + Text = #19968#31561#21697 + Items.Strings = ( + #19968#31561#21697 + #20108#31561#21697 + #19977#31561#21697 + #22235#31561#21697) + end + object edit_Grade: TComboBox + Left = 100 + Top = 113 + Width = 81 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ItemHeight = 20 + ParentFont = False + TabOrder = 15 + Text = #27491#21697 + Items.Strings = ( + #27491#21697 + #27425#21697) + end + object Edit_xs: TcxCurrencyEdit + Left = 100 + Top = 72 + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = '0.####' + Properties.Nullstring = '0' + TabOrder = 16 + Width = 121 + end + end object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid1 PopupMenus = <> diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 9a2dce5..92f5057 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -12,19 +12,19 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, 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; + 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) @@ -242,6 +242,30 @@ type Label38: TLabel; DJ: TComboBox; Tv1Column5: TcxGridDBColumn; + ToolButton16: TToolButton; + Panel15: TPanel; + Label39: TLabel; + Label40: TLabel; + Label41: TLabel; + Label42: TLabel; + Label43: TLabel; + Button17: TButton; + Button18: TButton; + Button19: TButton; + Edit_RG: TEdit; + Button20: TButton; + Button21: TButton; + Button22: TButton; + Edit_C_MJstr4: TEdit; + CheckBox4: TCheckBox; + CheckBox5: TCheckBox; + CheckBox6: TCheckBox; + CheckBox7: TCheckBox; + CheckBox8: TCheckBox; + Button23: TButton; + edit_DJ: TComboBox; + edit_Grade: TComboBox; + Edit_xs: TcxCurrencyEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -307,6 +331,9 @@ type procedure ToolButton15Click(Sender: TObject); procedure Button16Click(Sender: TObject); procedure Button15Click(Sender: TObject); + procedure ToolButton16Click(Sender: TObject); + procedure Button23Click(Sender: TObject); + procedure Button18Click(Sender: TObject); // procedure Edit5Click(Sender: TObject); // procedure CheckBox3Click(Sender: TObject); private @@ -416,7 +443,7 @@ begin sql.Add('select A.*,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,'); SQL.Add('LLMS=CAST( xs*mjqty4 as decimal(18,1) ),'); - sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); + sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); SQL.Add('from WFB_MJJY A'); @@ -1373,11 +1400,12 @@ begin LBName := RadioGroup2.Items.Strings[RadioGroup2.ItemIndex]; fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; ExportFtErpFile(Trim(LBName) + '.rmf', ADOQueryCmd); - + with ADOQueryCmd do begin Close; sql.Clear; + sql.Add('delete TBSubID where DName=''' + Trim(DCode) + ''''); ExecSQL; end; @@ -1418,7 +1446,7 @@ begin ADOQueryCmd.fieldbyname('Dname').Value := Trim(DCode); ADOQueryCmd.post; end; - Next; + Next; end; end; ADOQueryCmd.Connection.CommitTrans; @@ -1428,7 +1456,7 @@ begin Order_Main.EnableControls; with ADOQueryCmd do - begin + begin Close; sql.Clear; sql.add('exec P_Do_Print_JYBB '); @@ -1446,7 +1474,7 @@ begin sql.Clear; sql.add('exec P_Do_PrintMd_HZ_copy1 '); sql.add('@mainID=' + quotedstr(Trim(''))); - sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; end; @@ -2399,7 +2427,7 @@ end; procedure TfrmJYOrderCDOne.Button15Click(Sender: TObject); begin -if Order_Main.IsEmpty then + if Order_Main.IsEmpty then Exit; if Order_Main.Locate('SSel', True, []) = False then begin @@ -2427,7 +2455,7 @@ if Order_Main.IsEmpty then end; end; Next; - end; + end; end; ADOQueryCmd.Connection.CommitTrans; Order_Main.EnableControls; @@ -2441,5 +2469,117 @@ if Order_Main.IsEmpty then end; end; +procedure TfrmJYOrderCDOne.ToolButton16Click(Sender: TObject); +begin + Panel15.Left := (self.Width - Panel15.Width) div 2; + Panel15.Visible := True; +end; + +procedure TfrmJYOrderCDOne.Button23Click(Sender: TObject); +begin + if (trim(Edit_RG.Text) = '') and checkbox4.Checked then + begin + application.MessageBox('Ⱦ׺ŲΪգ', 'ʾϢ', 0); + exit; + end; + if (trim(Edit_xs.Text) = '') and checkbox5.Checked then + begin + application.MessageBox('ɫΪգ', 'ʾϢ', 0); + exit; + end; + if (trim(edit_Grade.Text) = '') and checkbox6.Checked then + begin + application.MessageBox('ͲΪգ', 'ʾϢ', 0); + exit; + end; + if (trim(edit_DJ.Text) = '') and checkbox7.Checked then + begin + application.MessageBox('ȼΪգ', 'ʾϢ', 0); + exit; + end; +// if (trim(Edit_C_MJstr4.Text) = '') and checkbox6.Checked then +// begin +// application.MessageBox('׺ŲΪգ', 'ʾϢ', 0); +// exit; +// end; + + try + ADOQueryCmd.Connection.BeginTrans; + with Order_Main do + begin + while Order_Main.Locate('SSel', True, []) do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + if checkbox4.Checked then + begin + sql.Add('update WFB_MJJY SET RG=''' + trim(Edit_RG.Text) + ''' where MJID=''' + trim(Order_Main.fieldbyname('MJID').AsString) + ''' '); + end; + if CheckBox5.Checked then + begin + sql.Add('update WFB_MJJY SET XS=''' + trim(Edit_xs.Text) + ''' where MJID=''' + trim(Order_Main.fieldbyname('MJID').AsString) + ''' '); + end; + if CheckBox6.Checked then + begin + sql.Add('update WFB_MJJY SET MJType=''' + trim(edit_Grade.Text) + ''' where MJID=''' + trim(Order_Main.fieldbyname('MJID').AsString) + ''' '); + end; + if CheckBox7.Checked then + begin + sql.Add('update WFB_MJJY SET DJ=''' + trim(edit_DJ.Text) + ''' where MJID=''' + trim(Order_Main.fieldbyname('MJID').AsString) + ''' '); + end; +// if CheckBox6.Checked then +// begin +// sql.Add('update WFB_MJJY SET MJstr4=''' + trim(Edit_C_MJstr4.Text) + ''' where MJID=''' + trim(CDS_Main.fieldbyname('MJID').AsString) + ''' '); +// end; + ExecSQL; + end; + Edit; + FieldByName('SSel').Value := False; + if CheckBox4.Checked then + begin + FieldByName('RG').Value := Trim(Edit_RG.Text); + end; + if CheckBox5.Checked then + begin + FieldByName('XS').Value := Trim(Edit_XS.Text); + end; + if CheckBox6.Checked then + begin + FieldByName('MJType').Value := Trim(edit_Grade.Text); + end; + if CheckBox7.Checked then + begin + FieldByName('DJ').Value := Trim(edit_DJ.Text); + end; +// if CheckBox6.Checked then +// begin +// FieldByName('MJstr4').Value := Trim(Edit_C_MJstr4.Text); +// end; + + Post; + end; + end; + ADOQueryCmd.Connection.CommitTrans; + Application.MessageBox('ɹ!', 'ʾ', 0); + Panel2.Visible := false; + Edit_RG.Text := ''; + Edit_xs.Text := ''; + edit_Grade.Text := ''; + edit_DJ.Text := ''; +// Edit_C_MJstr4.Text := ''; + Exit; + except + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('쳣!', 'ʾ', 0); + end; +end; + +procedure TfrmJYOrderCDOne.Button18Click(Sender: TObject); +begin + Panel15.Visible := False; +end; + end. diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 6a23c49..90b34cf 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label22: TLabel Left = 144 - Top = 464 + Top = 457 Width = 36 Height = 22 Caption = 'g/'#13217 @@ -1143,7 +1143,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label23: TLabel Left = 8 - Top = 463 + Top = 456 Width = 42 Height = 20 Caption = #20811#37325 @@ -1364,11 +1364,25 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Style = [fsBold] ParentFont = False end + object Label61: TLabel + Left = 3 + Top = 488 + Width = 42 + Height = 20 + Caption = #22791#27880 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object MJFK: TEdit Left = 51 Top = 417 Width = 90 - Height = 41 + Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1414,9 +1428,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object BTPrint: TButton Left = 10 - Top = 500 + Top = 521 Width = 171 - Height = 93 + Height = 72 Caption = #25552#20132 Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1479,9 +1493,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJSJKZ: TEdit Left = 51 - Top = 458 + Top = 451 Width = 90 - Height = 41 + Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1754,6 +1769,23 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF #19977#31561#21697 #22235#31561#21697) end + object note: TEdit + Left = 49 + Top = 485 + Width = 174 + Height = 36 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -28 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 + ParentFont = False + TabOrder = 24 + OnClick = MJXHClick + OnExit = MJStr4Exit + OnKeyPress = MJstr3KeyPress + end end object MovePanel1: TMovePanel Left = 658 diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index afed67a..887d483 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -13,18 +13,17 @@ uses MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI, 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; + 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 TfrmMJManageNewFDNewSF = class(TForm) @@ -276,6 +275,8 @@ type Label60: TLabel; ADOQuery2: TADOQuery; DJ: TComboBox; + Label61: TLabel; + note: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -1040,6 +1041,7 @@ begin FieldByName('APId').value := Trim(FAPId); FieldByName('MJID').Value := Trim(maxno); FieldByName('MJStr2').Value := 'δ'; + FieldByName('note').Value := Trim(note.text); FieldByName('MJBanZu').Value := Trim(FBanZu); FieldByName('MJstr3').Value := Trim(MJstr3.Text); FieldByName('MJstr4').Value := Trim(MJstr4.Text); @@ -2806,6 +2808,7 @@ begin end; MJFK.Text := Trim(ADOTmp.fieldbyname('MJFK').AsString); MJSJKZ.Text := Trim(ADOTmp.fieldbyname('MJSJKZ').AsString); + note.Text := Trim(ADOTmp.fieldbyname('note').AsString); MJQty1.Text := Trim(ADOTmp.fieldbyname('MJQty1').AsString); MJQty2.Text := Trim(ADOTmp.fieldbyname('MJQty2').AsString); @@ -3112,7 +3115,7 @@ begin begin Edit7.Text := ''; if not IsCommOpen then - OpenCom(JCYDLL); + OpenCom(JCYDLL); IsJsMessage := true; end;