diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index 36065cb..1f3179a 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\��Ŀ����\D7DJalisi\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJailisi\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/检验管理/U_ClothHCList.dfm b/检验管理/U_ClothHCList.dfm
index 0e54a1c..6fed059 100644
--- a/检验管理/U_ClothHCList.dfm
+++ b/检验管理/U_ClothHCList.dfm
@@ -1,6 +1,6 @@
 object frmClothHCList: TfrmClothHCList
-  Left = 287
-  Top = 67
+  Left = 266
+  Top = 564
   Width = 1179
   Height = 705
   Caption = #26816#39564#25351#31034#21333#26597#35810
@@ -20,7 +20,7 @@ object frmClothHCList: TfrmClothHCList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1163
+    Width = 1171
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 59
@@ -66,7 +66,7 @@ object frmClothHCList: TfrmClothHCList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1163
+    Width = 1171
     Height = 73
     Align = alTop
     BevelInner = bvRaised
@@ -289,8 +289,8 @@ object frmClothHCList: TfrmClothHCList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 105
-    Width = 1163
-    Height = 561
+    Width = 1171
+    Height = 569
     Align = alClient
     TabOrder = 2
     object TV2: TcxGridDBTableView
diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm
index 24159d2..c8b2b82 100644
--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@@ -1,7 +1,7 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 343
-  Top = 281
-  Width = 1366
+  Left = 237
+  Top = 384
+  Width = 1545
   Height = 738
   Caption = #25104#21697#26816#39564
   Color = clBtnFace
@@ -22,7 +22,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 545
-    Height = 612
+    Height = 620
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -186,10 +186,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object ScrollBox1: TScrollBox
-    Left = 770
+    Left = 793
     Top = 87
-    Width = 580
-    Height = 612
+    Width = 744
+    Height = 620
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -1041,7 +1041,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 545
     Top = 87
     Width = 205
-    Height = 612
+    Height = 620
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1805,8 +1805,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object MovePanel1: TMovePanel
-    Left = 757
-    Top = 83
+    Left = 1069
+    Top = 99
     Width = 351
     Height = 238
     BevelInner = bvLowered
@@ -2057,8 +2057,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel7: TPanel
     Left = 750
     Top = 87
-    Width = 20
-    Height = 612
+    Width = 43
+    Height = 620
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2067,8 +2067,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     object cxGrid2: TcxGrid
       Left = 2
       Top = 2
-      Width = 16
-      Height = 287
+      Width = 39
+      Height = 295
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2176,8 +2176,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 289
-      Width = 16
+      Top = 297
+      Width = 39
       Height = 28
       Align = alBottom
       Font.Charset = GB2312_CHARSET
@@ -2191,8 +2191,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 317
-      Width = 16
+      Top = 325
+      Width = 39
       Height = 293
       Align = alBottom
       Font.Charset = GB2312_CHARSET
@@ -2207,8 +2207,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object Panel3: TPanel
-    Left = 642
-    Top = 340
+    Left = 1170
+    Top = 356
     Width = 351
     Height = 313
     BevelInner = bvRaised
@@ -2407,7 +2407,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1350
+    Width = 1537
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2636,7 +2636,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1350
+    Width = 1537
     Height = 57
     Align = alTop
     BevelInner = bvRaised
@@ -2829,7 +2829,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = BTEditClick
     end
     object Button3: TButton
-      Left = 974
+      Left = 942
       Top = 8
       Width = 64
       Height = 25
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index 27af7f2..8859f8b 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -2402,20 +2402,20 @@ end;
 
 procedure TfrmMJManageNewFDNewSF.Label9Click(Sender: TObject);
 begin
-  if trim(Label9.Caption) = 'M' then
-  begin
-    Label9.Caption := 'Y';
-    Label19.Caption := 'Y';
-    Label20.Caption := 'Y';
-    Label7.Caption := 'Y';
-  end
-  else
-  begin
-    Label9.Caption := 'M';
-    Label19.Caption := 'M';
-    Label20.Caption := 'M';
-    Label7.Caption := 'M';
-  end;
+//  if trim(Label9.Caption) = 'M' then
+//  begin
+//    Label9.Caption := 'Y';
+//    Label19.Caption := 'Y';
+//    Label20.Caption := 'Y';
+//    Label7.Caption := 'Y';
+//  end
+//  else
+//  begin
+//    Label9.Caption := 'M';
+//    Label19.Caption := 'M';
+//    Label20.Caption := 'M';
+//    Label7.Caption := 'M';
+//  end;
 end;
 
 procedure TfrmMJManageNewFDNewSF.Button2Click(Sender: TObject);
@@ -2542,14 +2542,18 @@ begin
     fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString);
     fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString);
     fOrderUnit := uppercase(Trim(ADOTmp.fieldbyname('OrderUnit').AsString));
-    if fOrderUnit = 'Y' then
-    begin
-      Label9.Caption := 'Y';
-    end
-    else
-    begin
-      Label9.Caption := 'M'
-    end;
+
+
+//    if fOrderUnit = 'Y' then
+//    begin
+//      Label9.Caption := 'Y';
+//    end
+//    else
+//    begin
+//      Label9.Caption := 'M'
+//    end;
+    Label9.Caption := fOrderUnit;
+    
     if FDC <> 0 then
     begin
       Edit12.Visible := True;
@@ -2630,7 +2634,7 @@ begin
     fType := '10';
     if showmodal = 1 then
     begin
-      APID.Text := trim(Order_Main.fieldbyname('Subid').asstring);
+      APID.Text := trim(frmClothHCList.Order_Main.fieldbyname('Subid').asstring);
       Button3.Click;
     end;
     free;
@@ -2940,7 +2944,7 @@ begin
     exit;
   end;
 
-  with ADOTmp do             
+  with ADOTmp do
   begin
     close;
     sql.Clear;
diff --git a/检验管理/U_ProductOrderNewList.dfm b/检验管理/U_ProductOrderNewList.dfm
index 97111d5..bed5b40 100644
--- a/检验管理/U_ProductOrderNewList.dfm
+++ b/检验管理/U_ProductOrderNewList.dfm
@@ -1,6 +1,6 @@
 object frmProductOrderNewList: TfrmProductOrderNewList
-  Left = 174
-  Top = 61
+  Left = 382
+  Top = 336
   Width = 1369
   Height = 738
   Caption = #21253#35013#25351#31034#21333
@@ -20,7 +20,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1353
+    Width = 1361
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 95
@@ -170,7 +170,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1353
+    Width = 1361
     Height = 40
     Align = alTop
     BevelInner = bvRaised
@@ -399,7 +399,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object cxGrid1: TcxGrid
     Left = 0
     Top = 95
-    Width = 1353
+    Width = 1361
     Height = 333
     Align = alTop
     TabOrder = 3
@@ -747,8 +747,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 435
-    Width = 1353
+    Top = 443
+    Width = 1361
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
@@ -756,8 +756,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   end
   object Panel2: TPanel
     Left = 0
-    Top = 443
-    Width = 1353
+    Top = 451
+    Width = 1361
     Height = 256
     Align = alBottom
     Caption = 'Panel2'
@@ -765,7 +765,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
-      Width = 974
+      Width = 982
       Height = 254
       Align = alClient
       TabOrder = 0
@@ -1069,7 +1069,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       end
     end
     object GroupBox1: TGroupBox
-      Left = 975
+      Left = 983
       Top = 1
       Width = 377
       Height = 254
@@ -1099,7 +1099,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 72
-    Width = 1353
+    Width = 1361
     Height = 23
     Align = alTop
     TabOrder = 2
@@ -1112,7 +1112,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 23
-    ClientRectRight = 1353
+    ClientRectRight = 1361
     ClientRectTop = 19
   end
   object cxGridPopupMenu1: TcxGridPopupMenu