diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 86cd332..6c2141f 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1471,7 +1471,7 @@ begin SInitCDSData20(ADOQueryCmd, CDS_HZ); end else if LBName = '鱨ͨ(ķ)' then - begin + begin with ADOQueryCmd do begin Close; @@ -1740,7 +1740,7 @@ begin // end; // end; - if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ë)') or (trim(ComboBox1.Text) = '뵥(+ë)') or (trim(ComboBox1.Text) = '뵥(ӡ)') or (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ë)') or (trim(ComboBox1.Text) = '뵥(+ë)') or (trim(ComboBox1.Text) = '뵥(ӡ)') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ʵ)') or (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin @@ -1755,12 +1755,22 @@ 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; + end; + 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;