diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index 1a12b01..7d86ffe 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -133,19 +133,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 0
-      Top = 30
+      Left = 1064
+      Top = 0
       AutoSize = True
       Caption = #25171#21360#26631#31614
       ImageIndex = 96
+      Wrap = True
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 87
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -153,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 174
+      Left = 87
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 273
+      Left = 186
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
@@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 384
+      Left = 297
       Top = 30
       AutoSize = True
       Caption = #25171#21360
@@ -178,7 +178,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 447
+      Left = 360
       Top = 30
       Width = 68
       Height = 30
@@ -193,7 +193,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 515
+      Left = 428
       Top = 33
       Width = 149
       Height = 24
@@ -217,7 +217,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333'('#20013#25991#20116#21015')')
     end
     object Edit4: TEdit
-      Left = 664
+      Left = 577
       Top = 30
       Width = 121
       Height = 30
@@ -231,15 +231,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 785
+      Left = 698
       Top = 30
+      AutoSize = True
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 904
+      Left = 785
       Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
@@ -247,29 +248,29 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 991
+      Left = 872
       Top = 30
       AutoSize = True
       Caption = #21246#36873#23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
-    object TBClose: TToolButton
-      Left = 1078
-      Top = 30
-      AutoSize = True
-      Caption = #20851#38381
-      ImageIndex = 55
-      OnClick = TBCloseClick
-    end
     object ToolButton14: TToolButton
-      Left = 1141
+      Left = 959
       Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = ToolButton14Click
     end
+    object TBClose: TToolButton
+      Left = 1022
+      Top = 30
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 55
+      OnClick = TBCloseClick
+    end
   end
   object Panel1: TPanel
     Left = 0
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index bcb1885..acb9f3c 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -513,7 +513,7 @@ end;
 
 procedure TfrmJYOrderCDOne.TBExportClick(Sender: TObject);
 var
-  FMainID,sqlStr:string;
+  FMainID, sqlStr: string;
 begin
   if ADOQueryMain.IsEmpty then
     Exit;
@@ -570,7 +570,7 @@ begin
   except
     ADOQueryCmd.Connection.RollbackTrans;
   end;
-     Order_Main.EnableControls;
+  Order_Main.EnableControls;
 
   with ADOQueryTemp do
   begin
@@ -597,8 +597,7 @@ begin
       sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID ');
 //      sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' ');
 //      sql.Add('and  A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
-      sql.Add(' where   EXISTS(select SubId from TBSubID X where X.SubId=A.MJID and X.DName='''+Trim(DCode)+''' )');
-
+      sql.Add(' where   EXISTS(select SubId from TBSubID X where X.SubId=A.MJID and X.DName=''' + Trim(DCode) + ''' )');
 
       sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
 //        ShowMessage(sql.text);
@@ -2311,6 +2310,8 @@ begin
 end;
 
 procedure TfrmJYOrderCDOne.Button8Click(Sender: TObject);
+var
+  Fxsws: Integer;
 begin
   if Order_Main.IsEmpty then
     Exit;
@@ -2330,13 +2331,22 @@ begin
       begin
         if Order_Main.FieldByName('SSel').AsBoolean = True then
         begin
-          with ADOQueryCmd do
+          with ADOQueryTemp do
           begin
             Close;
             sql.Clear;
+            sql.Add('select  xsws from JYorder_main where   mainid=''' + Trim(Order_Main.fieldbyname('mainid').AsString) + '''');
+            Open;
+          end;
+          Fxsws := ADOQueryTemp.fieldbyname('xsws').AsInteger;
+          with ADOQueryCmd do
+          begin
+            Close;                         
+            sql.Clear;
             sql.Add('Update JYOrder_Sub Set kmxs=''' + trim(Edit5.Text) + ''' ');
             sql.Add('where subid=''' + Trim(Order_Main.fieldbyname('subid').AsString) + '''');
-            sql.Add('UPDATE A SET A.MJLen = A.MJQty4 * B.kmxs   ');
+//            sql.Add('UPDATE A SET A.MJLen = round(A.MJQty4 * B.kmxs,''' + trim(Fxsws) + ''')   ');
+            sql.Add('UPDATE A SET A.MJLen = round(A.MJQty4 * B.kmxs, ' + IntToStr(Fxsws) + ')');
             sql.Add('FROM WFB_MJJY A JOIN JYOrder_Sub B ON A.subid = B.subid');
             sql.Add('where  MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
 //            ShowMessage(SQL.Text);