From 356aade20f0d2e9cb4a479e37a41e8c9e981dae9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 21 Nov 2025 09:36:42 +0800 Subject: [PATCH] ~ --- 打卷检验管理/U_JYOrderCDOne.dfm | 73 +++++++++++++++-------------- 打卷检验管理/U_JYOrderCDOne.pas | 4 +- 打卷检验管理/U_MJManageNewFDNew.pas | 44 ++++++++++------- 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 97d2f6f..21ed6d4 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 @@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 + Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 608 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 719 - Top = 0 + Left = 111 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 830 - Top = 0 + Left = 222 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -129,24 +130,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 953 - Top = 0 + Left = 345 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 1064 - Top = 0 + Left = 456 + Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 ImageIndex = 96 - Wrap = True OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 0 + Left = 543 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 87 + Left = 630 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -163,24 +163,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 186 + Left = 729 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 + Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 297 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 360 - Top = 30 + Left = 63 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -194,8 +195,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 428 - Top = 33 + Left = 131 + Top = 63 Width = 149 Height = 24 Style = csDropDownList @@ -219,8 +220,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 577 - Top = 30 + Left = 280 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -233,40 +234,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 698 - Top = 30 + Left = 401 + Top = 60 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 817 - Top = 30 + Left = 520 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 904 - Top = 30 + Left = 607 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object ToolButton14: TToolButton - Left = 967 - Top = 30 + Left = 670 + Top = 60 AutoSize = True Caption = #36716#21333 ImageIndex = 56 OnClick = ToolButton14Click end object TBClose: TToolButton - Left = 1030 - Top = 30 + Left = 733 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -275,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -790,9 +791,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 fe04ae1..a2552ad 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1641,7 +1641,7 @@ begin Close; sql.Clear; sql.add('exec P_Do_PrintMd_HZ '); - sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; @@ -1653,7 +1653,7 @@ begin begin Close; sql.Clear; - sql.add('exec P_Print_CKMD '); + sql.add('exec P_Print_CKMD_MY '); sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); Open; diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index adeadc3..abdc824 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -319,16 +319,16 @@ type procedure Edit12Click(Sender: TObject); procedure Timer1Timer(Sender: TObject); procedure TBCDClick(Sender: TObject); - procedure Edit5Click(Sender: TObject); + procedure Edit5Click(Sender: TObject); private { Private declarations } FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer; FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string; FJZ, FJC, FDC: Double; - fRollType, fRollType1, fbaotype, fbaosx, FPRTdqdw,FDJDW: string; + fRollType, fRollType1, fbaotype, fbaosx, FPRTdqdw, FDJDW: string; isCommopen, IsJsMessage: boolean; MValue, FCDName, MggCDFalg: string; - fxsws, fxsws1: string; + fxsws, fxsws1: string; procedure InitJP(); procedure InitCDGrid(); procedure InitCDGridID(); @@ -464,17 +464,17 @@ begin if (trim(Edit7.Text) = '') then begin MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]); - if FPRTdqdw = '' then - begin - Label9.Caption := FDJDW; - end +// if FPRTdqdw = '' then +// begin +// Label9.Caption := FDJDW; +// end +// else +// begin + if i2 = 0 then + Label9.Caption := 'M' else - begin - if i2 = 0 then - Label9.Caption := 'M' - else - Label9.Caption := 'Y'; - end; + Label9.Caption := 'Y'; +// end; edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]); end; @@ -899,7 +899,7 @@ end; function TfrmMJManageNewFDNewSF.SaveData(): Boolean; var maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string; - FMJLen: Double; + FMJLen, MFMJLen: Double; FOrder: Integer; begin @@ -1056,7 +1056,19 @@ begin end else begin - FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; +// FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; + MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; + if Label9.Caption = 'M' then + begin + FieldByName('MJLen').Value := MFMJLen; + FieldByName('MJMa').Value := format('%.' + trim(fxsws) + 'f', [MFMJLen / 0.9144]); + + end + else + begin + FieldByName('MJMa').Value := MFMJLen; + FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [MFMJLen * 0.9144]); + end; end; FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); @@ -2470,7 +2482,7 @@ begin Label2.Visible := true; Label2.Caption := ':' + Trim(ADOTmp.fieldbyname('PRTHX').AsString); end; - + FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString); FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString); FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);