diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 3904820..bfefedd 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1161,7 +1161,7 @@ begin exit; end; with ADOQueryPrint do - begin + begin Close; SQL.Clear; sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.KHorderNo,'); @@ -1584,16 +1584,16 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥(Ӣ)') then - begin + if (trim(ComboBox1.Text) = 'SHHY뵥') then + begin with ADOQueryTemp do - begin + begin Close; sql.Clear; - sql.add('exec P_Print_CKMDHAEIL '); + sql.add('exec P_Print_CKMDHAEIL_YB '); sql.add('@DName=' + quotedstr(Trim(DCode))); Open; - end; + end; SCreateCDS20(ADOQueryTemp, CDS_HZ); SInitCDSData20(ADOQueryTemp, CDS_HZ); @@ -1608,7 +1608,7 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥(Ӣ)') or (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin @@ -1684,13 +1684,13 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = 'Ϻ') then + if (trim(ComboBox1.Text) = 'Ϻ') then begin with ADOQueryTemp do begin Close; sql.Clear; - sql.add('exec P_Print_CKMDYDL_SH '); + sql.add('exec P_Print_CKMDYDL_SH '); sql.add('@DName=' + quotedstr(Trim(DCode))); Open; end; @@ -1708,13 +1708,13 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '') then + if (trim(ComboBox1.Text) = '') then begin - with ADOQueryTemp do - begin + with ADOQueryTemp do + begin Close; sql.Clear; - sql.add('exec P_Print_CKMDYDL_SH '); + sql.add('exec P_Print_CKMDYDL_SH '); sql.add('@DName=' + quotedstr(Trim(DCode))); Open; end;