diff --git a/复合检验管理/U_CKProductJYHZList.pas b/复合检验管理/U_CKProductJYHZList.pas index 551ee0c..79bb7c7 100644 --- a/复合检验管理/U_CKProductJYHZList.pas +++ b/复合检验管理/U_CKProductJYHZList.pas @@ -174,7 +174,7 @@ begin ADOQueryMain.DisableControls; with ADOQueryMain do begin - Close; + Close; sql.Clear; Filtered := False; sql.Add('select convert(char(10),A.CKtime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4,A.CKDH, '); @@ -194,14 +194,15 @@ begin if cxTabControl1.TabIndex = 0 then begin sql.add('and SHflag=''0'' '); - end; + end; if cxTabControl1.TabIndex = 1 then begin - sql.add('and SHflag=''1'' '); + sql.add('and SHflag=''1'' '); end; Sql.add('group by A.CKDH,convert(char(10),A.CKtime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4,dj,PM,KH,YS'); -// ShowMessage(SQL.Text); + sql.Add('order by A.CKDH,convert(char(10),A.CKtime,120)'); + // ShowMessage(SQL.Text); Open; end; @@ -416,7 +417,7 @@ begin begin Close; sql.Clear; - sql.add('exec P_Print_CKMDYDL_HZ29 '); + sql.add('exec P_Print_CKMDYDL_HZ29 '); sql.add('@DName=' + quotedstr(Trim(CDS_Main.fieldbyname('CKDH').AsString))); Open; end;