diff --git a/T03贸易布匹检验/DjdMachineInsp.identcache b/T03贸易布匹检验/DjdMachineInsp.identcache
index 515b0c2..415d003 100644
Binary files a/T03贸易布匹检验/DjdMachineInsp.identcache and b/T03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/T03贸易布匹检验/U_TradeClothInspList.dfm b/T03贸易布匹检验/U_TradeClothInspList.dfm
index 9175aa4..0c518b3 100644
--- a/T03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/T03贸易布匹检验/U_TradeClothInspList.dfm
@@ -12,7 +12,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
   TextHeight = 21
   object Panel6: TPanel [0]
     Left = 0
-    Top = 146
+    Top = 100
     Width = 1296
     Height = 37
     Align = alTop
@@ -20,6 +20,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     BevelInner = bvLowered
     BorderStyle = bsSingle
     TabOrder = 3
+    ExplicitTop = 146
     DesignSize = (
       1292
       33)
@@ -526,10 +527,10 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     Left = 0
     Top = 0
     Width = 1296
-    Height = 76
+    Height = 30
     AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 121
+    ButtonHeight = 30
+    ButtonWidth = 95
     Caption = 'ToolBar1'
     Color = clWhite
     Images = DataLink_TradeInsp.cxImageList_bar
@@ -546,7 +547,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TBRafreshClick
     end
     object btnJBQ: TToolButton
-      Left = 71
+      Left = 63
       Top = 0
       AutoSize = True
       Caption = #25171#21360#21367#26631#31614
@@ -554,7 +555,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnJBQClick
     end
     object ToolButton3: TToolButton
-      Left = 190
+      Left = 162
       Top = 0
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -562,7 +563,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton3Click
     end
     object btnEdit: TToolButton
-      Left = 309
+      Left = 261
       Top = 0
       AutoSize = True
       Caption = #32534#36753
@@ -570,7 +571,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnEditClick
     end
     object ToolButton2: TToolButton
-      Left = 380
+      Left = 324
       Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913
@@ -579,7 +580,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Style = tbsDropDown
     end
     object Tout: TToolButton
-      Left = 506
+      Left = 428
       Top = 0
       AutoSize = True
       Caption = #20837#24211
@@ -589,7 +590,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToutClick
     end
     object Tunout: TToolButton
-      Left = 600
+      Left = 508
       Top = 0
       AutoSize = True
       Caption = #25764#38144#20837#24211
@@ -598,7 +599,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TunoutClick
     end
     object ToolButton4: TToolButton
-      Left = 703
+      Left = 595
       Top = 0
       AutoSize = True
       Caption = #25171#21253
@@ -606,7 +607,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton4Click
     end
     object btnJYBG: TToolButton
-      Left = 774
+      Left = 658
       Top = 0
       AutoSize = True
       Caption = #26816#39564#25253#21578
@@ -614,7 +615,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnJYBGClick
     end
     object Tprintmd: TToolButton
-      Left = 877
+      Left = 745
       Top = 0
       AutoSize = True
       Caption = #25171#21360#30721#21333
@@ -622,7 +623,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TprintmdClick
     end
     object TBExport: TToolButton
-      Left = 980
+      Left = 832
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -630,7 +631,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TBExportClick
     end
     object ToolButton5: TToolButton
-      Left = 1051
+      Left = 895
       Top = 0
       AutoSize = True
       Caption = #26085#24535
@@ -638,7 +639,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton5Click
     end
     object ToolButton1: TToolButton
-      Left = 1122
+      Left = 958
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -646,17 +647,16 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton1Click
     end
     object TBZF: TToolButton
-      Left = 1225
+      Left = 1045
       Top = 0
       AutoSize = True
       Caption = #21024#38500
       ImageIndex = 5
-      Wrap = True
       OnClick = TBZFClick
     end
     object TBClose: TToolButton
-      Left = 0
-      Top = 38
+      Left = 1108
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
@@ -682,13 +682,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
   end
   object dxLayoutControl_query: TdxLayoutControl [4]
     Left = 0
-    Top = 76
+    Top = 30
     Width = 1296
     Height = 70
     Align = alTop
     TabOrder = 4
     AutoSize = True
     LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
+    ExplicitTop = 76
     object OrderNo: TcxTextEdit
       Tag = 2
       Left = 296
diff --git a/T03贸易布匹检验/U_TradeClothInspList.pas b/T03贸易布匹检验/U_TradeClothInspList.pas
index 1d4c0d6..82620c6 100644
--- a/T03贸易布匹检验/U_TradeClothInspList.pas
+++ b/T03贸易布匹检验/U_TradeClothInspList.pas
@@ -163,15 +163,6 @@ type
     RMXLSExport2: TRMXLSExport;
     Tv1unitPieces: TcxGridDBColumn;
     Tv1operators: TcxGridDBColumn;
-    RMDB_1: TfrxDBDataset;
-    frxReport1: TfrxReport;
-    frxPPTXExport1: TfrxPPTXExport;
-    frxXLSXExport1: TfrxXLSXExport;
-    frxXLSExport1: TfrxXLSExport;
-    frxReportTableObject1: TfrxReportTableObject;
-    frxBarCodeObject1: TfrxBarCodeObject;
-    frxRichObject1: TfrxRichObject;
-    frxOLEObject1: TfrxOLEObject;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -526,28 +517,18 @@ begin
         else
           FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString);
 
-        ExportFtErpFile(FLabVolume + '.FR3', ADOQueryTemp);
-        fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLabVolume + '.FR3';
+        ExportFtErpFile(FLabVolume + '.rmf', ADOQueryBaseTemp);
+        fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLabVolume + '.rmf';
 
         if FileExists(fPrintFile) then
         begin
-
-          frxReport1.LoadFromFile(fPrintFile);
-          frxReport1.PrintOptions.Copies := mCopys;
-          frxReport1.PrintOptions.ShowDialog := false;
-          frxReport1.PrepareReport(True);
-          frxReport1.Print();
-//          RM1.LoadFromFile(fPrintFile);
-//
-//          Rm1.DefaultCopies := mCopys;
-//
-//
-//          RM1.ShowReport;
-
+          RM1.LoadFromFile(fPrintFile);
+          RM1.DefaultCopies := mCopys;
+          RM1.PrintReport;
         end
         else
         begin
-          Application.MessageBox(PChar('ûÓÐÕÒ' + fPrintFile), 'Ìáʾ', 0);
+          Application.MessageBox(pchar('ûÓÐÕÒ' + fPrintFile), 'Ìáʾ', 0);
         end;
       end;
       Next;
@@ -693,9 +674,12 @@ begin
           MLabPackage := trim(ADOQueryPrint.FieldByName('SLabPackage').AsString)
         else
           MLabPackage := trim(ADOQueryPrint.FieldByName('LabPackage').AsString);
-        ExportFtErpFile(Trim(MLabPackage) + '.FR3', ADOQueryTemp);
+//        ExportFtErpFile(Trim(MLabPackage) + '.FR3', ADOQueryTemp);
+//        FPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(MLabPackage) + '.FR3';
+
+        ExportFtErpFile(MLabPackage + '.rmf', ADOQueryBaseTemp);
+        FPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + MLabPackage + '.rmf';
 
-        FPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(MLabPackage) + '.FR3';
         if not FileExists(FPrintFile) then
         begin
           Application.MessageBox(PChar('ûÓÐÕÒ' + FPrintFile), 'Ìáʾ', 0);
@@ -703,20 +687,15 @@ begin
         end;
         if FileExists(FPrintFile) then
         begin
-          frxReport1.LoadFromFile(FPrintFile);
-          frxReport1.PrintOptions.Copies := 1;
-          frxReport1.PrintOptions.ShowDialog := false;
-          frxReport1.PrepareReport(True);
-
-          frxReport1.Print();
-//          RM1.LoadFromFile(FPrintFile);
-//          Rm1.DefaultCopies := 1;
-//          RM1.PrintReport;
+          RM1.LoadFromFile(FPrintFile);
+          RM1.DefaultCopies := 1;
+          RM1.PrintReport;
         end
         else
         begin
-          Application.MessageBox(PChar('ûÓÐÕÒ' + FPrintFile), 'Ìáʾ', 0);
+          Application.MessageBox(pchar('ûÓÐÕÒ' + FPrintFile), 'Ìáʾ', 0);
         end;
+
         while Order_Main.Locate('SSel;PacketId', VarArrayOf([True, MPacketId]), []) do
         begin
           with Order_Main do