From 0420c5d3212e03d8446918433f01c7814000eb06 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 2 Dec 2025 13:31:18 +0800 Subject: [PATCH] 1 --- 打卷检验管理/TradeManage.dof | 3 - 打卷检验管理/U_JYOrderCDOne.dfm | 110 ++++++++++++++++++++++++-------- 打卷检验管理/U_JYOrderCDOne.pas | 65 +++++++++++++++++-- 3 files changed, 144 insertions(+), 34 deletions(-) diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index fd1f39a..c41508c 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -136,6 +136,3 @@ ProductVersion=1.0.0.0 Comments= [Excluded Packages] c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index ad5d516..a3550e3 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 302 - Top = 296 + Left = 196 + Top = 135 Width = 1400 Height = 757 Caption = #26816#39564#25253#21578 @@ -221,10 +221,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [] ItemHeight = 16 - ItemIndex = 0 ParentFont = False TabOrder = 0 - Text = #26816#39564#30721#21333'('#33521#25991')' OnChange = ComboBox1Change Items.Strings = ( #26816#39564#30721#21333'('#33521#25991')' @@ -587,6 +585,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Style = [fsBold] ParentFont = False end + object Label45: TLabel + Left = 906 + Top = 63 + Width = 38 + Height = 19 + Caption = #37329#39069 + Font.Charset = GB2312_CHARSET + Font.Color = clRed + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end object EndDate: TDateTimePicker Left = 84 Top = 34 @@ -868,6 +879,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnCellDblClick = Tv1CellDblClick DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < item @@ -904,6 +916,10 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne item Kind = skCount Column = v1Column23 + end + item + Kind = skSum + Column = Tv1Column3 end> DataController.Summary.SummaryGroups = <> OptionsView.Footer = True @@ -1187,6 +1203,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column7: TcxGridDBColumn + Caption = #33853#33394 + DataBinding.FieldName = 'LS' + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -2021,7 +2043,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False object Label39: TLabel Left = 37 - Top = 37 + Top = 33 Width = 56 Height = 14 Caption = #26579#21378#32568#21495 @@ -2034,7 +2056,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Label40: TLabel Left = 37 - Top = 79 + Top = 75 Width = 28 Height = 14 Caption = #31995#25968 @@ -2047,7 +2069,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Label41: TLabel Left = 37 - Top = 121 + Top = 117 Width = 49 Height = 14 Caption = #31867' '#22411 @@ -2060,7 +2082,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Label42: TLabel Left = 37 - Top = 163 + Top = 159 Width = 42 Height = 14 Caption = #31561' '#32423 @@ -2073,7 +2095,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Label43: TLabel Left = 37 - Top = 204 + Top = 200 Width = 49 Height = 14 Caption = #32568' '#21495 @@ -2083,11 +2105,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [] ParentFont = False - Visible = False + end + object Label44: TLabel + Left = 37 + Top = 200 + Width = 49 + Height = 14 + Caption = #33853' '#33394 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False end object Button17: TButton Left = 236 - Top = 28 + Top = 24 Width = 60 Height = 25 Caption = #20462#25913#21517#31216 @@ -2106,7 +2140,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Button19: TButton Left = 236 - Top = 71 + Top = 67 Width = 60 Height = 25 Caption = #20462#25913#39068#33394 @@ -2116,14 +2150,14 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Edit_RG: TEdit Left = 100 - Top = 35 + Top = 31 Width = 121 Height = 20 TabOrder = 3 end object Button20: TButton Left = 236 - Top = 114 + Top = 110 Width = 60 Height = 25 Caption = #20462#25913#20928#37325 @@ -2133,7 +2167,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Button21: TButton Left = 236 - Top = 157 + Top = 153 Width = 60 Height = 25 Caption = #20462#25913#25968#37327 @@ -2143,7 +2177,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Button22: TButton Left = 237 - Top = 198 + Top = 194 Width = 60 Height = 25 Caption = #20462#25913#32568#21495 @@ -2153,47 +2187,45 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Edit_C_MJstr4: TEdit Left = 100 - Top = 202 + Top = 198 Width = 121 Height = 20 TabOrder = 7 - Visible = False end object CheckBox4: TCheckBox Left = 12 - Top = 37 + Top = 33 Width = 20 Height = 17 TabOrder = 8 end object CheckBox5: TCheckBox Left = 12 - Top = 79 + Top = 75 Width = 20 Height = 17 TabOrder = 9 end object CheckBox6: TCheckBox Left = 12 - Top = 121 + Top = 117 Width = 20 Height = 17 TabOrder = 10 end object CheckBox7: TCheckBox Left = 12 - Top = 163 + Top = 159 Width = 20 Height = 17 TabOrder = 11 end object CheckBox8: TCheckBox Left = 12 - Top = 205 + Top = 201 Width = 20 Height = 17 TabOrder = 12 - Visible = False end object Button23: TButton Left = 65 @@ -2206,7 +2238,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object edit_DJ: TComboBox Left = 100 - Top = 161 + Top = 157 Width = 81 Height = 28 Font.Charset = GB2312_CHARSET @@ -2227,7 +2259,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object edit_Grade: TComboBox Left = 100 - Top = 113 + Top = 109 Width = 81 Height = 28 Font.Charset = GB2312_CHARSET @@ -2245,13 +2277,37 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Edit_xs: TcxCurrencyEdit Left = 100 - Top = 72 + Top = 68 Properties.DecimalPlaces = 4 Properties.DisplayFormat = '0.####' Properties.Nullstring = '0' TabOrder = 16 Width = 121 end + object Button24: TButton + Left = 237 + Top = 194 + Width = 60 + Height = 25 + Caption = #20462#25913#32568#21495 + TabOrder = 17 + Visible = False + OnClick = Button8Click + end + object Edit_ls: TEdit + Left = 100 + Top = 198 + Width = 121 + Height = 20 + TabOrder = 18 + end + object CheckBox9: TCheckBox + Left = 12 + Top = 201 + Width = 20 + Height = 17 + TabOrder = 19 + end end object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid1 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 6c2141f..4fadc6e 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -267,6 +267,12 @@ type edit_Grade: TComboBox; Edit_xs: TcxCurrencyEdit; Tv1Column6: TcxGridDBColumn; + Label44: TLabel; + Button24: TButton; + Edit_ls: TEdit; + CheckBox9: TCheckBox; + Tv1Column7: TcxGridDBColumn; + Label45: TLabel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -469,7 +475,7 @@ end; procedure TfrmJYOrderCDOne.InitSum(); var - sumP, sumLen, sumMZ, sumJZ: double; + sumP, sumLen, sumMZ, sumJZ, sumllms: double; begin if Order_Main.IsEmpty then exit; @@ -478,6 +484,7 @@ begin sumLen := 0; sumMZ := 0; sumJZ := 0; + sumllms := 0; with Order_Main do begin DisableControls; @@ -489,8 +496,10 @@ begin sumP := sumP + 1; sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); sumMZ := RoundFloat(sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat, 2); + sumllms := RoundFloat(sumllms + Order_Main.fieldbyname('llms').AsFloat, 2); sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2)// sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat; // sumJZ := sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat; + end; next; @@ -502,6 +511,7 @@ begin label21.Caption := ':' + floattostr(sumLen); label20.Caption := 'ë:' + floattostr(sumMZ); label23.Caption := ':' + floattostr(sumJZ); + Label45.Caption := ':' + FloatToStr(sumllms); Order_Main.Locate('mjid', fid, []); except application.MessageBox('ʧܣ', 'ʾϢ', 0); @@ -1755,15 +1765,51 @@ begin with ADOQueryPrint do begin - Close; + 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; + Open; end; - with ADOQuery1 do + with ADOQuery1 do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ_GH '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + end; + + if (trim(ComboBox1.Text) = '뵥(ɫ)') or (trim(ComboBox1.Text) = '뵥(ʵɫ)') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_copy1_ls '); + sql.add('@DName=' + quotedstr(Trim(DCode))); +// ShowMessage(SQL.TEXT); + 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; + with ADOQuery1 do begin Close; sql.Clear; @@ -2529,6 +2575,11 @@ end; procedure TfrmJYOrderCDOne.ToolButton16Click(Sender: TObject); begin + if Order_Main.Locate('ssel', True, []) = False then + begin + Application.MessageBox('ûѡ!', 'ʾ', 0); + Exit; + end; Panel15.Left := (self.Width - Panel15.Width) div 2; Panel15.Visible := True; end; @@ -2591,6 +2642,10 @@ begin // begin // sql.Add('update WFB_MJJY SET MJstr4=''' + trim(Edit_C_MJstr4.Text) + ''' where MJID=''' + trim(CDS_Main.fieldbyname('MJID').AsString) + ''' '); // end; + if CheckBox9.Checked then + begin + sql.Add('update WFB_MJJY SET ls=''' + trim(Edit_ls.Text) + ''' where MJID=''' + trim(Order_Main.fieldbyname('MJID').AsString) + ''' '); + end; ExecSQL; end; Edit; @@ -2626,12 +2681,14 @@ begin Edit_xs.Text := ''; edit_Grade.Text := ''; edit_DJ.Text := ''; + edit_ls.Text := ''; // Edit_C_MJstr4.Text := ''; Exit; except ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('쳣!', 'ʾ', 0); end; + initgrid(); end; procedure TfrmJYOrderCDOne.Button18Click(Sender: TObject);