diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index e0de1ab..0186a67 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 92
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -102,35 +102,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25195#25551#25764#38144#20986#24211
       ImageIndex = 99
-      Wrap = True
       OnClick = ToolButton15Click
     end
     object ToolButton11: TToolButton
-      Left = 0
-      Top = 30
+      Left = 600
+      Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 119
-      Top = 30
+      Left = 719
+      Top = 0
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 230
-      Top = 30
+      Left = 830
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 341
-      Top = 30
+      Left = 941
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -138,15 +137,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 464
-      Top = 30
+      Left = 1064
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 575
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 662
+      Left = 87
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -162,34 +162,33 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 749
+      Left = 174
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
       ImageIndex = 12
-      Wrap = True
       Visible = False
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 0
-      Top = 60
+      Left = 273
+      Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 111
-      Top = 60
+      Left = 384
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 174
-      Top = 60
+      Left = 447
+      Top = 30
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -203,8 +202,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 242
-      Top = 63
+      Left = 515
+      Top = 33
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -228,8 +227,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 391
-      Top = 60
+      Left = 664
+      Top = 30
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -242,40 +241,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 512
-      Top = 60
+      Left = 785
+      Top = 30
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 631
-      Top = 60
+      Left = 904
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 718
-      Top = 60
+      Left = 991
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object ToolButton14: TToolButton
-      Left = 781
-      Top = 60
+      Left = 1054
+      Top = 30
       AutoSize = True
       Caption = #36873#20013#23548#20986
       ImageIndex = 113
       OnClick = ToolButton14Click
     end
     object TBClose: TToolButton
-      Left = 868
-      Top = 60
+      Left = 1141
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -284,7 +283,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 92
+    Top = 62
     Width = 1384
     Height = 88
     Align = alTop
@@ -813,9 +812,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 180
+    Top = 150
     Width = 1384
-    Height = 538
+    Height = 568
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index 6ef76c7..565c7b2 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -1977,14 +1977,19 @@ end;
 procedure TfrmJYOrderCDOne.Edit_CKMJIDKeyPress(Sender: TObject; var Key: Char);
 var
   s, sBefore: string;
+  p: Integer;
 begin
   if Key = #13 then
   begin
     if trim(Edit_CKMJID.Text) = '' then
       exit;
-    s := Trim(Edit_CKMJID.text);
-    sBefore := Copy(s, 1, Pos(',', s) - 1);
-
+    s := Trim(Edit_CKMJID.text);                          
+    p := Pos(',', s);              
+    if p = 0 then                                        
+      sBefore := s          // û�ж��ţ�ȡȫ��
+    else
+      sBefore := Copy(s, 1, p - 1); // ��ȡ����ǰ
+//    sBefore := Copy(s, 1, Pos(',', s) - 1);
     try
       with ADOQueryCmd do
       begin
@@ -2001,7 +2006,7 @@ begin
           sql.Add('update WFB_MJJY set CKFlag=''���'',cktime=null  where MJID=''' + Trim(sBefore) + '''');
         end;
 //        ShowMessage(sql.text);
-        ExecSQL;                                     
+        ExecSQL;
       end;
       PlaySound('wav\��ȷ.wav', 0, SND_FILENAME or SND_ASYNC);
     except