diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm
index 9fa6a30..74b5ec7 100644
--- a/A02基础产品管理/U_ClothInfo.dfm
+++ b/A02基础产品管理/U_ClothInfo.dfm
@@ -2,7 +2,7 @@ inherited frmClothInfo: TfrmClothInfo
   Left = 117
   Top = 154
   Caption = #20135#21697#26723#26696
-  ClientHeight = 845
+  ClientHeight = 581
   ClientWidth = 1540
   Color = clBtnFace
   Font.Charset = ANSI_CHARSET
@@ -10,8 +10,9 @@ inherited frmClothInfo: TfrmClothInfo
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -46
   ExplicitWidth = 1556
-  ExplicitHeight = 884
+  ExplicitHeight = 620
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
@@ -177,17 +178,19 @@ inherited frmClothInfo: TfrmClothInfo
   end
   object cxSplitter1: TcxSplitter [1]
     Left = 220
-    Top = 175
+    Top = 105
     Width = 8
-    Height = 670
+    Height = 476
     HotZoneClassName = 'TcxMediaPlayer9Style'
     Control = Panel5
+    ExplicitTop = 175
+    ExplicitHeight = 670
   end
   object Panel1: TPanel [2]
     Left = 0
     Top = 60
     Width = 1540
-    Height = 115
+    Height = 45
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -207,185 +210,65 @@ inherited frmClothInfo: TfrmClothInfo
       Height = 21
     end
     object Label3: TLabel
-      Left = 553
-      Top = 11
+      Left = 22
+      Top = 10
       Width = 64
       Height = 21
       Caption = #20135#21697#32534#21495
     end
     object Label4: TLabel
-      Left = 794
-      Top = 11
+      Left = 244
+      Top = 10
       Width = 64
       Height = 21
       Caption = #33394#24067#21517#31216
     end
     object Label9: TLabel
-      Left = 794
-      Top = 81
+      Left = 688
+      Top = 10
       Width = 32
       Height = 21
       Caption = #20811#37325
     end
     object Label8: TLabel
-      Left = 553
-      Top = 81
+      Left = 466
+      Top = 10
       Width = 64
       Height = 21
       Caption = #20013#25991#25104#20221
     end
-    object Label1: TLabel
-      Left = 23
-      Top = 11
-      Width = 32
-      Height = 21
-      Caption = #24067#31181
-    end
-    object Label2: TLabel
-      Left = 23
-      Top = 46
-      Width = 48
-      Height = 21
-      Caption = #21152#24037#21035
-    end
-    object Label5: TLabel
-      Left = 794
-      Top = 46
-      Width = 32
-      Height = 21
-      Caption = #35268#26684
-    end
-    object Label6: TLabel
-      Left = 553
-      Top = 46
-      Width = 64
-      Height = 21
-      Caption = #33521#25991#25104#20998
-    end
-    object Label7: TLabel
-      Left = 267
-      Top = 11
-      Width = 80
-      Height = 21
-      Caption = #21518#25972#29702#33521#25991
-    end
-    object Label10: TLabel
-      Left = 267
-      Top = 46
-      Width = 80
-      Height = 21
-      Caption = #21518#25972#29702#20013#25991
-    end
-    object Label13: TLabel
-      Left = 267
-      Top = 81
-      Width = 80
-      Height = 21
-      Caption = #20379#24212#21830#20195#21495
-    end
-    object Label15: TLabel
-      Left = 23
-      Top = 81
-      Width = 48
-      Height = 21
-      Caption = #27969#27700#21495
-    end
     object C_Code: TcxTextEdit
       Tag = 2
-      Left = 623
-      Top = 7
+      Left = 90
+      Top = 6
       TabOrder = 0
       OnKeyPress = C_CodeKeyPress
       Width = 150
     end
     object C_Name: TcxTextEdit
       Tag = 2
-      Left = 864
-      Top = 7
+      Left = 312
+      Top = 6
       TabOrder = 1
       OnKeyPress = C_CodeKeyPress
       Width = 150
     end
     object C_GramWeight: TcxTextEdit
       Tag = 2
-      Left = 864
-      Top = 77
+      Left = 724
+      Top = 6
       TabOrder = 2
       OnKeyPress = C_CodeKeyPress
       Width = 150
     end
     object C_Composition: TcxTextEdit
       Tag = 2
-      Left = 623
-      Top = 77
+      Left = 534
+      Top = 6
       TabOrder = 3
       OnKeyPress = C_CodeKeyPress
       Width = 150
     end
-    object GC_Name: TcxTextEdit
-      Tag = 2
-      Left = 80
-      Top = 7
-      TabOrder = 4
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object CraftCode: TcxTextEdit
-      Tag = 2
-      Left = 80
-      Top = 42
-      TabOrder = 5
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object C_Spec: TcxTextEdit
-      Tag = 2
-      Left = 864
-      Top = 42
-      TabOrder = 6
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object C_EComposition: TcxTextEdit
-      Tag = 2
-      Left = 623
-      Top = 42
-      TabOrder = 7
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object CraftEName: TcxTextEdit
-      Tag = 2
-      Left = 353
-      Top = 7
-      TabOrder = 8
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object CraftName: TcxTextEdit
-      Tag = 2
-      Left = 353
-      Top = 42
-      TabOrder = 9
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object FtyNo: TcxTextEdit
-      Tag = 2
-      Left = 353
-      Top = 77
-      TabOrder = 10
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
-    object LSNo: TcxTextEdit
-      Tag = 2
-      Left = 80
-      Top = 77
-      TabOrder = 11
-      OnKeyPress = C_CodeKeyPress
-      Width = 150
-    end
   end
   object Panel2: TPanel [3]
     Left = 512
@@ -400,18 +283,20 @@ inherited frmClothInfo: TfrmClothInfo
   end
   object Panel5: TPanel [4]
     Left = 0
-    Top = 175
+    Top = 105
     Width = 220
-    Height = 670
+    Height = 476
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 2
+    ExplicitTop = 175
+    ExplicitHeight = 670
     object cxDBTreeList1: TcxDBTreeList
       Left = 2
       Top = 2
       Width = 216
-      Height = 666
+      Height = 472
       Align = alClient
       Bands = <
         item
@@ -429,6 +314,7 @@ inherited frmClothInfo: TfrmClothInfo
       ScrollbarAnnotations.CustomAnnotations = <>
       TabOrder = 0
       OnDblClick = cxDBTreeList1DblClick
+      ExplicitHeight = 666
       object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
         DataBinding.FieldName = 'CTName'
         Width = 210
@@ -442,33 +328,38 @@ inherited frmClothInfo: TfrmClothInfo
   end
   object Panel3: TPanel [5]
     Left = 228
-    Top = 175
-    Width = 1312
-    Height = 670
+    Top = 105
+    Width = 1108
+    Height = 476
     Align = alClient
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Caption = 'Panel3'
     TabOrder = 4
+    ExplicitTop = 175
+    ExplicitWidth = 1312
+    ExplicitHeight = 670
     object Panel7: TPanel
       Left = 2
       Top = 2
-      Width = 1308
+      Width = 1104
       Height = 40
       Align = alTop
       BevelOuter = bvNone
       TabOrder = 0
+      ExplicitWidth = 1308
       object Panel4: TPanel
         Left = 0
         Top = 0
-        Width = 1308
+        Width = 1104
         Height = 40
         Align = alClient
         AutoSize = True
         ParentColor = True
         TabOrder = 0
+        ExplicitWidth = 1308
         DesignSize = (
-          1308
+          1104
           40)
         object Label14: TLabel
           Left = 21
@@ -534,37 +425,42 @@ inherited frmClothInfo: TfrmClothInfo
     end
     object Panel9: TPanel
       Left = 2
-      Top = 463
-      Width = 1308
+      Top = 269
+      Width = 1104
       Height = 205
       Align = alBottom
       Caption = 'Panel9'
       TabOrder = 1
+      ExplicitTop = 463
+      ExplicitWidth = 1308
       object Panel10: TPanel
         Left = 1
         Top = 1
-        Width = 1306
+        Width = 1102
         Height = 203
         Align = alClient
         Caption = 'Panel9'
         TabOrder = 0
+        ExplicitWidth = 1306
         object GroupBox1: TGroupBox
           Left = 1
           Top = 1
-          Width = 1304
+          Width = 1100
           Height = 201
           Align = alClient
           Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289
           TabOrder = 0
+          ExplicitWidth = 1304
           object ScrollBox1: TScrollBox
             Left = 2
             Top = 23
-            Width = 1300
+            Width = 1096
             Height = 176
             Align = alClient
             BevelInner = bvLowered
             BorderStyle = bsNone
             TabOrder = 0
+            ExplicitWidth = 1300
           end
         end
       end
@@ -573,11 +469,13 @@ inherited frmClothInfo: TfrmClothInfo
       Left = 10
       Top = 42
       Width = 1088
-      Height = 421
+      Height = 227
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 2
+      ExplicitHeight = 421
       object Tv1: TcxGridDBTableView
+        OnDblClick = Tv1DblClick
         OnMouseDown = Tv1MouseDown
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
@@ -818,69 +716,21 @@ inherited frmClothInfo: TfrmClothInfo
         GridView = Tv1
       end
     end
-    object cxGrid2: TcxGrid
-      Left = 1106
-      Top = 42
-      Width = 204
-      Height = 421
-      Align = alRight
-      TabOrder = 3
-      object Tv2: TcxGridDBTableView
-        Navigator.Buttons.CustomButtons = <>
-        ScrollbarAnnotations.CustomAnnotations = <>
-        DataController.DataSource = DS_2
-        DataController.Filter.AutoDataSetFilter = True
-        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-        DataController.Summary.DefaultGroupSummaryItems = <
-          item
-            Format = 'C_Code'
-          end>
-        DataController.Summary.FooterSummaryItems = <
-          item
-            Kind = skSum
-          end>
-        DataController.Summary.SummaryGroups = <>
-        OptionsBehavior.FocusCellOnTab = True
-        OptionsBehavior.GoToNextCellOnEnter = True
-        OptionsBehavior.FocusCellOnCycle = True
-        OptionsCustomize.ColumnFiltering = False
-        OptionsView.Footer = True
-        OptionsView.GroupByBox = False
-        object cxGridDBColumn1: TcxGridDBColumn
-          Caption = #39068#33394
-          DataBinding.FieldName = 'C_Color'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 105
-        end
-        object cxGridDBColumn2: TcxGridDBColumn
-          Caption = #33394#21495
-          DataBinding.FieldName = 'C_ColorNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 92
-        end
-      end
-      object cxGridLevel2: TcxGridLevel
-        GridView = Tv2
-      end
-    end
     object cxSplitter2: TcxSplitter
       Left = 2
       Top = 42
       Width = 8
-      Height = 421
+      Height = 227
       HotZoneClassName = 'TcxMediaPlayer9Style'
+      ExplicitHeight = 421
     end
     object cxSplitter3: TcxSplitter
       Left = 1098
       Top = 42
       Width = 8
-      Height = 421
+      Height = 227
       AlignSplitter = salRight
-      Control = cxGrid2
+      ExplicitLeft = 1091
     end
   end
   inherited loadProcess: TPanel
@@ -896,64 +746,116 @@ inherited frmClothInfo: TfrmClothInfo
     ExplicitTop = 343
     ExplicitHeight = 29
   end
+  object cxGrid2: TcxGrid [8]
+    Left = 1336
+    Top = 105
+    Width = 204
+    Height = 476
+    Align = alRight
+    TabOrder = 8
+    ExplicitLeft = 1106
+    ExplicitTop = 42
+    ExplicitHeight = 421
+    object Tv2: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_2
+      DataController.Filter.AutoDataSetFilter = True
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <
+        item
+          Format = 'C_Code'
+        end>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.FocusCellOnTab = True
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsBehavior.FocusCellOnCycle = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      object cxGridDBColumn1: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 105
+      end
+      object cxGridDBColumn2: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 92
+      end
+    end
+    object cxGridLevel2: TcxGridLevel
+      GridView = Tv2
+    end
+  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
-    Left = 161
-    Top = 240
+    Left = 634
+    Top = 124
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
-    Left = 57
-    Top = 241
+    Left = 695
+    Top = 124
   end
   object DS_Tree: TDataSource
     DataSet = CDS_Tree
-    Left = 155
-    Top = 195
+    Left = 756
+    Top = 307
   end
   object ADOQueryTree: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 53
-    Top = 201
+    Left = 756
+    Top = 185
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 739
-    Top = 312
+    Left = 695
+    Top = 185
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     Parameters = <>
-    Left = 837
-    Top = 269
+    Left = 756
+    Top = 124
   end
   object GPM_1: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 672
-    Top = 512
+    Left = 756
+    Top = 246
   end
   object DS_1: TDataSource
     DataSet = CDS_1
-    Left = 883
-    Top = 491
+    Left = 634
+    Top = 307
   end
   object ADOQueryMain: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 653
-    Top = 289
+    Left = 817
+    Top = 124
   end
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 784
-    Top = 528
+    Left = 878
+    Top = 185
   end
   object RM1: TRMGridReport
     ThreadPrepareReport = True
@@ -972,20 +874,20 @@ inherited frmClothInfo: TfrmClothInfo
     CompressThread = False
     LaterBuildEvents = True
     OnlyOwnerDataSet = False
-    Left = 265
-    Top = 305
+    Left = 878
+    Top = 368
     ReportData = {}
   end
   object RMDB_Main: TRMDBDataSet
     Visible = True
     DataSet = ADOQueryPrint
-    Left = 952
-    Top = 400
+    Left = 817
+    Top = 368
   end
   object ODPat: TOpenDialog
     Options = [ofReadOnly, ofAllowMultiSelect, ofPathMustExist, ofFileMustExist, ofEnableSizing]
-    Left = 302
-    Top = 284
+    Left = 878
+    Top = 307
   end
   object IdFTP1: TIdFTP
     ConnectTimeout = 0
@@ -995,37 +897,37 @@ inherited frmClothInfo: TfrmClothInfo
     ProxySettings.ProxyType = fpcmNone
     ProxySettings.Port = 0
     ReadTimeout = 0
-    Left = 374
-    Top = 367
+    Left = 817
+    Top = 307
   end
   object SaveDialog1: TSaveDialog
-    Left = 394
-    Top = 289
+    Left = 634
+    Top = 429
   end
   object DSCYNO: TDataSource
     DataSet = CDS_CYNO
-    Left = 495
-    Top = 282
+    Left = 878
+    Top = 246
   end
   object CDS_CYNO: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 566
-    Top = 343
+    Left = 634
+    Top = 246
   end
   object adoqueryPicture: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     Parameters = <>
-    Left = 293
-    Top = 357
+    Left = 878
+    Top = 124
   end
   object OpenDialog1: TOpenDialog
-    Left = 459
-    Top = 367
+    Left = 634
+    Top = 368
   end
   object PM_1: TPopupMenu
-    Left = 1160
-    Top = 352
+    Left = 695
+    Top = 368
     object N1: TMenuItem
       Caption = #20840#36873
       OnClick = N1Click
@@ -1040,37 +942,38 @@ inherited frmClothInfo: TfrmClothInfo
     end
   end
   object RMBarCodeObject1: TRMBarCodeObject
-    Left = 1044
-    Top = 408
+    Left = 756
+    Top = 368
   end
   object CDS_Tree: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 96
-    Top = 200
+    Left = 695
+    Top = 246
   end
   object ADOQueryPrint: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 851
-    Top = 392
+    Left = 634
+    Top = 185
   end
   object GPM_2: TcxGridPopupMenu
+    Grid = cxGrid2
     PopupMenus = <>
-    Left = 554
-    Top = 540
+    Left = 817
+    Top = 246
   end
   object DS_2: TDataSource
     DataSet = ADO_2
-    Left = 702
-    Top = 629
+    Left = 695
+    Top = 307
   end
   object ADO_2: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 355
-    Top = 569
+    Left = 817
+    Top = 185
   end
 end
diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas
index 1204a70..cc56b3a 100644
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@@ -93,22 +93,6 @@ type
     C_Name: TcxTextEdit;
     C_GramWeight: TcxTextEdit;
     C_Composition: TcxTextEdit;
-    Label1: TLabel;
-    Label2: TLabel;
-    Label5: TLabel;
-    Label6: TLabel;
-    GC_Name: TcxTextEdit;
-    CraftCode: TcxTextEdit;
-    C_Spec: TcxTextEdit;
-    C_EComposition: TcxTextEdit;
-    Label7: TLabel;
-    Label10: TLabel;
-    CraftEName: TcxTextEdit;
-    CraftName: TcxTextEdit;
-    Label13: TLabel;
-    FtyNo: TcxTextEdit;
-    Label15: TLabel;
-    LSNo: TcxTextEdit;
     ToolButton6: TToolButton;
     GPM_2: TcxGridPopupMenu;
     cxGrid1: TcxGrid;
@@ -144,17 +128,17 @@ type
     cxGrid1Level1: TcxGridLevel;
     DS_2: TDataSource;
     ADO_2: TADOQuery;
-    cxGrid2: TcxGrid;
-    Tv2: TcxGridDBTableView;
-    cxGridDBColumn1: TcxGridDBColumn;
-    cxGridDBColumn2: TcxGridDBColumn;
-    cxGridLevel2: TcxGridLevel;
     cxSplitter2: TcxSplitter;
     cxSplitter3: TcxSplitter;
     ToolButton7: TToolButton;
     Tv1Column11: TcxGridDBColumn;
     ToolButton8: TToolButton;
     ToolButton9: TToolButton;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridDBColumn2: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBDelClick(Sender: TObject);
@@ -191,6 +175,7 @@ type
     procedure ToolButton7Click(Sender: TObject);
     procedure ToolButton8Click(Sender: TObject);
     procedure ToolButton9Click(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
   private
     { Private declarations }
     CurrentPage, RecordsNumber: Integer;
@@ -308,7 +293,6 @@ begin
   end;
 end;
 
-
 procedure TfrmClothInfo.InitTree();
 begin
   try
@@ -331,15 +315,7 @@ begin
     cxDBTreeList1.Items[0].Expand(false);
   end;
 
-//  if Self.cds_tree.Locate('CTName', '�ײ����', []) then
-//  begin
-//    CTID2 := Self.cds_tree.FieldByName('CTID').AsString;
-//  end;
-//  if Self.cds_tree.Locate('CTName', '���ֻ��ͱ��', []) then
-//  begin
-//    CTID1 := Self.cds_tree.FieldByName('CTID').AsString;
-//  end;
-//  Self.cds_tree.Locate('CTName', '��Ʒ', []);
+  Self.cds_tree.Locate('CTName', '��Ʒ', []);
 end;
 
 procedure TfrmClothInfo.InitGrid();
@@ -483,7 +459,7 @@ end;
 
 procedure TfrmClothInfo.TBRafreshClick(Sender: TObject);
 begin
-  InitTree();
+//  InitTree();
   InitGrid();
   InitImage();
   InitGrid2();
@@ -1139,6 +1115,11 @@ begin
   end;
 end;
 
+procedure TfrmClothInfo.Tv1DblClick(Sender: TObject);
+begin
+  ToolButton1.Click;
+end;
+
 procedure TfrmClothInfo.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   InitImage();
diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas
index cb51d2d..a3546af 100644
--- a/T02贸易汇总仓库/U_GetDllForm.pas
+++ b/T02贸易汇总仓库/U_GetDllForm.pas
@@ -85,6 +85,7 @@ begin
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
     Parameters1 := '����';
+    Parameters2 := 'ó�ײ�ƥ';
     DName := 'ADMIN';
     DCode := 'ADMIN';
   end
@@ -169,7 +170,6 @@ begin
       begin
         with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
         begin
-          FSTKName := 'ó�ײ�ƥ';
           fFormID := FormID;
           WindowState := mstate;
           mnewHandle := Handle;
@@ -181,9 +181,7 @@ begin
         with TfrmTradeRRList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
         begin
           fFormID := FormID;
-          FormStyle := mstyle;
           WindowState := mstate;
-          BorderStyle := mborderstyle;
           mnewHandle := Handle;
         end;
       end;
@@ -202,7 +200,6 @@ begin
       begin
         with TfrmTradeClothTotalOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
         begin
-          FSTKName := 'ó�ײ�ƥ';
           fFormID := FormID;
           WindowState := mstate;
           mnewHandle := Handle;
@@ -213,7 +210,6 @@ begin
       begin
         with TfrmTradeClothTotalStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
         begin
-          FSTKName := 'ó�ײ�ƥ';
           fFormID := FormID;
           WindowState := mstate;
           mnewHandle := Handle;
diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
index 2c6a2ad..aeb7644 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@@ -2,20 +2,20 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
   Left = 165
   Top = 111
   Caption = #38754#26009#20837#24211#21015#34920
-  ClientHeight = 554
-  ClientWidth = 1540
+  ClientHeight = 606
+  ClientWidth = 1041
   Color = clBtnFace
   Font.Height = -16
   FormStyle = fsMDIChild
-  ExplicitWidth = 1556
-  ExplicitHeight = 593
+  ExplicitWidth = 1057
+  ExplicitHeight = 645
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1540
+    Width = 1041
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -26,7 +26,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
     List = True
     ParentColor = False
     ShowCaptions = True
-    TabOrder = 3
+    TabOrder = 2
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -52,16 +52,8 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       ImageIndex = 9
       OnClick = TBAddClick
     end
-    object btn1: TToolButton
-      Left = 213
-      Top = 0
-      AutoSize = True
-      Caption = #26126#32454#20837#24211
-      ImageIndex = 9
-      OnClick = btn1Click
-    end
     object TBEdit: TToolButton
-      Left = 316
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #20462#25913
@@ -69,7 +61,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = TBEditClick
     end
     object TBDel: TToolButton
-      Left = 387
+      Left = 284
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -77,7 +69,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = TBDelClick
     end
     object ToolButton2: TToolButton
-      Left = 458
+      Left = 355
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -85,7 +77,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = ToolButton2Click
     end
     object ToolButton3: TToolButton
-      Left = 529
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #38468#20214
@@ -93,7 +85,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = ToolButton3Click
     end
     object TBExport: TToolButton
-      Left = 600
+      Left = 497
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -101,7 +93,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 671
+      Left = 568
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -109,25 +101,35 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 774
+      Left = 671
       Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
       OnClick = TBCloseClick
     end
+    object btn1: TToolButton
+      Left = 742
+      Top = 0
+      AutoSize = True
+      Caption = #26126#32454#20837#24211
+      ImageIndex = 9
+      Visible = False
+      OnClick = btn1Click
+    end
   end
   object Panel1: TPanel [1]
     Left = 0
     Top = 30
-    Width = 1540
+    Width = 1041
     Height = 119
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     ParentBackground = False
     ParentColor = True
-    TabOrder = 4
+    TabOrder = 3
+    ExplicitWidth = 1540
     object Label3: TLabel
       Left = 1080
       Top = 47
@@ -269,7 +271,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
     inline frmFrameDateSel1: TfrmFrameDateSel
       Left = 2
       Top = 2
-      Width = 1536
+      Width = 1037
       Height = 37
       Align = alTop
       Color = clWhite
@@ -355,554 +357,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       Width = 150
     end
   end
-  object cxGrid1: TcxGrid [2]
-    Left = 0
-    Top = 149
-    Width = 1540
-    Height = 405
-    Align = alClient
-    PopupMenu = PopupMenu1
-    TabOrder = 2
-    object Tv1: TcxGridDBTableView
-      Navigator.Buttons.CustomButtons = <>
-      ScrollbarAnnotations.CustomAnnotations = <>
-      DataController.DataSource = DS_1
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-      DataController.Summary.DefaultGroupSummaryItems = <
-        item
-          Kind = skSum
-          Position = spFooter
-        end>
-      DataController.Summary.FooterSummaryItems = <
-        item
-          Kind = skCount
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-          Column = v2Column6
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-          Column = Tv1Column28
-        end
-        item
-          Kind = skSum
-          Column = Tv1Column31
-        end
-        item
-          Kind = skSum
-          Column = Tv1Column38
-        end
-        item
-          Kind = skSum
-          Column = Tv1Column39
-        end>
-      DataController.Summary.SummaryGroups = <>
-      OptionsCustomize.ColumnFiltering = False
-      OptionsView.Footer = True
-      OptionsView.GroupByBox = False
-      OptionsView.IndicatorWidth = 40
-      object Tv1Column7: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'ssel'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        Properties.ImmediatePost = True
-        HeaderAlignmentHorz = taCenter
-        Width = 55
-      end
-      object Tv1Column37: TcxGridDBColumn
-        Caption = #20837#24211#21333#21495
-        DataBinding.FieldName = 'BCIONO'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column29: TcxGridDBColumn
-        Caption = #35843#20986#35745#21010#21333#21495
-        DataBinding.FieldName = 'SupOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column30: TcxGridDBColumn
-        Caption = #35843#20986#21512#21516#21495
-        DataBinding.FieldName = 'SupConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column13: TcxGridDBColumn
-        Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'FromOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column19: TcxGridDBColumn
-        Caption = #21512#21516#21495
-        DataBinding.FieldName = 'FromConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column6: TcxGridDBColumn
-        Caption = #20837#24211#26465#30721
-        DataBinding.FieldName = 'BCIOID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column2: TcxGridDBColumn
-        Tag = 2
-        Caption = #20837#24211#26102#38388
-        DataBinding.FieldName = 'ioTime'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.SaveTime = False
-        Properties.ShowTime = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column4: TcxGridDBColumn
-        Tag = 2
-        Caption = #20837#24211#31867#22411
-        DataBinding.FieldName = 'IOType'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          #27491#24120#20837#24211
-          #29983#20135#36864#22238
-          #26399#21021#20837#24211)
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column14: TcxGridDBColumn
-        Tag = 2
-        Caption = #26469#33258#21333#20301
-        DataBinding.FieldName = 'FromCoName'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Alignment.Horz = taLeftJustify
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        Properties.ReadOnly = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #37319#36141#21333#21495
-        DataBinding.FieldName = 'FromPurNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column20: TcxGridDBColumn
-        Caption = #33521#25991#21697#21517
-        DataBinding.FieldName = 'C_EName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v2Column1: TcxGridDBColumn
-        Tag = 2
-        Caption = #21697#21517
-        DataBinding.FieldName = 'C_Name'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column8: TcxGridDBColumn
-        Tag = 2
-        Caption = #35268#26684
-        DataBinding.FieldName = 'C_Spec'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #32568#21495
-        DataBinding.FieldName = 'FtyPCId'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column13: TcxGridDBColumn
-        Caption = #38376#24133
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column11: TcxGridDBColumn
-        Caption = #20811#37325
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #32534#21495
-        DataBinding.FieldName = 'C_Code'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column15: TcxGridDBColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'Pieceint'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v2Column6: TcxGridDBColumn
-        Tag = 2
-        Caption = #25968#37327
-        DataBinding.FieldName = 'Qty'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column3: TcxGridDBColumn
-        Tag = 2
-        Caption = #21333#20301
-        DataBinding.FieldName = 'QtyUnit'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          'Kg'
-          'M'
-          'Y')
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column5: TcxGridDBColumn
-        Tag = 2
-        Caption = #20179#20301
-        DataBinding.FieldName = 'StkCoName'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        Properties.ReadOnly = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column14: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column19: TcxGridDBColumn
-        Caption = #36710#38388
-        DataBinding.FieldName = 'Workshop'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column12: TcxGridDBColumn
-        Tag = 2
-        Caption = #22791#27880
-        DataBinding.FieldName = 'Note'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object v1Column20: TcxGridDBColumn
-        Caption = #19994#21153#21592
-        DataBinding.FieldName = 'Saleser'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #33394#21035
-        DataBinding.FieldName = 'C_ColorDepth'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #30721#23610
-        DataBinding.FieldName = 'Yardstick'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column32: TcxGridDBColumn
-        Caption = #25220#30721
-        DataBinding.FieldName = 'C_Pack'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'C_Color'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column21: TcxGridDBColumn
-        Caption = #33521#25991#39068#33394
-        DataBinding.FieldName = 'C_EColor'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #27454#21495
-        DataBinding.FieldName = 'C_StyleNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column8: TcxGridDBColumn
-        Caption = #33457#22411
-        DataBinding.FieldName = 'C_Pattern'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column36: TcxGridDBColumn
-        Caption = #24211#20301
-        DataBinding.FieldName = 'IOPosition'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column9: TcxGridDBColumn
-        Caption = #25104#20998
-        DataBinding.FieldName = 'C_Composition'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column12: TcxGridDBColumn
-        Caption = #38468#20214
-        DataBinding.FieldName = 'FJFlag'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column15: TcxGridDBColumn
-        Caption = #30331#35760#20154
-        DataBinding.FieldName = 'Filler'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column16: TcxGridDBColumn
-        Caption = #30331#35760#26102#38388
-        DataBinding.FieldName = 'Filltime'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column17: TcxGridDBColumn
-        Caption = #20462#25913#20154
-        DataBinding.FieldName = 'Editer'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column18: TcxGridDBColumn
-        Caption = #20462#25913#26102#38388
-        DataBinding.FieldName = 'Edittime'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column22: TcxGridDBColumn
-        Caption = #31867#22411
-        DataBinding.FieldName = 'C_Degree'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column27: TcxGridDBColumn
-        Caption = #22383#24067#20379#24212#21830
-        DataBinding.FieldName = 'GCFtyName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column25: TcxGridDBColumn
-        Caption = #24067#31181
-        DataBinding.FieldName = 'GC_Name'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column24: TcxGridDBColumn
-        Caption = #21518#25972#29702#33521#25991
-        DataBinding.FieldName = 'CraftEName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column34: TcxGridDBColumn
-        Caption = #32467#26696#31867#22411
-        DataBinding.FieldName = 'SettlementType'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column26: TcxGridDBColumn
-        Caption = #21518#25972#29702#20013#25991
-        DataBinding.FieldName = 'CraftName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column23: TcxGridDBColumn
-        Caption = #21152#24037#21035
-        DataBinding.FieldName = 'CraftCode'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column33: TcxGridDBColumn
-        Caption = #21367#21495
-        DataBinding.FieldName = 'PieceNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column35: TcxGridDBColumn
-        Caption = #38477#32423#21407#22240
-        DataBinding.FieldName = 'Downgrade'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column28: TcxGridDBColumn
-        Caption = #27611#37325
-        DataBinding.FieldName = 'GrossWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column31: TcxGridDBColumn
-        Caption = #20928#37325
-        DataBinding.FieldName = 'NetWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column38: TcxGridDBColumn
-        Caption = #31859#25968
-        DataBinding.FieldName = 'Meter'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column39: TcxGridDBColumn
-        Caption = #30721#25968
-        DataBinding.FieldName = 'Yardage'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-    end
-    object cxGrid1Level1: TcxGridLevel
-      GridView = Tv1
-    end
-  end
   inherited loadProcess: TPanel
     Left = 801
     Top = 360
@@ -916,6 +370,745 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
     ExplicitTop = 296
     ExplicitHeight = 29
   end
+  object cxPageControl1: TcxPageControl [4]
+    Left = 0
+    Top = 149
+    Width = 1041
+    Height = 457
+    Align = alClient
+    TabOrder = 4
+    Properties.ActivePage = cxTabSheet1
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 5
+    OnChange = cxPageControl1Change
+    ExplicitTop = 89
+    ExplicitWidth = 1404
+    ExplicitHeight = 426
+    ClientRectBottom = 457
+    ClientRectRight = 1041
+    ClientRectTop = 32
+    object cxTabSheet1: TcxTabSheet
+      Caption = '  '#20135#21697#27719#24635'  '
+      ImageIndex = 0
+      ExplicitWidth = 1404
+      ExplicitHeight = 394
+      object cxGrid2: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1041
+        Height = 425
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        ExplicitWidth = 1404
+        ExplicitHeight = 394
+        object TV2: TcxGridDBTableView
+          OnDblClick = TV2DblClick
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_2
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <
+            item
+              Kind = skSum
+              Position = spFooter
+            end>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn16
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn15
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.GroupFooters = gfAlwaysVisible
+          OptionsView.IndicatorWidth = 40
+          object TV2Column1: TcxGridDBColumn
+            Caption = #20837#24211#21333#21495
+            DataBinding.FieldName = 'BCIONO'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 115
+          end
+          object cxGridDBColumn14: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 63
+          end
+          object cxGridDBColumn9: TcxGridDBColumn
+            Tag = 2
+            Caption = #21697#21517
+            DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 72
+          end
+          object cxGridDBColumn15: TcxGridDBColumn
+            Caption = #21305#25968
+            DataBinding.FieldName = 'StkPieceint'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 98
+          end
+          object cxGridDBColumn16: TcxGridDBColumn
+            Tag = 2
+            Caption = #25968#37327
+            DataBinding.FieldName = 'StkQty'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxTextEditProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 75
+          end
+          object cxGridDBColumn24: TcxGridDBColumn
+            Caption = #39068#33394
+            DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn26: TcxGridDBColumn
+            Caption = #33394#21495
+            DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn28: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'C_Degree'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn29: TcxGridDBColumn
+            Caption = #33457#22411
+            DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn17: TcxGridDBColumn
+            Tag = 2
+            Caption = #21333#20301
+            DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              'Kg'
+              'M'
+              'Y')
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+        end
+        object cxGridLevel1: TcxGridLevel
+          GridView = TV2
+        end
+      end
+    end
+    object cxTabSheet2: TcxTabSheet
+      Caption = #20135#21697#26126#32454
+      ImageIndex = 1
+      ExplicitWidth = 1540
+      ExplicitHeight = 184
+      object cxGrid1: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1041
+        Height = 425
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        ExplicitTop = 8
+        ExplicitWidth = 1540
+        ExplicitHeight = 241
+        object Tv1: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_1
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <
+            item
+              Kind = skSum
+              Position = spFooter
+            end>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = v2Column6
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column28
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column31
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column38
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column39
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.IndicatorWidth = 40
+          object Tv1Column7: TcxGridDBColumn
+            Caption = #36873#25321
+            DataBinding.FieldName = 'ssel'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            Properties.ImmediatePost = True
+            HeaderAlignmentHorz = taCenter
+            Width = 55
+          end
+          object Tv1Column37: TcxGridDBColumn
+            Caption = #20837#24211#21333#21495
+            DataBinding.FieldName = 'BCIONO'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column29: TcxGridDBColumn
+            Caption = #35843#20986#35745#21010#21333#21495
+            DataBinding.FieldName = 'SupOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column30: TcxGridDBColumn
+            Caption = #35843#20986#21512#21516#21495
+            DataBinding.FieldName = 'SupConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column13: TcxGridDBColumn
+            Caption = #35745#21010#21333#21495
+            DataBinding.FieldName = 'FromOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column19: TcxGridDBColumn
+            Caption = #21512#21516#21495
+            DataBinding.FieldName = 'FromConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column6: TcxGridDBColumn
+            Caption = #20837#24211#26465#30721
+            DataBinding.FieldName = 'BCIOID'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column2: TcxGridDBColumn
+            Tag = 2
+            Caption = #20837#24211#26102#38388
+            DataBinding.FieldName = 'ioTime'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxDateEditProperties'
+            Properties.SaveTime = False
+            Properties.ShowTime = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column4: TcxGridDBColumn
+            Tag = 2
+            Caption = #20837#24211#31867#22411
+            DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              #27491#24120#20837#24211
+              #29983#20135#36864#22238
+              #26399#21021#20837#24211)
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column14: TcxGridDBColumn
+            Tag = 2
+            Caption = #26469#33258#21333#20301
+            DataBinding.FieldName = 'FromCoName'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Alignment.Horz = taLeftJustify
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            Properties.ReadOnly = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column11: TcxGridDBColumn
+            Caption = #37319#36141#21333#21495
+            DataBinding.FieldName = 'FromPurNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column20: TcxGridDBColumn
+            Caption = #33521#25991#21697#21517
+            DataBinding.FieldName = 'C_EName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v2Column1: TcxGridDBColumn
+            Tag = 2
+            Caption = #21697#21517
+            DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column8: TcxGridDBColumn
+            Tag = 2
+            Caption = #35268#26684
+            DataBinding.FieldName = 'C_Spec'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            HeaderGlyphAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column4: TcxGridDBColumn
+            Caption = #32568#21495
+            DataBinding.FieldName = 'FtyPCId'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column13: TcxGridDBColumn
+            Caption = #38376#24133
+            DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column11: TcxGridDBColumn
+            Caption = #20811#37325
+            DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column6: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column15: TcxGridDBColumn
+            Caption = #21305#25968
+            DataBinding.FieldName = 'Pieceint'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v2Column6: TcxGridDBColumn
+            Tag = 2
+            Caption = #25968#37327
+            DataBinding.FieldName = 'Qty'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxTextEditProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column3: TcxGridDBColumn
+            Tag = 2
+            Caption = #21333#20301
+            DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              'Kg'
+              'M'
+              'Y')
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column5: TcxGridDBColumn
+            Tag = 2
+            Caption = #20179#20301
+            DataBinding.FieldName = 'StkCoName'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            Properties.ReadOnly = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column14: TcxGridDBColumn
+            Caption = #25209#21495
+            DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column19: TcxGridDBColumn
+            Caption = #36710#38388
+            DataBinding.FieldName = 'Workshop'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column12: TcxGridDBColumn
+            Tag = 2
+            Caption = #22791#27880
+            DataBinding.FieldName = 'Note'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object v1Column20: TcxGridDBColumn
+            Caption = #19994#21153#21592
+            DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column3: TcxGridDBColumn
+            Caption = #33394#21035
+            DataBinding.FieldName = 'C_ColorDepth'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column5: TcxGridDBColumn
+            Caption = #30721#23610
+            DataBinding.FieldName = 'Yardstick'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column32: TcxGridDBColumn
+            Caption = #25220#30721
+            DataBinding.FieldName = 'C_Pack'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column1: TcxGridDBColumn
+            Caption = #39068#33394
+            DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column21: TcxGridDBColumn
+            Caption = #33521#25991#39068#33394
+            DataBinding.FieldName = 'C_EColor'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column2: TcxGridDBColumn
+            Caption = #33394#21495
+            DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column10: TcxGridDBColumn
+            Caption = #27454#21495
+            DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column8: TcxGridDBColumn
+            Caption = #33457#22411
+            DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column36: TcxGridDBColumn
+            Caption = #24211#20301
+            DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column9: TcxGridDBColumn
+            Caption = #25104#20998
+            DataBinding.FieldName = 'C_Composition'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column12: TcxGridDBColumn
+            Caption = #38468#20214
+            DataBinding.FieldName = 'FJFlag'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column15: TcxGridDBColumn
+            Caption = #30331#35760#20154
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column16: TcxGridDBColumn
+            Caption = #30331#35760#26102#38388
+            DataBinding.FieldName = 'Filltime'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column17: TcxGridDBColumn
+            Caption = #20462#25913#20154
+            DataBinding.FieldName = 'Editer'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column18: TcxGridDBColumn
+            Caption = #20462#25913#26102#38388
+            DataBinding.FieldName = 'Edittime'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column22: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'C_Degree'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column27: TcxGridDBColumn
+            Caption = #22383#24067#20379#24212#21830
+            DataBinding.FieldName = 'GCFtyName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column25: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column24: TcxGridDBColumn
+            Caption = #21518#25972#29702#33521#25991
+            DataBinding.FieldName = 'CraftEName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column34: TcxGridDBColumn
+            Caption = #32467#26696#31867#22411
+            DataBinding.FieldName = 'SettlementType'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column26: TcxGridDBColumn
+            Caption = #21518#25972#29702#20013#25991
+            DataBinding.FieldName = 'CraftName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column23: TcxGridDBColumn
+            Caption = #21152#24037#21035
+            DataBinding.FieldName = 'CraftCode'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column33: TcxGridDBColumn
+            Caption = #21367#21495
+            DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column35: TcxGridDBColumn
+            Caption = #38477#32423#21407#22240
+            DataBinding.FieldName = 'Downgrade'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column28: TcxGridDBColumn
+            Caption = #27611#37325
+            DataBinding.FieldName = 'GrossWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object Tv1Column31: TcxGridDBColumn
+            Caption = #20928#37325
+            DataBinding.FieldName = 'NetWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object Tv1Column38: TcxGridDBColumn
+            Caption = #31859#25968
+            DataBinding.FieldName = 'Meter'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object Tv1Column39: TcxGridDBColumn
+            Caption = #30721#25968
+            DataBinding.FieldName = 'Yardage'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+        end
+        object cxGrid1Level1: TcxGridLevel
+          GridView = Tv1
+        end
+      end
+    end
+  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Left = 105
@@ -975,4 +1168,28 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
       OnClick = N2Click
     end
   end
+  object GPM_2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 512
+    Top = 320
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 576
+    Top = 320
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 640
+    Top = 320
+  end
+  object ADO_2: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 720
+    Top = 317
+  end
 end
diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
index 16a5ff1..59b7438 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
@@ -44,72 +44,19 @@ type
     FromCoName: TcxTextEdit;
     BCIONo: TcxTextEdit;
     C_spec: TcxTextEdit;
-    cxGrid1: TcxGrid;
-    Tv1: TcxGridDBTableView;
-    v1Column6: TcxGridDBColumn;
-    v1Column2: TcxGridDBColumn;
-    v1Column4: TcxGridDBColumn;
-    v1Column14: TcxGridDBColumn;
-    v2Column1: TcxGridDBColumn;
-    v1Column8: TcxGridDBColumn;
-    v2Column6: TcxGridDBColumn;
-    v1Column3: TcxGridDBColumn;
-    v1Column5: TcxGridDBColumn;
-    v1Column12: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
     Label10: TLabel;
     BatchNo: TcxTextEdit;
-    v1Column11: TcxGridDBColumn;
-    v1Column13: TcxGridDBColumn;
-    v1Column15: TcxGridDBColumn;
-    v1Column19: TcxGridDBColumn;
-    v1Column20: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
     ToolButton1: TToolButton;
-    Tv1Column1: TcxGridDBColumn;
     ToolButton2: TToolButton;
-    Tv1Column2: TcxGridDBColumn;
-    Tv1Column4: TcxGridDBColumn;
-    Tv1Column6: TcxGridDBColumn;
-    Tv1Column7: TcxGridDBColumn;
-    Tv1Column8: TcxGridDBColumn;
-    Tv1Column9: TcxGridDBColumn;
-    Tv1Column10: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
     ToolButton3: TToolButton;
-    Tv1Column12: TcxGridDBColumn;
-    Tv1Column13: TcxGridDBColumn;
     Label6: TLabel;
     FromOrdNo: TcxTextEdit;
-    Tv1Column14: TcxGridDBColumn;
-    Tv1Column15: TcxGridDBColumn;
-    Tv1Column16: TcxGridDBColumn;
-    Tv1Column17: TcxGridDBColumn;
-    Tv1Column18: TcxGridDBColumn;
-    Tv1Column19: TcxGridDBColumn;
-    Tv1Column20: TcxGridDBColumn;
-    Tv1Column21: TcxGridDBColumn;
     frmFrameDateSel1: TfrmFrameDateSel;
     IOType: TcxComboBox;
-    Tv1Column22: TcxGridDBColumn;
-    Tv1Column23: TcxGridDBColumn;
-    Tv1Column24: TcxGridDBColumn;
-    Tv1Column25: TcxGridDBColumn;
-    Tv1Column26: TcxGridDBColumn;
     Label1: TLabel;
     Label2: TLabel;
     GC_Name: TcxTextEdit;
     CraftCode: TcxTextEdit;
-    Tv1Column27: TcxGridDBColumn;
-    Tv1Column29: TcxGridDBColumn;
-    Tv1Column30: TcxGridDBColumn;
-    Tv1Column32: TcxGridDBColumn;
-    Tv1Column33: TcxGridDBColumn;
-    Tv1Column34: TcxGridDBColumn;
-    Tv1Column35: TcxGridDBColumn;
-    Tv1Column36: TcxGridDBColumn;
-    Tv1Column37: TcxGridDBColumn;
     Label7: TLabel;
     FtyPCId: TcxTextEdit;
     Label9: TLabel;
@@ -117,10 +64,83 @@ type
     Label11: TLabel;
     BCIOID: TcxTextEdit;
     btn1: TToolButton;
+    GPM_2: TcxGridPopupMenu;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    ADO_2: TADOQuery;
+    cxPageControl1: TcxPageControl;
+    cxTabSheet1: TcxTabSheet;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridDBColumn29: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    cxTabSheet2: TcxTabSheet;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column37: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    Tv1Column30: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column19: TcxGridDBColumn;
+    v1Column6: TcxGridDBColumn;
+    v1Column2: TcxGridDBColumn;
+    v1Column4: TcxGridDBColumn;
+    v1Column14: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
+    v1Column8: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    v1Column13: TcxGridDBColumn;
+    v1Column11: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    v1Column15: TcxGridDBColumn;
+    v2Column6: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    v1Column5: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    v1Column19: TcxGridDBColumn;
+    v1Column12: TcxGridDBColumn;
+    v1Column20: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column32: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column36: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    Tv1Column18: TcxGridDBColumn;
+    Tv1Column22: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column25: TcxGridDBColumn;
+    Tv1Column24: TcxGridDBColumn;
+    Tv1Column34: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    Tv1Column23: TcxGridDBColumn;
+    Tv1Column33: TcxGridDBColumn;
+    Tv1Column35: TcxGridDBColumn;
     Tv1Column28: TcxGridDBColumn;
     Tv1Column31: TcxGridDBColumn;
     Tv1Column38: TcxGridDBColumn;
     Tv1Column39: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    TV2Column1: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -150,13 +170,15 @@ type
     procedure BCIONoKeyPress(Sender: TObject; var Key: Char);
     procedure IOTypePropertiesChange(Sender: TObject);
     procedure btn1Click(Sender: TObject);
+    procedure TV2DblClick(Sender: TObject);
+    procedure cxPageControl1Change(Sender: TObject);
   private
-    canshu1, canshu2, canshu3, canshu4: string;
-    procedure InitGrid();
+    canshu1, FSTKName, canshu3, canshu4: string;
+    procedure InitGrid1();
+    procedure InitGrid2();
     procedure setStatus();
     { Private declarations }
   public
-    FSTKName: string;
     { Public declarations }
   end;
 
@@ -182,17 +204,16 @@ procedure TfrmTradeClothTotalInList.FormCreate(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
-  frmFrameDateSel1.BegDate.Date := frmFrameDateSel1.EndDate.Date - 30;
+  frmFrameDateSel1.BegDate.Date := frmFrameDateSel1.EndDate.Date - 3;
   canshu1 := Trim(self.fParameters1);
-  canshu2 := Trim(self.fParameters2);
+  FSTKName := Trim(self.fParameters2);
   canshu3 := Trim(self.fParameters3);
-
   canshu4 := Trim(self.fParameters4);
 end;
 
-procedure TfrmTradeClothTotalInList.InitGrid();
+procedure TfrmTradeClothTotalInList.InitGrid1();
 var
-  SqlStr: string;
+  SqlStr, WSqlStr: string;
 begin
 
   SqlStr := ' select A.* ,Pieceint=CEILING(A.Piece) ';
@@ -203,6 +224,10 @@ begin
   SqlStr := SqlStr + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + '''';
   SqlStr := SqlStr + ' and IOFlag=''���''  ';
 
+  WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}');
+  if TRIM(WSqlStr) <> '' then
+    SqlStr := SqlStr + ' and ' + WSqlStr;
+
   if Trim(canshu4) <> '' then
     SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
 
@@ -211,6 +236,24 @@ begin
   InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
 end;
 
+procedure TfrmTradeClothTotalInList.InitGrid2();
+var
+  SqlStr: string;
+begin
+  SqlStr := ' select A.BCIONO,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.StkPiece)),StkQty=sum(StkQty),QtyUnit ';
+  SqlStr := SqlStr + ' from BS_Cloth_IO A    ';
+  SqlStr := SqlStr + ' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)) + '''';
+  SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + '''';
+  SqlStr := SqlStr + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + '''';
+  SqlStr := SqlStr + ' and IOFlag=''���''  ';
+  if Trim(canshu4) <> '' then
+    SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
+
+  SqlStr := SqlStr + ' group by A.BCIONO,C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit';
+
+  InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
+end;
+
 procedure TfrmTradeClothTotalInList.IOTypePropertiesChange(Sender: TObject);
 begin
   TBFind.Click;
@@ -219,12 +262,14 @@ end;
 procedure TfrmTradeClothTotalInList.TBRafreshClick(Sender: TObject);
 begin
   frmFrameDateSel1.BegDate.SetFocus;
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(Self.Caption, Tv1, 'ó�׻��ֿܲ�');
+
+  WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó�׻��ֿܲ�');
+  WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó�׻��ֿܲ�');
 end;
 
 procedure TfrmTradeClothTotalInList.ToolButton2Click(Sender: TObject);
@@ -232,6 +277,10 @@ var
   MFiltration: string;
   MPrintJson: string;
 begin
+
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
+
   if CDS_1.IsEmpty then
     Exit;
   if CDS_1.Locate('SSel', True, []) = False then
@@ -252,6 +301,8 @@ end;
 
 procedure TfrmTradeClothTotalInList.ToolButton3Click(Sender: TObject);
 begin
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
   if CDS_1.IsEmpty then
     Exit;
   try
@@ -271,10 +322,15 @@ begin
   end;
 end;
 
+procedure TfrmTradeClothTotalInList.TV2DblClick(Sender: TObject);
+begin
+  cxPageControl1.ActivePageIndex := 1;
+end;
+
 procedure TfrmTradeClothTotalInList.BCIONoKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
-    InitGrid();
+    InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.btn1Click(Sender: TObject);
@@ -288,7 +344,7 @@ begin
       FSTKName := Self.FSTKName;
       if ShowModal = 1 then
       begin
-        Self.InitGrid();
+        Self.InitGrid2();
       end;
     end;
   finally
@@ -324,9 +380,10 @@ begin
   inherited;
   mSql := 'select distinct name=A.IOType from BS_Cloth_IO A where IOFlag=''���'' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''' ';
   SInitTcxComBoxBySql(ADOQueryTemp, IOType, false, mSql);
-  ReadCxGrid(Self.Caption, Tv1, 'ó�׻��ֿܲ�');
+  ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó�׻��ֿܲ�');
+  ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó�׻��ֿܲ�');
   setStatus();
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.TBExportClick(Sender: TObject);
@@ -357,6 +414,8 @@ var
   MBCIOID, MBCIONO: string;
 begin
 
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
   if CDS_1.IsEmpty then
     Exit;
   if CDS_1.Locate('SSel', True, []) = False then
@@ -408,11 +467,11 @@ begin
     if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
       raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
     ADOQueryCmd.Connection.CommitTrans;
-    InitGrid();
+    InitGrid2();
   except
     ADOQueryCmd.Connection.RollbackTrans;
     application.MessageBox(PChar(Exception(ExceptObject).Message), '��ʾ��Ϣ', 0);
-    InitGrid();
+    InitGrid2();
   end;
 
 end;
@@ -428,7 +487,7 @@ begin
       FSTKName := Self.FSTKName;
       if ShowModal = 1 then
       begin
-        Self.InitGrid();
+        Self.InitGrid2();
       end;
     end;
   finally
@@ -438,6 +497,8 @@ end;
 
 procedure TfrmTradeClothTotalInList.TBEditClick(Sender: TObject);
 begin
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
   if CDS_1.IsEmpty then
     Exit;
   with ADOQueryTemp do
@@ -479,7 +540,7 @@ begin
       FSTKName := Self.FSTKName;
       if ShowModal = 1 then
       begin
-        Self.InitGrid();
+        Self.InitGrid2();
       end;
     end;
   finally
@@ -511,40 +572,50 @@ procedure TfrmTradeClothTotalInList.cxButton1Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton1Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.cxButton2Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton2Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.cxButton3Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton3Click(Sender);
-  InitGrid()
+  InitGrid2()
 end;
 
 procedure TfrmTradeClothTotalInList.cxButton4Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton4Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalInList.cxButton5Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton5Click(Sender);
-  InitGrid();
+  InitGrid2();
+end;
+
+procedure TfrmTradeClothTotalInList.cxPageControl1Change(Sender: TObject);
+begin
+  case cxPageControl1.ActivePageIndex of
+    1:
+      begin
+        InitGrid1();
+      end;
+  end;
 end;
 
 procedure TfrmTradeClothTotalInList.cxTabControl1Change(Sender: TObject);
 begin
-  InitGrid();
+  InitGrid2();
 end;
 
 end.
diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
index 29676c9..15456e3 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
@@ -2,22 +2,22 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
   Left = 65
   Top = 98
   Caption = #36152#26131#24067#21305#20986#24211#21015#34920
-  ClientHeight = 564
-  ClientWidth = 1597
+  ClientHeight = 490
+  ClientWidth = 1281
   Color = clBtnFace
   Font.Height = -16
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitWidth = 1613
-  ExplicitHeight = 603
+  ExplicitWidth = 1297
+  ExplicitHeight = 529
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1597
+    Width = 1281
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -28,7 +28,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
     List = True
     ParentColor = False
     ShowCaptions = True
-    TabOrder = 3
+    TabOrder = 2
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -43,7 +43,6 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       AutoSize = True
       Caption = #36807#28388
       ImageIndex = 0
-      Visible = False
       OnClick = TBFindClick
     end
     object TBAdd: TToolButton
@@ -82,12 +81,12 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       Left = 458
       Top = 0
       AutoSize = True
-      Caption = #25171#21360
+      Caption = #30721#21333#25171#21360
       ImageIndex = 21
       OnClick = ToolButton2Click
     end
     object ToolButton3: TToolButton
-      Left = 529
+      Left = 561
       Top = 0
       AutoSize = True
       Caption = #38468#20214
@@ -95,7 +94,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       OnClick = ToolButton3Click
     end
     object TBExport: TToolButton
-      Left = 600
+      Left = 632
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -103,7 +102,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 671
+      Left = 703
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -111,7 +110,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 774
+      Left = 806
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -122,14 +121,15 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
   object Panel1: TPanel [1]
     Left = 0
     Top = 30
-    Width = 1597
+    Width = 1281
     Height = 118
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     ParentBackground = False
     ParentColor = True
-    TabOrder = 4
+    TabOrder = 3
+    ExplicitWidth = 1597
     object Label3: TLabel
       Left = 261
       Top = 46
@@ -266,7 +266,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
     inline frmFrameDateSel1: TfrmFrameDateSel
       Left = 2
       Top = 2
-      Width = 1593
+      Width = 1277
       Height = 36
       Align = alTop
       Color = clWhite
@@ -277,7 +277,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       ExplicitTop = 2
       ExplicitWidth = 1593
       DesignSize = (
-        1593
+        1277
         36)
       inherited lbl2: TLabel
         Width = 16
@@ -327,539 +327,6 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
       Width = 150
     end
   end
-  object cxGrid1: TcxGrid [2]
-    Left = 0
-    Top = 148
-    Width = 1597
-    Height = 416
-    Align = alClient
-    PopupMenu = PopupMenu1
-    TabOrder = 2
-    object Tv1: TcxGridDBTableView
-      Navigator.Buttons.CustomButtons = <>
-      ScrollbarAnnotations.CustomAnnotations = <>
-      DataController.DataSource = DataSource1
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-      DataController.Summary.DefaultGroupSummaryItems = <
-        item
-          Kind = skSum
-          Position = spFooter
-          Column = v1Column19
-        end
-        item
-          Kind = skSum
-          Column = v1Column19
-        end>
-      DataController.Summary.FooterSummaryItems = <
-        item
-          Kind = skCount
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-          Column = v2Column6
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skSum
-          Column = v1Column19
-        end
-        item
-          Kind = skSum
-        end
-        item
-          Kind = skCount
-          Column = Tv1Column35
-        end>
-      DataController.Summary.SummaryGroups = <>
-      OptionsCustomize.ColumnFiltering = False
-      OptionsView.Footer = True
-      OptionsView.GroupByBox = False
-      OptionsView.IndicatorWidth = 40
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'SSel'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        Properties.ImmediatePost = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object v1Column5: TcxGridDBColumn
-        Caption = #36710#38388
-        DataBinding.FieldName = 'Workshop'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column6: TcxGridDBColumn
-        Caption = #20986#24211#21333#21495
-        DataBinding.FieldName = 'BCIONO'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column2: TcxGridDBColumn
-        Tag = 2
-        Caption = #20986#24211#26102#38388
-        DataBinding.FieldName = 'IOTime'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.SaveTime = False
-        Properties.ShowTime = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column4: TcxGridDBColumn
-        Tag = 2
-        Caption = #20986#24211#31867#22411
-        DataBinding.FieldName = 'IOType'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          #21152#24037#20986#24211
-          #24179#31227#20986#24211
-          #36864#36135)
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column15: TcxGridDBColumn
-        Tag = 2
-        Caption = #25152#23646#31867#22411
-        DataBinding.FieldName = 'SSType'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          #33258#24049
-          #23458#25143)
-        Visible = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 44
-      end
-      object v1Column1: TcxGridDBColumn
-        Caption = #37319#36141#21333#21495
-        DataBinding.FieldName = 'ConNo'
-        DataBinding.IsNullValueType = True
-        Visible = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 44
-      end
-      object v1Column14: TcxGridDBColumn
-        Tag = 2
-        Caption = #26469#33258#21333#20301
-        DataBinding.FieldName = 'FromCoName'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Alignment.Horz = taLeftJustify
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        Properties.ReadOnly = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column13: TcxGridDBColumn
-        Caption = #38376#24133
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column16: TcxGridDBColumn
-        Caption = #20811#37325
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column17: TcxGridDBColumn
-        Caption = #21697#29260
-        DataBinding.FieldName = 'SXPinPai'
-        DataBinding.IsNullValueType = True
-        Visible = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 44
-      end
-      object v2Column1: TcxGridDBColumn
-        Tag = 2
-        Caption = #21697#21517
-        DataBinding.FieldName = 'C_Name'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column20: TcxGridDBColumn
-        Caption = #32534#21495
-        DataBinding.FieldName = 'SPCode'
-        DataBinding.IsNullValueType = True
-        Visible = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 44
-      end
-      object v1Column8: TcxGridDBColumn
-        Tag = 2
-        Caption = #35268#26684
-        DataBinding.FieldName = 'C_Spec'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column10: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        Visible = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 44
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column7: TcxGridDBColumn
-        Caption = #32568#21495
-        DataBinding.FieldName = 'FtyPCId'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object v1Column18: TcxGridDBColumn
-        Caption = #20986#21040#35745#21010#21333
-        DataBinding.FieldName = 'ToOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'FromOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column28: TcxGridDBColumn
-        Caption = #21512#24182#21333#21495
-        DataBinding.FieldName = 'fromMasterOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column29: TcxGridDBColumn
-        Caption = #20986#21040#21512#24182#21333#21495
-        DataBinding.FieldName = 'ToMasterOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column18: TcxGridDBColumn
-        Caption = #20986#21040#21333#20301
-        DataBinding.FieldName = 'ToCoName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column19: TcxGridDBColumn
-        Caption = #20179#20301
-        DataBinding.FieldName = 'StkCoName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column19: TcxGridDBColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'Pieceint'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column35: TcxGridDBColumn
-        Caption = #21367#21495
-        DataBinding.FieldName = 'PieceNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object v2Column6: TcxGridDBColumn
-        Tag = 2
-        Caption = #25968#37327
-        DataBinding.FieldName = 'Qty'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column3: TcxGridDBColumn
-        Tag = 2
-        Caption = #21333#20301
-        DataBinding.FieldName = 'QtyUnit'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column8: TcxGridDBColumn
-        Caption = #32534#21495
-        DataBinding.FieldName = 'C_Code'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #21305#37325
-        DataBinding.FieldName = 'PieceWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'C_Color'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #33394#21035
-        DataBinding.FieldName = 'C_ColorDepth'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column9: TcxGridDBColumn
-        Caption = #33457#22411
-        DataBinding.FieldName = 'C_Pattern'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column30: TcxGridDBColumn
-        Caption = #21512#21516#21495
-        DataBinding.FieldName = 'fromConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column31: TcxGridDBColumn
-        Caption = #20986#21040#21512#21516#21495
-        DataBinding.FieldName = 'ToConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #25104#20998
-        DataBinding.FieldName = 'C_Composition'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #27454#21495
-        DataBinding.FieldName = 'C_StyleNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column21: TcxGridDBColumn
-        Caption = #33521#25991#39068#33394
-        DataBinding.FieldName = 'C_EColor'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column22: TcxGridDBColumn
-        Caption = #31867#22411
-        DataBinding.FieldName = 'C_Degree'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column13: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column12: TcxGridDBColumn
-        Caption = #38468#20214
-        DataBinding.FieldName = 'FJFlag'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object v1Column12: TcxGridDBColumn
-        Tag = 2
-        Caption = #22791#27880
-        DataBinding.FieldName = 'Note'
-        DataBinding.IsNullValueType = True
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column14: TcxGridDBColumn
-        Caption = #30331#35760#20154
-        DataBinding.FieldName = 'Filler'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column15: TcxGridDBColumn
-        Caption = #30331#35760#26102#38388
-        DataBinding.FieldName = 'Filltime'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column20: TcxGridDBColumn
-        Caption = #33521#25991#21697#21517
-        DataBinding.FieldName = 'C_EName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column16: TcxGridDBColumn
-        Caption = #20462#25913#20154
-        DataBinding.FieldName = 'Editer'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column17: TcxGridDBColumn
-        Caption = #20462#25913#26102#38388
-        DataBinding.FieldName = 'Edittime'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column23: TcxGridDBColumn
-        Caption = #22383#24067#20379#24212#21830
-        DataBinding.FieldName = 'GCFtyName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column32: TcxGridDBColumn
-        Caption = #35760#24405#21495
-        DataBinding.FieldName = 'BCIOID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column24: TcxGridDBColumn
-        Caption = #21152#24037#21035
-        DataBinding.FieldName = 'CraftCode'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column25: TcxGridDBColumn
-        Caption = #24067#31181
-        DataBinding.FieldName = 'GC_Name'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column26: TcxGridDBColumn
-        Caption = #21518#21152#24037#33521#25991
-        DataBinding.FieldName = 'CraftEName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column27: TcxGridDBColumn
-        Caption = #21518#21152#24037#20013#25991
-        DataBinding.FieldName = 'CraftName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column33: TcxGridDBColumn
-        Caption = #27611#37325
-        DataBinding.FieldName = 'QtyKgGross'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column34: TcxGridDBColumn
-        Caption = #20928#37325
-        DataBinding.FieldName = 'QtyKgNet'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-    end
-    object cxGrid1Level1: TcxGridLevel
-      GridView = Tv1
-    end
-  end
   inherited loadProcess: TPanel
     Left = 888
     Top = 296
@@ -873,56 +340,788 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
     ExplicitTop = 398
     ExplicitHeight = 29
   end
+  object cxPageControl1: TcxPageControl [4]
+    Left = 0
+    Top = 148
+    Width = 1281
+    Height = 342
+    Align = alClient
+    TabOrder = 4
+    Properties.ActivePage = cxTabSheet1
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 5
+    OnChange = cxPageControl1Change
+    ExplicitTop = 89
+    ExplicitWidth = 1404
+    ExplicitHeight = 426
+    ClientRectBottom = 342
+    ClientRectRight = 1281
+    ClientRectTop = 32
+    object cxTabSheet1: TcxTabSheet
+      Caption = '  '#20135#21697#27719#24635'  '
+      ImageIndex = 0
+      ExplicitWidth = 1404
+      ExplicitHeight = 394
+      object cxGrid2: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1281
+        Height = 310
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        ExplicitWidth = 1404
+        ExplicitHeight = 394
+        object TV2: TcxGridDBTableView
+          OnDblClick = TV2DblClick
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_2
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <
+            item
+              Kind = skSum
+              Position = spFooter
+            end>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn16
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn15
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.GroupFooters = gfAlwaysVisible
+          OptionsView.IndicatorWidth = 40
+          object TV2Column1: TcxGridDBColumn
+            Caption = #20986#24211#21333#21495
+            DataBinding.FieldName = 'BCIONO'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 104
+          end
+          object TV2Column2: TcxGridDBColumn
+            Caption = #23458#25143
+            DataBinding.FieldName = 'ToCoName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 106
+          end
+          object cxGridDBColumn14: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn9: TcxGridDBColumn
+            Tag = 2
+            Caption = #21697#21517
+            DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 69
+          end
+          object cxGridDBColumn15: TcxGridDBColumn
+            Caption = #21305#25968
+            DataBinding.FieldName = 'Pieceint'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 98
+          end
+          object cxGridDBColumn16: TcxGridDBColumn
+            Tag = 2
+            Caption = #25968#37327
+            DataBinding.FieldName = 'Qty'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxTextEditProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 75
+          end
+          object cxGridDBColumn24: TcxGridDBColumn
+            Caption = #39068#33394
+            DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn26: TcxGridDBColumn
+            Caption = #33394#21495
+            DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn28: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'C_Degree'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn29: TcxGridDBColumn
+            Caption = #33457#22411
+            DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object cxGridDBColumn17: TcxGridDBColumn
+            Tag = 2
+            Caption = #21333#20301
+            DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              'Kg'
+              'M'
+              'Y')
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+        end
+        object cxGridLevel1: TcxGridLevel
+          GridView = TV2
+        end
+      end
+    end
+    object cxTabSheet2: TcxTabSheet
+      Caption = #20135#21697#26126#32454
+      ImageIndex = 1
+      ExplicitWidth = 1597
+      ExplicitHeight = 255
+      object cxGrid1: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1281
+        Height = 310
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        ExplicitTop = 8
+        ExplicitWidth = 1597
+        ExplicitHeight = 229
+        object Tv1: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_1
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <
+            item
+              Kind = skSum
+              Position = spFooter
+              Column = v1Column19
+            end
+            item
+              Kind = skSum
+              Column = v1Column19
+            end>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = v2Column6
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = v1Column19
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+              Column = Tv1Column35
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.IndicatorWidth = 40
+          object Tv1Column5: TcxGridDBColumn
+            Caption = #36873#25321
+            DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            Properties.ImmediatePost = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object v1Column5: TcxGridDBColumn
+            Caption = #36710#38388
+            DataBinding.FieldName = 'Workshop'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column6: TcxGridDBColumn
+            Caption = #20986#24211#21333#21495
+            DataBinding.FieldName = 'BCIONO'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column2: TcxGridDBColumn
+            Tag = 2
+            Caption = #20986#24211#26102#38388
+            DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxDateEditProperties'
+            Properties.SaveTime = False
+            Properties.ShowTime = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column4: TcxGridDBColumn
+            Tag = 2
+            Caption = #20986#24211#31867#22411
+            DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              #21152#24037#20986#24211
+              #24179#31227#20986#24211
+              #36864#36135)
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column15: TcxGridDBColumn
+            Tag = 2
+            Caption = #25152#23646#31867#22411
+            DataBinding.FieldName = 'SSType'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxComboBoxProperties'
+            Properties.DropDownListStyle = lsFixedList
+            Properties.Items.Strings = (
+              #33258#24049
+              #23458#25143)
+            Visible = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            VisibleForCustomization = False
+            Width = 44
+          end
+          object v1Column1: TcxGridDBColumn
+            Caption = #37319#36141#21333#21495
+            DataBinding.FieldName = 'ConNo'
+            DataBinding.IsNullValueType = True
+            Visible = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            VisibleForCustomization = False
+            Width = 44
+          end
+          object v1Column14: TcxGridDBColumn
+            Tag = 2
+            Caption = #26469#33258#21333#20301
+            DataBinding.FieldName = 'FromCoName'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Alignment.Horz = taLeftJustify
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            Properties.ReadOnly = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column13: TcxGridDBColumn
+            Caption = #38376#24133
+            DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column16: TcxGridDBColumn
+            Caption = #20811#37325
+            DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column17: TcxGridDBColumn
+            Caption = #21697#29260
+            DataBinding.FieldName = 'SXPinPai'
+            DataBinding.IsNullValueType = True
+            Visible = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            VisibleForCustomization = False
+            Width = 44
+          end
+          object v2Column1: TcxGridDBColumn
+            Tag = 2
+            Caption = #21697#21517
+            DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxButtonEditProperties'
+            Properties.Buttons = <
+              item
+                Default = True
+                Kind = bkEllipsis
+              end>
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column20: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'SPCode'
+            DataBinding.IsNullValueType = True
+            Visible = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            VisibleForCustomization = False
+            Width = 44
+          end
+          object v1Column8: TcxGridDBColumn
+            Tag = 2
+            Caption = #35268#26684
+            DataBinding.FieldName = 'C_Spec'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            HeaderGlyphAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column10: TcxGridDBColumn
+            Caption = #25209#21495
+            DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
+            Visible = False
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            VisibleForCustomization = False
+            Width = 44
+          end
+          object Tv1Column6: TcxGridDBColumn
+            Caption = #33394#21495
+            DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column7: TcxGridDBColumn
+            Caption = #32568#21495
+            DataBinding.FieldName = 'FtyPCId'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object v1Column18: TcxGridDBColumn
+            Caption = #20986#21040#35745#21010#21333
+            DataBinding.FieldName = 'ToOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column1: TcxGridDBColumn
+            Caption = #35745#21010#21333#21495
+            DataBinding.FieldName = 'FromOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column28: TcxGridDBColumn
+            Caption = #21512#24182#21333#21495
+            DataBinding.FieldName = 'fromMasterOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column29: TcxGridDBColumn
+            Caption = #20986#21040#21512#24182#21333#21495
+            DataBinding.FieldName = 'ToMasterOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column18: TcxGridDBColumn
+            Caption = #20986#21040#21333#20301
+            DataBinding.FieldName = 'ToCoName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column19: TcxGridDBColumn
+            Caption = #20179#20301
+            DataBinding.FieldName = 'StkCoName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column19: TcxGridDBColumn
+            Caption = #21305#25968
+            DataBinding.FieldName = 'Pieceint'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column35: TcxGridDBColumn
+            Caption = #21367#21495
+            DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object v2Column6: TcxGridDBColumn
+            Tag = 2
+            Caption = #25968#37327
+            DataBinding.FieldName = 'Qty'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxTextEditProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column3: TcxGridDBColumn
+            Tag = 2
+            Caption = #21333#20301
+            DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column8: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column2: TcxGridDBColumn
+            Caption = #21305#37325
+            DataBinding.FieldName = 'PieceWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column4: TcxGridDBColumn
+            Caption = #39068#33394
+            DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column3: TcxGridDBColumn
+            Caption = #33394#21035
+            DataBinding.FieldName = 'C_ColorDepth'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column9: TcxGridDBColumn
+            Caption = #33457#22411
+            DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column30: TcxGridDBColumn
+            Caption = #21512#21516#21495
+            DataBinding.FieldName = 'fromConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column31: TcxGridDBColumn
+            Caption = #20986#21040#21512#21516#21495
+            DataBinding.FieldName = 'ToConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column10: TcxGridDBColumn
+            Caption = #25104#20998
+            DataBinding.FieldName = 'C_Composition'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column11: TcxGridDBColumn
+            Caption = #27454#21495
+            DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column21: TcxGridDBColumn
+            Caption = #33521#25991#39068#33394
+            DataBinding.FieldName = 'C_EColor'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column22: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'C_Degree'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column13: TcxGridDBColumn
+            Caption = #25209#21495
+            DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column12: TcxGridDBColumn
+            Caption = #38468#20214
+            DataBinding.FieldName = 'FJFlag'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object v1Column12: TcxGridDBColumn
+            Tag = 2
+            Caption = #22791#27880
+            DataBinding.FieldName = 'Note'
+            DataBinding.IsNullValueType = True
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column14: TcxGridDBColumn
+            Caption = #30331#35760#20154
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column15: TcxGridDBColumn
+            Caption = #30331#35760#26102#38388
+            DataBinding.FieldName = 'Filltime'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column20: TcxGridDBColumn
+            Caption = #33521#25991#21697#21517
+            DataBinding.FieldName = 'C_EName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 44
+          end
+          object Tv1Column16: TcxGridDBColumn
+            Caption = #20462#25913#20154
+            DataBinding.FieldName = 'Editer'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column17: TcxGridDBColumn
+            Caption = #20462#25913#26102#38388
+            DataBinding.FieldName = 'Edittime'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column23: TcxGridDBColumn
+            Caption = #22383#24067#20379#24212#21830
+            DataBinding.FieldName = 'GCFtyName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column32: TcxGridDBColumn
+            Caption = #35760#24405#21495
+            DataBinding.FieldName = 'BCIOID'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column24: TcxGridDBColumn
+            Caption = #21152#24037#21035
+            DataBinding.FieldName = 'CraftCode'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column25: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column26: TcxGridDBColumn
+            Caption = #21518#21152#24037#33521#25991
+            DataBinding.FieldName = 'CraftEName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column27: TcxGridDBColumn
+            Caption = #21518#21152#24037#20013#25991
+            DataBinding.FieldName = 'CraftName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column33: TcxGridDBColumn
+            Caption = #27611#37325
+            DataBinding.FieldName = 'QtyKgGross'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+          object Tv1Column34: TcxGridDBColumn
+            Caption = #20928#37325
+            DataBinding.FieldName = 'QtyKgNet'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 44
+          end
+        end
+        object cxGrid1Level1: TcxGridLevel
+          GridView = Tv1
+        end
+      end
+    end
+  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 260
-    Top = 246
+    Left = 504
+    Top = 170
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 92
-    Top = 230
+    Left = 565
+    Top = 170
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 560
-    Top = 300
+    Left = 626
+    Top = 170
   end
-  object ADOQueryMain: TADOQuery
+  object ADO_1: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 821
-    Top = 329
+    Left = 687
+    Top = 170
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 707
-    Top = 306
+    Left = 504
+    Top = 231
   end
-  object DataSource1: TDataSource
-    DataSet = CDS_Main
-    Left = 792
-    Top = 234
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 565
+    Top = 292
   end
   object GPM_1: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 425
-    Top = 254
+    Left = 748
+    Top = 231
   end
-  object CDS_Main: TClientDataSet
+  object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 626
-    Top = 237
+    Left = 687
+    Top = 231
   end
   object PopupMenu1: TPopupMenu
-    Left = 524
-    Top = 412
+    Left = 687
+    Top = 292
     object N1: TMenuItem
       Caption = #20840#36873
       OnClick = N1Click
@@ -939,7 +1138,31 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
   object ADOQueryPrint: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 655
-    Top = 444
+    Left = 748
+    Top = 170
+  end
+  object GPM_2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 504
+    Top = 292
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 626
+    Top = 231
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 626
+    Top = 292
+  end
+  object ADO_2: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 565
+    Top = 231
   end
 end
diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas
index 79ec694..4a3f945 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas
@@ -25,30 +25,17 @@ type
     TBClose: TToolButton;
     Panel1: TPanel;
     ADOQueryCmd: TADOQuery;
-    ADOQueryMain: TADOQuery;
+    ADO_1: TADOQuery;
     ADOQueryTemp: TADOQuery;
-    DataSource1: TDataSource;
+    DS_1: TDataSource;
     GPM_1: TcxGridPopupMenu;
-    CDS_Main: TClientDataSet;
+    CDS_1: TClientDataSet;
     TBDel: TToolButton;
     PopupMenu1: TPopupMenu;
     N1: TMenuItem;
     N2: TMenuItem;
     TBAdd: TToolButton;
     TBEdit: TToolButton;
-    cxGrid1: TcxGrid;
-    Tv1: TcxGridDBTableView;
-    v1Column6: TcxGridDBColumn;
-    v1Column2: TcxGridDBColumn;
-    v1Column4: TcxGridDBColumn;
-    v1Column15: TcxGridDBColumn;
-    v1Column14: TcxGridDBColumn;
-    v2Column1: TcxGridDBColumn;
-    v1Column8: TcxGridDBColumn;
-    v2Column6: TcxGridDBColumn;
-    v1Column3: TcxGridDBColumn;
-    v1Column12: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
     Label3: TLabel;
     Label5: TLabel;
     Label8: TLabel;
@@ -56,36 +43,10 @@ type
     C_NAME: TcxTextEdit;
     BCIONO: TcxTextEdit;
     C_spec: TcxTextEdit;
-    v1Column20: TcxGridDBColumn;
-    v1Column1: TcxGridDBColumn;
-    v1Column10: TcxGridDBColumn;
-    v1Column17: TcxGridDBColumn;
-    v1Column5: TcxGridDBColumn;
-    v1Column13: TcxGridDBColumn;
-    v1Column16: TcxGridDBColumn;
-    v1Column18: TcxGridDBColumn;
-    v1Column19: TcxGridDBColumn;
-    Tv1Column2: TcxGridDBColumn;
     ToolButton1: TToolButton;
-    Tv1Column3: TcxGridDBColumn;
-    Tv1Column4: TcxGridDBColumn;
     ToolButton2: TToolButton;
-    Tv1Column5: TcxGridDBColumn;
-    Tv1Column6: TcxGridDBColumn;
-    Tv1Column1: TcxGridDBColumn;
-    Tv1Column7: TcxGridDBColumn;
-    Tv1Column8: TcxGridDBColumn;
-    Tv1Column9: TcxGridDBColumn;
-    Tv1Column10: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
     N3: TMenuItem;
     ToolButton3: TToolButton;
-    Tv1Column12: TcxGridDBColumn;
-    Tv1Column13: TcxGridDBColumn;
-    Tv1Column14: TcxGridDBColumn;
-    Tv1Column15: TcxGridDBColumn;
-    Tv1Column16: TcxGridDBColumn;
-    Tv1Column17: TcxGridDBColumn;
     Label4: TLabel;
     Label9: TLabel;
     Label6: TLabel;
@@ -94,36 +55,95 @@ type
     ToCoName: TcxTextEdit;
     ToOrdNo: TcxTextEdit;
     FromOrdNo: TcxTextEdit;
-    Tv1Column18: TcxGridDBColumn;
-    Tv1Column19: TcxGridDBColumn;
-    Tv1Column20: TcxGridDBColumn;
-    Tv1Column21: TcxGridDBColumn;
     frmFrameDateSel1: TfrmFrameDateSel;
     IOType: TcxComboBox;
-    Tv1Column22: TcxGridDBColumn;
-    Tv1Column24: TcxGridDBColumn;
-    Tv1Column25: TcxGridDBColumn;
-    Tv1Column26: TcxGridDBColumn;
-    Tv1Column27: TcxGridDBColumn;
     Label1: TLabel;
     Label2: TLabel;
     GC_Name: TcxTextEdit;
     CraftCode: TcxTextEdit;
-    Tv1Column23: TcxGridDBColumn;
+    ADOQueryPrint: TADOQuery;
+    ToolButton4: TToolButton;
+    cxPageControl1: TcxPageControl;
+    cxTabSheet1: TcxTabSheet;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridDBColumn29: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    cxTabSheet2: TcxTabSheet;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    Tv1Column5: TcxGridDBColumn;
+    v1Column5: TcxGridDBColumn;
+    v1Column6: TcxGridDBColumn;
+    v1Column2: TcxGridDBColumn;
+    v1Column4: TcxGridDBColumn;
+    v1Column15: TcxGridDBColumn;
+    v1Column1: TcxGridDBColumn;
+    v1Column14: TcxGridDBColumn;
+    v1Column13: TcxGridDBColumn;
+    v1Column16: TcxGridDBColumn;
+    v1Column17: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
+    v1Column20: TcxGridDBColumn;
+    v1Column8: TcxGridDBColumn;
+    v1Column10: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    v1Column18: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
     Tv1Column28: TcxGridDBColumn;
     Tv1Column29: TcxGridDBColumn;
+    Tv1Column18: TcxGridDBColumn;
+    Tv1Column19: TcxGridDBColumn;
+    v1Column19: TcxGridDBColumn;
+    Tv1Column35: TcxGridDBColumn;
+    v2Column6: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
     Tv1Column30: TcxGridDBColumn;
     Tv1Column31: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    Tv1Column22: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    v1Column12: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    Tv1Column23: TcxGridDBColumn;
     Tv1Column32: TcxGridDBColumn;
+    Tv1Column24: TcxGridDBColumn;
+    Tv1Column25: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
     Tv1Column33: TcxGridDBColumn;
     Tv1Column34: TcxGridDBColumn;
-    ADOQueryPrint: TADOQuery;
-    Tv1Column35: TcxGridDBColumn;
-    ToolButton4: TToolButton;
+    cxGrid1Level1: TcxGridLevel;
+    TV2Column1: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
+    GPM_2: TcxGridPopupMenu;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    ADO_2: TADOQuery;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
-    procedure ConNoMChange(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBExportClick(Sender: TObject);
@@ -151,12 +171,14 @@ type
     procedure BCIONOKeyPress(Sender: TObject; var Key: Char);
     procedure IOTypePropertiesChange(Sender: TObject);
     procedure ToolButton4Click(Sender: TObject);
+    procedure cxPageControl1Change(Sender: TObject);
+    procedure TV2DblClick(Sender: TObject);
   private
-    canshu1, canshu2, canshu4: string;
-    procedure InitGrid();
+    canshu1, FSTKName, canshu3, canshu4: string;
+    procedure InitGrid1();
+    procedure InitGrid2();
     { Private declarations }
   public
-    FFSPID, FstkName, FC_Degree: string;
     { Public declarations }
   end;
 
@@ -171,6 +193,28 @@ uses
 
 {$R *.dfm}
 
+procedure TfrmTradeClothTotalOutList.InitGrid2();
+var
+  SqlStr: string;
+begin
+
+  SqlStr := ' select A.BCIONO,A.ToCoName,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit ';
+
+  SqlStr := SqlStr + '  ,Pieceint=sum(CEILING(A.Piece)),Qty=sum(Qty),QtyUnit ';
+  SqlStr := SqlStr + ' from BS_Cloth_IO A    ';
+  SqlStr := SqlStr + ' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)) + '''';
+  SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + '''';
+  SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
+  SqlStr := SqlStr + ' and ioFlag=''����''  ';
+  if Trim(canshu4) <> '' then
+    SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
+  SqlStr := SqlStr + ' group by A.BCIONO,A.ToCoName,C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit';
+
+//  ShowMessage(SqlStr);
+  InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
+
+end;
+
 procedure TfrmTradeClothTotalOutList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -180,16 +224,17 @@ end;
 procedure TfrmTradeClothTotalOutList.FormCreate(Sender: TObject);
 begin
   inherited;
-  canshu1 := Trim(DParameters1);
-  canshu2 := Trim(DParameters2);
+  canshu1 := Trim(self.fParameters1);
+  FSTKName := Trim(self.fParameters2);
+  canshu3 := Trim(self.fParameters3);
   canshu4 := Trim(self.fParameters4);
   frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
   frmFrameDateSel1.BegDate.Date := frmFrameDateSel1.EndDate.Date - 90;
 end;
 
-procedure TfrmTradeClothTotalOutList.InitGrid();
+procedure TfrmTradeClothTotalOutList.InitGrid1();
 var
-  SqlStr: string;
+  SqlStr, WSqlStr: string;
 begin
 
   SqlStr := ' select A.* ,Pieceint=CEILING(A.Piece)';
@@ -200,10 +245,13 @@ begin
   SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + '''';
   SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
   SqlStr := SqlStr + ' and ioFlag=''����''  ';
+  WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}');
+  if TRIM(WSqlStr) <> '' then
+    SqlStr := SqlStr + ' and ' + WSqlStr;
   if Trim(canshu4) <> '' then
     SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
 
-  InitCDSData(ADOQueryMain, CDS_Main, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
+  InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
 end;
 
 procedure TfrmTradeClothTotalOutList.IOTypePropertiesChange(Sender: TObject);
@@ -214,27 +262,30 @@ end;
 procedure TfrmTradeClothTotalOutList.TBRafreshClick(Sender: TObject);
 begin
   ToolBar1.SetFocus;
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(trim(Self.Caption), Tv1, 'ó�׻��ֿܲ�');
+  WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó�׻��ֿܲ�');
+  WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó�׻��ֿܲ�');
 end;
 
 procedure TfrmTradeClothTotalOutList.ToolButton2Click(Sender: TObject);
 var
   MBCIOID: string;
 begin
-  if CDS_Main.IsEmpty then
-    Exit;
-  if CDS_Main.Locate('SSel', True, []) = False then
-  begin
-    Application.MessageBox('û��ѡ������!', '��ʾ', 0);
-    Exit;
-  end;
 
-  MBCIOID := Trim(SelCDSKey(self.CDS_Main, ['BCIOID'])[0]);
+  case cxPageControl1.ActivePageIndex of
+    0:
+      begin
+        MBCIOID := Trim(CDS_2.fieldbyname('BCIONo').AsString)
+      end;
+    1:
+      begin
+        MBCIOID := Trim(CDS_1.fieldbyname('BCIONo').AsString)
+      end;
+  end;
 
   try
     frmLabelPrint := TfrmLabelPrint.Create(Application);
@@ -245,18 +296,18 @@ begin
       if ShowModal = 1 then
       begin
 
-        with ADOQueryCmd do
-        begin
-          Close;
-          sql.Clear;
-          sql.Add('update BS_Cloth_IO         ');
-          sql.Add(' set PRTer=' + quotedstr(DName));
-          sql.Add(', PRTCount=isnull(PRTCount,0)+1');
-          sql.Add(', PRTDate=getdate()');
-          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(MBCIOID) + ','','') SP where SP.RTValue=BS_Cloth_IO.BCIOID )');
-          ExecSQL;
-        end;
-        Self.InitGrid();
+//        with ADOQueryCmd do
+//        begin
+//          Close;
+//          sql.Clear;
+//          sql.Add('update BS_Cloth_IO         ');
+//          sql.Add(' set PRTer=' + quotedstr(DName));
+//          sql.Add(', PRTCount=isnull(PRTCount,0)+1');
+//          sql.Add(', PRTDate=getdate()');
+//          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(MBCIOID) + ','','') SP where SP.RTValue=BS_Cloth_IO.BCIOID )');
+//          ExecSQL;
+//        end;
+//        Self.InitGrid2();
       end;
     end;
   finally
@@ -266,13 +317,13 @@ end;
 
 procedure TfrmTradeClothTotalOutList.ToolButton3Click(Sender: TObject);
 begin
-  if CDS_Main.IsEmpty then
+  if CDS_1.IsEmpty then
     Exit;
   try
     frmAttachmentUpload := TfrmAttachmentUpload.Create(Application);
     with frmAttachmentUpload do
     begin
-      fkeyNO := Trim(Self.CDS_Main.fieldbyname('BCIOID').AsString);
+      fkeyNO := Trim(Self.CDS_1.fieldbyname('BCIOID').AsString);
       fType := 'ó�׻��ܲ�';
       FEditAuthority := True;
       if ShowModal = 1 then
@@ -287,7 +338,9 @@ end;
 
 procedure TfrmTradeClothTotalOutList.ToolButton4Click(Sender: TObject);
 begin
-  if CDS_Main.Locate('SSel', True, []) = False then
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
+  if CDS_1.Locate('SSel', True, []) = False then
   begin
     Application.MessageBox('û��ѡ������!', '��ʾ', 0);
     Exit;
@@ -297,7 +350,7 @@ begin
     with frmLabelPrint do
     begin
       FLMType := 'TradeLabVolume1';
-      FFiltration1 := Trim(SelCDSKey(self.CDS_Main, ['BCIOID'])[0]);
+      FFiltration1 := Trim(SelCDSKey(self.CDS_1, ['BCIOID'])[0]);
       if ShowModal = 1 then
       begin
 
@@ -308,6 +361,11 @@ begin
   end;
 end;
 
+procedure TfrmTradeClothTotalOutList.TV2DblClick(Sender: TObject);
+begin
+  cxPageControl1.ActivePageIndex := 1;
+end;
+
 procedure TfrmTradeClothTotalOutList.BCIOIDPropertiesChange(Sender: TObject);
 begin
   if Length(Trim(TcxTextEdit(Sender).Text)) < 4 then
@@ -318,15 +376,7 @@ end;
 procedure TfrmTradeClothTotalOutList.BCIONOKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
-    InitGrid();
-end;
-
-procedure TfrmTradeClothTotalOutList.ConNoMChange(Sender: TObject);
-begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-  end;
+    InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.TBCloseClick(Sender: TObject);
@@ -342,24 +392,30 @@ begin
   inherited;
   mSql := 'select distinct name=A.IOType from BS_Cloth_IO A where IOFlag=''����'' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''' ';
   SInitTcxComBoxBySql(ADOQueryTemp, IOType, false, mSql);
-  ReadCxGrid(trim(Self.Caption), Tv1, 'ó�׻��ֿܲ�');
-  InitGrid();
+
+  ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó�׻��ֿܲ�');
+  ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó�׻��ֿܲ�');
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.TBExportClick(Sender: TObject);
 begin
-  if ADOQueryMain.IsEmpty then
+  if CDS_1.IsEmpty then
     exit;
   TcxGridToExcel(FstkName + '�����б�', cxGrid1);
 end;
 
 procedure TfrmTradeClothTotalOutList.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-    SCreateCDS(ADOQueryMain, CDS_Main);
-    SInitCDSData(ADOQueryMain, CDS_Main);
+  case cxPageControl1.ActivePageIndex of
+    0:
+      begin
+        CDSDataFilter(ADO_2, CDS_2, Tv2, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, '  {"EquTag": 1,"LikeTag": 2,"Fields": "C_name|C_Color|C_ColorNo"}') + '"  }');
+      end;
+    1:
+      begin
+        CDSDataFilter(ADO_1, CDS_1, Tv1, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, '  {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + '"  }');
+      end;
   end;
 end;
 
@@ -380,27 +436,29 @@ end;
 
 procedure TfrmTradeClothTotalOutList.N1Click(Sender: TObject);
 begin
-  SelOKNo(CDS_Main, True);
+  SelOKNo(CDS_1, True);
 end;
 
 procedure TfrmTradeClothTotalOutList.N2Click(Sender: TObject);
 begin
-  SelOKNo(CDS_Main, False);
+  SelOKNo(CDS_1, False);
 end;
 
 procedure TfrmTradeClothTotalOutList.N3Click(Sender: TObject);
 begin
-  Clipboard.SetTextBuf(PChar(Trim(CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 
 procedure TfrmTradeClothTotalOutList.TBDelClick(Sender: TObject);
 var
   MBCIOID, MBCIONO: string;
 begin
-  if CDS_Main.IsEmpty then
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
+  if CDS_1.IsEmpty then
     Exit;
 
-  if CDS_Main.Locate('SSel', True, []) = False then
+  if CDS_1.Locate('SSel', True, []) = False then
   begin
     Application.MessageBox('û��ѡ������!', '��ʾ', 0);
     Exit;
@@ -408,8 +466,8 @@ begin
 
   if Application.MessageBox('ȷ��Ҫɾ��������', '��ʾ', 32 + 4) <> IDYES then
     Exit;
-  MBCIOID := SelCDSKey(CDS_Main, ['BCIOID'])[0];
-  MBCIONO := SelCDSKey(CDS_Main, ['BCIONO'])[0];
+  MBCIOID := SelCDSKey(CDS_1, ['BCIOID'])[0];
+  MBCIONO := SelCDSKey(CDS_1, ['BCIONO'])[0];
   with ADOQueryTemp do
   begin
     Close;
@@ -463,11 +521,11 @@ begin
     if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
       raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
     ADOQueryCmd.Connection.CommitTrans;
-    InitGrid();
+    InitGrid2();
   except
     ADOQueryCmd.Connection.RollbackTrans;
     application.MessageBox(PChar(Exception(ExceptObject).Message), '��ʾ��Ϣ', 0);
-    InitGrid();
+    InitGrid2();
   end;
 
 end;
@@ -480,10 +538,9 @@ begin
     begin
       FBCId := '';
       FstkName := Self.FstkName;
-      FC_Degree := Self.FC_Degree;
       if ShowModal = 1 then
       begin
-        Self.InitGrid();
+        Self.InitGrid2();
       end;
     end;
   finally
@@ -493,14 +550,16 @@ end;
 
 procedure TfrmTradeClothTotalOutList.TBEditClick(Sender: TObject);
 begin
-  if CDS_Main.IsEmpty then
+  if cxPageControl1.ActivePageIndex <> 1 then
+    Exit;
+  if CDS_1.IsEmpty then
     Exit;
   with ADOQueryTemp do
   begin
     Close;
     sql.Clear;
     sql.Add('exec P_Fin_Flow_Judge ');
-    Sql.Add(' @FFIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BCIOID').AsString)));
+    Sql.Add(' @FFIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString)));
     Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
     Sql.Add(',@DName=' + quotedstr(Trim(DName)));
     Open;
@@ -515,7 +574,7 @@ begin
     Close;
     Sql.Clear;
     Sql.Add('exec P_Trade_BSCloth_Judge ');
-    Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BCIOID').AsString)));
+    Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString)));
     Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
     Sql.Add(',@DName=' + quotedstr(Trim(DName)));
     Open;
@@ -530,7 +589,7 @@ begin
     Close;
     Sql.Clear;
     Sql.Add('exec P_BS_Cloth_Out_Edit ');
-    Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BCIOID').AsString)));
+    Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString)));
     Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
     Sql.Add(',@DName=' + quotedstr(Trim(DName)));
 //    ShowMessage(sql.Text);
@@ -545,13 +604,12 @@ begin
     frmTradeTotallClothOutinput := TfrmTradeTotallClothOutinput.Create(Application);
     with frmTradeTotallClothOutinput do
     begin
-      FBCId := Trim(CDS_Main.fieldbyname('BCIOID').AsString);
+      FBCId := Trim(CDS_1.fieldbyname('BCIOID').AsString);
 
       FstkName := Self.FstkName;
-      FC_Degree := Self.FC_Degree;
       if ShowModal = 1 then
       begin
-        Self.InitGrid();
+        Self.InitGrid2();
       end;
     end;
   finally
@@ -582,44 +640,54 @@ begin
 //  LabVolume.Text := Trim(ADOQueryTemp.fieldbyname('LabelCaption').AsString);
 end;
 
+procedure TfrmTradeClothTotalOutList.cxPageControl1Change(Sender: TObject);
+begin
+  case cxPageControl1.ActivePageIndex of
+    1:
+      begin
+        InitGrid1();
+      end;
+  end;
+end;
+
 procedure TfrmTradeClothTotalOutList.cxButton1Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton1Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.cxButton2Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton2Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.cxButton3Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton4Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.cxButton4Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton4Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.cxButton5Click(Sender: TObject);
 begin
   inherited;
   frmFrameDateSel1.cxButton5Click(Sender);
-  InitGrid();
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalOutList.cxTabControl1Change(Sender: TObject);
 begin
-  InitGrid();
+  InitGrid2();
 end;
 
 end.
diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
index 7d61f96..c9663b8 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
@@ -127,12 +127,12 @@ type
     procedure TV2DblClick(Sender: TObject);
     procedure cxPageControl1Change(Sender: TObject);
   private
+    canshu1, FSTKName, canshu3, canshu4: string;
     procedure InitGrid();
     procedure InitGrid1();
     procedure InitGrid2();
     { Private declarations }
   public
-    FStkIdS, FstkName, FC_Degree, FC_Pack, canshu4: string;
     { Public declarations }
   end;
 
@@ -173,8 +173,10 @@ end;
 procedure TfrmTradeClothTotalStkList.FormCreate(Sender: TObject);
 begin
   inherited;
-  FC_Degree := Trim(Self.fParameters2);
-  FC_Pack := Trim(Self.fParameters3);
+  canshu1 := Trim(self.fParameters1);
+  FSTKName := Trim(self.fParameters2);
+  canshu3 := Trim(self.fParameters3);
+  canshu4 := Trim(self.fParameters4);
 end;
 
 procedure TfrmTradeClothTotalStkList.InitGrid();
@@ -203,11 +205,6 @@ begin
   SqlStr := SqlStr + ' where A.IOFlag=''���'' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) ';
   SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
 
-  if FC_Degree <> '' then
-    SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
-  if FC_Pack <> '' then
-    SqlStr := SqlStr + ' and isnull(C_Pack,'''')=''' + Trim(FC_Pack) + '''';
-
   if Trim(canshu4) <> '' then
     SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
 
@@ -228,10 +225,6 @@ begin
   SqlStr := SqlStr + ' where A.IOFlag=''���'' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) ';
   SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
 
-  if FC_Degree <> '' then
-    SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
-  if FC_Pack <> '' then
-    SqlStr := SqlStr + ' and isnull(C_Pack,'''')=''' + Trim(FC_Pack) + '''';
   if Trim(canshu4) <> '' then
     SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
   WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"C_Code|C_Name|C_Color|C_ColorNo|C_Pattern|C_Degree|QtyUnit"}');
diff --git a/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm b/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm
index 634aa52..1141c09 100644
--- a/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm
+++ b/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm
@@ -329,7 +329,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
-          DataController.DataSource = DS_2
+          DataController.DataSource = DS_1
           DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
           DataController.Summary.DefaultGroupSummaryItems = <
             item