From b3618ba9db2cb8f81160455adf195269091c399e Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 11 Sep 2025 16:22:39 +0800 Subject: [PATCH] ~ --- 复合检验管理/U_JYOrderCDOne.dfm | 91 ++++++++++++++++------------- 复合检验管理/U_JYOrderCDOne.pas | 5 +- 复合检验管理/U_MJManageNewFDNew.pas | 9 ++- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index 16c2932..30e8d26 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 = 122 AutoSize = True ButtonHeight = 30 ButtonWidth = 161 @@ -95,59 +95,60 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne AutoSize = True Caption = #25764#38144#20986#24211 ImageIndex = 86 + Wrap = True OnClick = ToolButton7Click end object ToolButton15: TToolButton - Left = 489 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#23458#25143#21697#21517#39068#33394' ' ImageIndex = 57 OnClick = ToolButton15Click end object ToolButton16: TToolButton - Left = 654 - Top = 0 + Left = 165 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#21333#20215 ImageIndex = 54 OnClick = ToolButton16Click end object ToolButton17: TToolButton - Left = 765 - Top = 0 + Left = 276 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#32440#31649#34955#23376#21333#20215 ImageIndex = 56 OnClick = ToolButton17Click end object ToolButton11: TToolButton - Left = 924 - Top = 0 + Left = 435 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 1035 - Top = 0 + Left = 546 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 1146 - Top = 0 + Left = 657 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 1257 - Top = 0 + Left = 768 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -157,7 +158,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ToolButton8: TToolButton Left = 0 - Top = 30 + Top = 60 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 @@ -165,7 +166,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ToolButton14: TToolButton Left = 111 - Top = 30 + Top = 60 AutoSize = True Caption = #25209#37327#20462#25913#31995#25968 ImageIndex = 54 @@ -173,7 +174,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ToolButton1: TToolButton Left = 222 - Top = 30 + Top = 60 AutoSize = True Caption = #25171#21360#26631#31614 ImageIndex = 96 @@ -181,7 +182,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object TCPDB: TToolButton Left = 309 - Top = 30 + Top = 60 AutoSize = True Caption = #25104#21697#25171#21253 ImageIndex = 57 @@ -190,7 +191,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ToolButton3: TToolButton Left = 396 - Top = 30 + Top = 60 AutoSize = True Caption = #25171#21360#21253#26631#31614 ImageIndex = 12 @@ -199,16 +200,17 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ToolButton2: TToolButton Left = 495 - Top = 30 + Top = 60 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 + Wrap = True Visible = False OnClick = ToolButton2Click end object Edit3: TEdit - Left = 606 - Top = 30 + Left = 0 + Top = 90 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -222,8 +224,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 674 - Top = 33 + Left = 68 + Top = 93 Width = 149 Height = 24 Style = csDropDownList @@ -247,16 +249,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object ToolButton5: TToolButton - Left = 823 - Top = 30 + Left = 217 + Top = 90 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit4: TEdit - Left = 886 - Top = 30 + Left = 280 + Top = 90 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -269,8 +271,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 1007 - Top = 30 + Left = 401 + Top = 90 AutoSize = True Caption = #20462#25913#30721#21333 ImageIndex = 54 @@ -278,24 +280,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 1094 - Top = 30 + Left = 488 + Top = 90 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 1181 - Top = 30 + Left = 575 + Top = 90 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1244 - Top = 30 + Left = 638 + Top = 90 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -304,7 +306,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 122 Width = 1384 Height = 88 Align = alTop @@ -871,9 +873,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 173 + Top = 233 Width = 1384 - Height = 545 + Height = 485 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -1252,6 +1254,13 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column11: TcxGridDBColumn + Caption = #21462#25972#31859#25968 + DataBinding.FieldName = 'QZMJLen' + Visible = False + HeaderAlignmentHorz = taCenter + Width = 20 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -2091,7 +2100,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxTabControl1: TcxTabControl Left = 0 - Top = 150 + Top = 210 Width = 1384 Height = 23 Align = alTop diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index 1dc66a2..82523c1 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -280,6 +280,7 @@ type RMDB_3: TRMDBDataSet; RM33: TRMGridReport; Edit7: TEdit; + Tv1Column11: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -1728,12 +1729,12 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd_HZ '); + sql.add('exec P_Do_PrintMd_HZ '); sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''13'' '); Open; - end; + end; end; if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥(ȡ)') or (trim(ComboBox1.Text) = '뵥') then begin diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index de3c32b..be06bc2 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -645,7 +645,7 @@ begin i1 := Message.WParam; i2 := Message.LParam; if IsJsMessage then - begin + begin if trim(Edit9.Text) = '' then begin // MJMaoZ.Text := format('%.3f', [i1 / 100000]); @@ -1292,15 +1292,18 @@ begin begin FieldByName('MJLen').value := FDC; end - else - begin + else + begin if StrToFloatdef(trim(mbxs.Text), 1) > 0 then begin FieldByName('MJLen').value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / StrToFloatdef(trim(mbxs.Text), 1)) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); + FieldByName('QZMJLen').value := format('%.0f', [(StrToFloatdef(trim(MJLen.Text), 0) / StrToFloatdef(trim(mbxs.Text), 1)) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); end else begin FieldByName('MJLen').value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); + FieldByName('QZMJLen').value := format('%.0f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); + // FieldByName('Sjcd').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0)]); end; // FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen1.Text), 0) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc;