diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.dfm b/T02贸易汇总仓库/U_ItemizedListInPut.dfm
index 2a39be0..d687970 100644
--- a/T02贸易汇总仓库/U_ItemizedListInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.dfm
@@ -43,16 +43,24 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
       ImageIndex = 21
       OnClick = ToolButton5Click
     end
-    object ToolButton3: TToolButton
+    object ToolButton1: TToolButton
       Left = 174
       Top = 0
       AutoSize = True
+      Caption = #21246#36873#25171#21360
+      ImageIndex = 21
+      OnClick = ToolButton1Click
+    end
+    object ToolButton3: TToolButton
+      Left = 277
+      Top = 0
+      AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 277
+      Left = 380
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -125,7 +133,6 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
         Align = alClient
         PopupMenu = PopupMenu2
         TabOrder = 0
-        ExplicitTop = 2
         object Tv1: TcxGridDBTableView
           OnDblClick = Tv1DblClick
           OnMouseDown = Tv1MouseDown
diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.pas b/T02贸易汇总仓库/U_ItemizedListInPut.pas
index 83bf91d..06367e5 100644
--- a/T02贸易汇总仓库/U_ItemizedListInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.pas
@@ -83,6 +83,7 @@ type
     Tv1Column6: TcxGridDBColumn;
     DS_RCPM: TDataSource;
     ADO_RCPM: TADOQuery;
+    ToolButton1: TToolButton;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -110,6 +111,7 @@ type
     procedure Tv1Column5PropertiesEditValueChanged(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
     procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
     FSCXDH: string;
     FShowKeyid: integer;
@@ -117,7 +119,6 @@ type
     procedure ZDYHelp(FButn: TcxButtonEdit; LType: string);
     function SaveData(): Boolean;
     function getTMMNo(fconNo: string): string;
-
     procedure SetXH();
     procedure initGrid1(MTIMID: string);
     procedure HotyKey(var msg: TMessage); message WM_HOTKEY;    //¿ì½Ý¼ü
@@ -593,6 +594,37 @@ begin
 
 end;
 
+procedure TfrmItemizedListInPut.ToolButton1Click(Sender: TObject);
+var
+  MFiltration: string;
+  MPrintJson: string;
+begin
+  if FTIMID = '' then
+    Exit;
+
+  with ADOQueryBaseTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select Filtration= SUBSTRING(CAST((select distinct '','' +A.BCIOID from BS_Cloth_IO A    ');
+    sql.Add(' where A.IOFlag=''Èë¿â''  ');
+    sql.Add(' and exists(SELECT * from [dbo].[F_Tool_SplitString](' + quotedstr(SelCDSKey(CDS_1, ['TISId'])[0]) + ','','') SP where SP.RTValue=A.TISId )  ');
+    sql.Add(' for xml path('''') ) AS VARCHAR(max)) , 2, 8000)');
+    open;
+  end;
+
+  MFiltration := Trim(ADOQueryBaseTemp.FieldByName('Filtration').AsString);
+
+  MPrintJson := '              {"LMType": "TradeFinishClothInPrt1"    ';
+  MPrintJson := MPrintJson + ' ,"PreviewPrint": true      ';
+  MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '"  } ] }    ';
+  FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
+end;
+
 procedure TfrmItemizedListInPut.ToolButton2Click(Sender: TObject);
 begin
   begin
@@ -765,7 +797,7 @@ begin
     sql.Clear;
     sql.Add(' select Filtration= SUBSTRING(CAST((select distinct '','' +A.BCIOID from BS_Cloth_IO A    ');
     sql.Add(' where A.IOFlag=''Èë¿â'' and TIMID=  ' + quotedstr(Trim(FTIMID)));
-    sql.Add('  for xml path('''') ) AS VARCHAR(1000)) , 2, 1000)');
+    sql.Add('  for xml path('''') ) AS VARCHAR(max)) , 2, 8000)');
     open;
   end;
 
diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
index 3931789..7f7c82f 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
@@ -34,7 +34,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     ParentColor = False
     ParentFont = False
     ShowCaptions = True
-    TabOrder = 3
+    TabOrder = 2
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -52,16 +52,8 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       Visible = False
       OnClick = TBFindClick
     end
-    object ToolButton1: TToolButton
-      Left = 126
-      Top = 0
-      AutoSize = True
-      Caption = #21333#25903#25286#20998
-      ImageIndex = 23
-      OnClick = ToolButton1Click
-    end
     object ToolButton3: TToolButton
-      Left = 213
+      Left = 126
       Top = 0
       AutoSize = True
       Caption = #26631#31614#25171#21360
@@ -69,7 +61,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 300
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -77,7 +69,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 387
+      Left = 300
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -89,73 +81,45 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     Left = 0
     Top = 30
     Width = 1404
-    Height = 85
+    Height = 59
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     ParentBackground = False
     ParentColor = True
-    TabOrder = 5
+    TabOrder = 3
     object Label3: TLabel
-      Left = 273
-      Top = 11
+      Left = 50
+      Top = 18
       Width = 32
       Height = 21
       Caption = #21697#21517
     end
     object Label4: TLabel
-      Left = 19
-      Top = 11
+      Left = 651
+      Top = 18
       Width = 64
       Height = 21
       Caption = #26469#33258#21333#20301
     end
-    object Label8: TLabel
-      Left = 506
-      Top = 11
-      Width = 32
-      Height = 21
-      Caption = #35268#26684
-    end
     object Label2: TLabel
-      Left = 506
-      Top = 50
+      Left = 441
+      Top = 18
       Width = 32
       Height = 21
-      Caption = #25209#21495
-    end
-    object Label1: TLabel
-      Left = 19
-      Top = 50
-      Width = 32
-      Height = 21
-      Caption = #24067#31181
-    end
-    object Label5: TLabel
-      Left = 273
-      Top = 50
-      Width = 48
-      Height = 21
-      Caption = #21152#24037#21035
+      Caption = #39068#33394
     end
     object Label6: TLabel
-      Left = 735
-      Top = 11
+      Left = 240
+      Top = 18
       Width = 32
       Height = 21
-      Caption = #32568#21495
-    end
-    object Label7: TLabel
-      Left = 735
-      Top = 50
-      Width = 48
-      Height = 21
-      Caption = #21512#21516#21495
+      Caption = #33394#21495
     end
     object C_name: TcxTextEdit
       Tag = 2
-      Left = 323
-      Top = 5
+      Left = 86
+      Top = 14
       Properties.OnChange = FromCoNamePropertiesChange
       TabOrder = 0
       OnKeyPress = FromCoNameKeyPress
@@ -163,651 +127,31 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     end
     object FromCoName: TcxTextEdit
       Tag = 2
-      Left = 87
-      Top = 5
+      Left = 719
+      Top = 14
       Properties.OnChange = FromCoNamePropertiesChange
       TabOrder = 1
       OnKeyPress = FromCoNameKeyPress
       Width = 150
     end
-    object C_spec: TcxTextEdit
+    object C_Color: TcxTextEdit
       Tag = 2
-      Left = 542
-      Top = 5
+      Left = 477
+      Top = 14
       Properties.OnChange = FromCoNamePropertiesChange
       TabOrder = 2
       OnKeyPress = FromCoNameKeyPress
       Width = 150
     end
-    object BatchNo: TcxTextEdit
+    object C_ColorNo: TcxTextEdit
       Tag = 2
-      Left = 542
-      Top = 44
+      Left = 276
+      Top = 14
       Properties.OnChange = FromCoNamePropertiesChange
       TabOrder = 3
       OnKeyPress = FromCoNameKeyPress
       Width = 150
     end
-    object GC_Name: TcxTextEdit
-      Tag = 2
-      Left = 87
-      Top = 44
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 4
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-    object CraftCode: TcxTextEdit
-      Tag = 2
-      Left = 323
-      Top = 44
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 5
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-    object FtyPCId: TcxTextEdit
-      Tag = 2
-      Left = 805
-      Top = 5
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 6
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-    object FromConNo: TcxTextEdit
-      Tag = 2
-      Left = 805
-      Top = 44
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 7
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-  end
-  object cxGrid1: TcxGrid [2]
-    Left = 0
-    Top = 151
-    Width = 1404
-    Height = 364
-    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 = skCount
-          Column = Tv1Column36
-        end
-        item
-          Kind = skSum
-          Column = v1Column15
-        end>
-      DataController.Summary.SummaryGroups = <>
-      OptionsCustomize.ColumnFiltering = False
-      OptionsView.Footer = True
-      OptionsView.GroupByBox = False
-      OptionsView.GroupFooters = gfAlwaysVisible
-      OptionsView.IndicatorWidth = 40
-      object Tv1Column33: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'ssel'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        Properties.ImmediatePost = True
-        HeaderAlignmentHorz = taCenter
-        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 v1Column6: TcxGridDBColumn
-        Caption = #20837#24211#21333#21495
-        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 = #24211#23384#21305#25968
-        DataBinding.FieldName = 'StkPieceint'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 91
-      end
-      object v2Column6: TcxGridDBColumn
-        Tag = 2
-        Caption = #24211#23384#25968#37327
-        DataBinding.FieldName = 'StkQty'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 75
-      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 Tv1Column19: TcxGridDBColumn
-        Caption = #21512#21516#21495
-        DataBinding.FieldName = 'FromConNo'
-        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 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 Tv1Column7: TcxGridDBColumn
-        Caption = #31867#22411
-        DataBinding.FieldName = 'C_Degree'
-        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 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 Tv1Column27: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        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 Tv1Column25: TcxGridDBColumn
-        Caption = #24067#31181
-        DataBinding.FieldName = 'GC_Name'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column28: TcxGridDBColumn
-        Caption = #22383#24067#20379#24212#21830
-        DataBinding.FieldName = 'GCFtyName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        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 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 Tv1Column29: TcxGridDBColumn
-        Caption = #21512#24182#21333#21495
-        DataBinding.FieldName = 'FromMasterOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column30: TcxGridDBColumn
-        Caption = #35843#20986#21512#24182#21333#21495
-        DataBinding.FieldName = 'SupMasterOrdNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column31: TcxGridDBColumn
-        Caption = #35843#20986#35745#21010#21333#21495
-        DataBinding.FieldName = 'SupConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column32: TcxGridDBColumn
-        Caption = #35843#20986#21512#21516#21495
-        DataBinding.FieldName = 'SupConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column35: TcxGridDBColumn
-        Caption = #20928#37325
-        DataBinding.FieldName = 'QtyKgGross'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 55
-      end
-      object Tv1Column34: TcxGridDBColumn
-        Caption = #27611#37325
-        DataBinding.FieldName = 'QtyKgNet'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 55
-      end
-      object Tv1Column36: TcxGridDBColumn
-        Caption = #21367#21495
-        DataBinding.FieldName = 'PieceNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column38: TcxGridDBColumn
-        Caption = #32467#26696#31867#22411
-        DataBinding.FieldName = 'SettlementType'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column37: TcxGridDBColumn
-        Caption = #38477#32423#21407#22240
-        DataBinding.FieldName = 'Downgrade'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-      object Tv1Column39: TcxGridDBColumn
-        Caption = #24211#20301
-        DataBinding.FieldName = 'IOPosition'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 55
-      end
-      object Tv1Column40: TcxGridDBColumn
-        Caption = #20179#20301
-        DataBinding.FieldName = 'StkCoName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 55
-      end
-    end
-    object cxGrid1Level1: TcxGridLevel
-      GridView = Tv1
-    end
-  end
-  object Panel5: TPanel [4]
-    Left = 0
-    Top = 115
-    Width = 1404
-    Height = 36
-    Align = alTop
-    TabOrder = 4
-    Visible = False
-    object Label28: TLabel
-      Left = 725
-      Top = 7
-      Width = 64
-      Height = 21
-      Caption = #26631#31614#20221#25968
-    end
-    object ComboBox_Print: TcxComboBox
-      Tag = 9
-      Left = 6
-      Top = 3
-      Properties.DropDownListStyle = lsFixedList
-      TabOrder = 0
-      Width = 325
-    end
-    object LabVolume: TcxTextEdit
-      Left = 335
-      Top = 3
-      TabOrder = 1
-      Width = 200
-    end
-    object cxButton1: TcxButton
-      Left = 539
-      Top = 5
-      Width = 75
-      Height = 25
-      Caption = #26631#31614#36873#25321
-      TabOrder = 2
-      OnClick = cxButton1Click
-    end
-    object cxButton2: TcxButton
-      Left = 635
-      Top = 5
-      Width = 75
-      Height = 25
-      Caption = #25171#21360#26631#31614
-      TabOrder = 3
-      OnClick = cxButton2Click
-    end
-    object cxCbqfs: TcxComboBox
-      Tag = 2
-      Left = 793
-      Top = 3
-      Properties.DropDownListStyle = lsFixedList
-      Properties.Items.Strings = (
-        '1'
-        '2'
-        '3'
-        '4'
-        '5')
-      TabOrder = 4
-      Text = '1'
-      Width = 56
-    end
   end
   inherited cxProgressBar2: TcxProgressBar
     Left = 461
@@ -816,6 +160,640 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     ExplicitTop = 353
     ExplicitHeight = 29
   end
+  object cxPageControl1: TcxPageControl [4]
+    Left = 0
+    Top = 89
+    Width = 1404
+    Height = 426
+    Align = alClient
+    TabOrder = 4
+    Properties.ActivePage = cxTabSheet1
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 5
+    ClientRectBottom = 426
+    ClientRectRight = 1404
+    ClientRectTop = 32
+    object cxTabSheet1: TcxTabSheet
+      Caption = '  '#20135#21697#27719#24635'  '
+      ImageIndex = 0
+      object cxGrid2: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1404
+        Height = 394
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        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 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 = '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
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 211
+      object cxGrid1: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1404
+        Height = 394
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
+        ExplicitLeft = -464
+        ExplicitTop = -26
+        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 = skCount
+              Column = Tv1Column36
+            end
+            item
+              Kind = skSum
+              Column = v1Column15
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.GroupFooters = gfAlwaysVisible
+          OptionsView.IndicatorWidth = 40
+          object Tv1Column33: TcxGridDBColumn
+            Caption = #36873#25321
+            DataBinding.FieldName = 'ssel'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            Properties.ImmediatePost = True
+            HeaderAlignmentHorz = taCenter
+            Width = 55
+          end
+          object Tv1Column13: TcxGridDBColumn
+            Caption = #35745#21010#21333#21495
+            DataBinding.FieldName = 'FromOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 94
+          end
+          object v1Column6: TcxGridDBColumn
+            Caption = #20837#24211#21333#21495
+            DataBinding.FieldName = 'BCIOID'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 99
+          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 = 96
+          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 = 91
+          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 = 99
+          end
+          object Tv1Column11: TcxGridDBColumn
+            Caption = #37319#36141#21333#21495
+            DataBinding.FieldName = 'FromPurNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 88
+          end
+          object Tv1Column6: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
+            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 v1Column15: TcxGridDBColumn
+            Caption = #24211#23384#21305#25968
+            DataBinding.FieldName = 'StkPieceint'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 91
+          end
+          object v2Column6: TcxGridDBColumn
+            Tag = 2
+            Caption = #24211#23384#25968#37327
+            DataBinding.FieldName = 'StkQty'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxTextEditProperties'
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 75
+          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 Tv1Column19: TcxGridDBColumn
+            Caption = #21512#21516#21495
+            DataBinding.FieldName = 'FromConNo'
+            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 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 Tv1Column7: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'C_Degree'
+            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 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 Tv1Column27: TcxGridDBColumn
+            Caption = #25209#21495
+            DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
+            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 Tv1Column25: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column28: TcxGridDBColumn
+            Caption = #22383#24067#20379#24212#21830
+            DataBinding.FieldName = 'GCFtyName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 55
+          end
+          object Tv1Column29: TcxGridDBColumn
+            Caption = #21512#24182#21333#21495
+            DataBinding.FieldName = 'FromMasterOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column30: TcxGridDBColumn
+            Caption = #35843#20986#21512#24182#21333#21495
+            DataBinding.FieldName = 'SupMasterOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column31: TcxGridDBColumn
+            Caption = #35843#20986#35745#21010#21333#21495
+            DataBinding.FieldName = 'SupConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column32: TcxGridDBColumn
+            Caption = #35843#20986#21512#21516#21495
+            DataBinding.FieldName = 'SupConNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column36: TcxGridDBColumn
+            Caption = #21367#21495
+            DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+          object Tv1Column39: TcxGridDBColumn
+            Caption = #24211#20301
+            DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 55
+          end
+          object Tv1Column40: TcxGridDBColumn
+            Caption = #20179#20301
+            DataBinding.FieldName = 'StkCoName'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 55
+          end
+        end
+        object cxGrid1Level1: TcxGridLevel
+          GridView = Tv1
+        end
+      end
+    end
+  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Left = 171
@@ -823,21 +801,21 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 177
-    Top = 177
+    Left = 313
+    Top = 337
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 445
-    Top = 228
+    Left = 397
+    Top = 380
   end
-  object ADOQueryMain: TADOQuery
+  object ADO_2: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 824
-    Top = 261
+    Left = 720
+    Top = 317
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
@@ -848,20 +826,20 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
   end
   object DS_1: TDataSource
     DataSet = CDS_1
-    Left = 664
-    Top = 256
+    Left = 648
+    Top = 264
   end
   object GPM_1: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 504
-    Top = 256
+    Left = 512
+    Top = 264
   end
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
     Left = 576
-    Top = 256
+    Top = 264
   end
   object PopupMenu1: TPopupMenu
     Left = 304
@@ -875,10 +853,28 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       OnClick = N2Click
     end
   end
-  object ADOQueryPrint: TADOQuery
+  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_1: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
     Parameters = <>
-    Left = 655
-    Top = 444
+    Left = 720
+    Top = 269
   end
 end
diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
index 07a82b1..20c826c 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
@@ -13,7 +13,8 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer,
-  cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters;
+  cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters,
+  cxPC;
 
 type
   TfrmTradeClothTotalStkList = class(TfrmBaseList)
@@ -23,7 +24,7 @@ type
     TBClose: TToolButton;
     Panel1: TPanel;
     ADOQueryCmd: TADOQuery;
-    ADOQueryMain: TADOQuery;
+    ADO_2: TADOQuery;
     ADOQueryTemp: TADOQuery;
     DS_1: TDataSource;
     GPM_1: TcxGridPopupMenu;
@@ -31,22 +32,28 @@ type
     PopupMenu1: TPopupMenu;
     Label3: TLabel;
     Label4: TLabel;
-    Label8: TLabel;
     Label2: TLabel;
     C_name: TcxTextEdit;
     FromCoName: TcxTextEdit;
-    C_spec: TcxTextEdit;
-    BatchNo: TcxTextEdit;
+    C_Color: TcxTextEdit;
     ToolButton2: TToolButton;
+    Label6: TLabel;
+    C_ColorNo: TcxTextEdit;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    ToolButton3: TToolButton;
+    cxPageControl1: TcxPageControl;
+    cxTabSheet1: TcxTabSheet;
+    cxTabSheet2: TcxTabSheet;
     cxGrid1: TcxGrid;
     Tv1: TcxGridDBTableView;
+    Tv1Column33: TcxGridDBColumn;
     Tv1Column13: TcxGridDBColumn;
     v1Column6: TcxGridDBColumn;
     v1Column2: TcxGridDBColumn;
     v1Column4: TcxGridDBColumn;
     v1Column14: TcxGridDBColumn;
     Tv1Column11: TcxGridDBColumn;
-    Tv1Column20: TcxGridDBColumn;
     v2Column1: TcxGridDBColumn;
     v1Column8: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
@@ -66,58 +73,45 @@ type
     Tv1Column21: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
     Tv1Column10: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
     Tv1Column8: TcxGridDBColumn;
     Tv1Column9: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
     Tv1Column15: TcxGridDBColumn;
     Tv1Column16: TcxGridDBColumn;
     Tv1Column17: TcxGridDBColumn;
     Tv1Column18: TcxGridDBColumn;
     Tv1Column22: TcxGridDBColumn;
     Tv1Column25: TcxGridDBColumn;
-    Tv1Column24: TcxGridDBColumn;
-    Tv1Column26: TcxGridDBColumn;
-    Tv1Column23: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
-    Tv1Column7: TcxGridDBColumn;
-    Label1: TLabel;
-    Label5: TLabel;
-    GC_Name: TcxTextEdit;
-    CraftCode: TcxTextEdit;
-    Tv1Column27: TcxGridDBColumn;
     Tv1Column28: TcxGridDBColumn;
     Tv1Column29: TcxGridDBColumn;
     Tv1Column30: TcxGridDBColumn;
     Tv1Column31: TcxGridDBColumn;
     Tv1Column32: TcxGridDBColumn;
-    Label6: TLabel;
-    Label7: TLabel;
-    FtyPCId: TcxTextEdit;
-    FromConNo: TcxTextEdit;
-    Panel5: TPanel;
-    ComboBox_Print: TcxComboBox;
-    LabVolume: TcxTextEdit;
-    cxButton1: TcxButton;
-    cxButton2: TcxButton;
-    ADOQueryPrint: TADOQuery;
-    Tv1Column33: TcxGridDBColumn;
-    N1: TMenuItem;
-    N2: TMenuItem;
-    Tv1Column34: TcxGridDBColumn;
-    Tv1Column35: TcxGridDBColumn;
     Tv1Column36: TcxGridDBColumn;
-    Tv1Column37: TcxGridDBColumn;
-    Tv1Column38: TcxGridDBColumn;
     Tv1Column39: TcxGridDBColumn;
-    Label28: TLabel;
-    cxCbqfs: TcxComboBox;
     Tv1Column40: TcxGridDBColumn;
-    ToolButton1: TToolButton;
-    ToolButton3: TToolButton;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridDBColumn29: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    GPM_2: TcxGridPopupMenu;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    ADO_1: TADOQuery;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);
-    procedure ConNoMChange(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBFindClick(Sender: TObject);
@@ -126,18 +120,18 @@ type
     procedure ToolButton2Click(Sender: TObject);
     procedure FromCoNamePropertiesChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure cxButton1Click(Sender: TObject);
-    procedure cxButton2Click(Sender: TObject);
     procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
     procedure FromCoNameKeyPress(Sender: TObject; var Key: Char);
-    procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
+    procedure TV2DblClick(Sender: TObject);
   private
     procedure InitGrid();
+    procedure InitGrid1();
+    procedure InitGrid2();
     { Private declarations }
   public
-    FstkName, FC_Degree, FC_Pack, canshu4: string;
+    FStkIdS, FstkName, FC_Degree, FC_Pack, canshu4: string;
     { Public declarations }
   end;
 
@@ -158,29 +152,6 @@ begin
   frmTradeClothTotalStkList := nil;
 end;
 
-procedure TfrmTradeClothTotalStkList.cxButton1Click(Sender: TObject);
-var
-  mrecid: Integer;
-  MaxBLCLID: string;
-begin
-  mrecid := showFr3LableForm(DCode, DName, DConString, '±êÇ©Ñ¡Ôñ');
-  with ADOQueryTemp do
-  begin
-    close;
-    sql.Clear;
-    sql.Add('select top 1 * from Trade_Label');
-    sql.Add('where recid=' + trim(IntToStr(mrecid)));
-    Open;
-  end;
-  LabVolume.Text := Trim(ADOQueryTemp.fieldbyname('LabelCaption').AsString);
-end;
-
-procedure TfrmTradeClothTotalStkList.cxButton2Click(Sender: TObject);
-begin
-  PrintServerLabel1(ADOQueryPrint, StrToIntDef(cxCbqfs.Text, 1), 0, ComboBox_Print.ItemIndex, SelCDSKey(CDS_1, ['BCIOID'])[0], LabVolume.text);
-  InitGrid();
-end;
-
 procedure TfrmTradeClothTotalStkList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -195,10 +166,50 @@ begin
 end;
 
 procedure TfrmTradeClothTotalStkList.InitGrid();
+begin
+  case cxPageControl1.ActivePageIndex of
+    0:
+      begin
+        InitGrid2();
+      end;
+    1:
+      begin
+
+        InitGrid1();
+      end;
+  end;
+
+end;
+
+procedure TfrmTradeClothTotalStkList.InitGrid2();
 var
   SqlStr: string;
 begin
 
+  SqlStr := ' select 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.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) + '''';
+
+  SqlStr := SqlStr + ' group by 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 TfrmTradeClothTotalStkList.InitGrid1();
+var
+  SqlStr, WSqlStr: string;
+begin
+
   SqlStr := ' select A.*,StkPieceint=CEILING(A.StkPiece) ';
   SqlStr := SqlStr + ' from BS_Cloth_IO A    ';
   SqlStr := SqlStr + ' where A.IOFlag=''Èë¿â'' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) ';
@@ -208,24 +219,20 @@ begin
     SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
   if FC_Pack <> '' then
     SqlStr := SqlStr + ' and isnull(C_Pack,'''')=''' + Trim(FC_Pack) + '''';
-  SqlStr := SqlStr + ' order by IOTime desc';
   if Trim(canshu4) <> '' then
     SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
-  InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
+  WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"C_Code|C_Name|C_Color|C_ColorNo|C_Pattern|C_Degree|QtyUnit"}');
+  if TRIM(WSqlStr) <> '' then
+    SqlStr := SqlStr + ' and ' + WSqlStr;
+  SqlStr := SqlStr + ' order by IOTime desc';
+
+  InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
 
 end;
 
 procedure TfrmTradeClothTotalStkList.TBRafreshClick(Sender: TObject);
 begin
-  InitGrid();
-end;
-
-procedure TfrmTradeClothTotalStkList.ConNoMChange(Sender: TObject);
-begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-  end;
+  InitGrid2();
 end;
 
 procedure TfrmTradeClothTotalStkList.TBCloseClick(Sender: TObject);
@@ -238,7 +245,6 @@ procedure TfrmTradeClothTotalStkList.FormShow(Sender: TObject);
 begin
   inherited;
   ReadCxGrid(trim(Self.Caption), Tv1, 'óÒ×»ã×ֿܲâ');
-  ComboBox_Print.Properties.Items.Assign(printer.Printers);
   canshu4 := Trim(self.fParameters4);
   InitGrid();
 end;
@@ -258,12 +264,17 @@ end;
 
 procedure TfrmTradeClothTotalStkList.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-    SCreateCDS(ADOQueryMain, CDS_1);
-    SInitCDSData(ADOQueryMain, CDS_1);
+  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;
 
 procedure TfrmTradeClothTotalStkList.MPRTCodeNameChange(Sender: TObject);
@@ -283,29 +294,6 @@ begin
   SelOKNo(CDS_1, False);
 end;
 
-procedure TfrmTradeClothTotalStkList.ToolButton1Click(Sender: TObject);
-begin
-  if trim(self.CDS_1.FieldByName('IOType').AsString) = '²ðÆ¥Èë¿â' then
-  begin
-    Application.MessageBox('²ðÆ¥Èë¿âÊý¾ÝÎÞ·¨²ð·Ö!', 'Ìáʾ', 0);
-    exit;
-  end;
-
-  try
-    frmTradeClothSplit := TfrmTradeClothSplit.Create(Application);
-    with frmTradeClothSplit do
-    begin
-      FStkID := trim(self.CDS_1.FieldByName('StkID').AsString);
-      if ShowModal = 1 then
-      begin
-        InitGrid();
-      end;
-    end;
-  finally
-    frmTradeClothSplit.Free;
-  end;
-end;
-
 procedure TfrmTradeClothTotalStkList.ToolButton2Click(Sender: TObject);
 begin
   WriteCxGrid(trim(Self.Caption), Tv1, 'óÒ×»ã×ֿܲâ');
@@ -339,5 +327,11 @@ begin
   ModalResult := 1;
 end;
 
+procedure TfrmTradeClothTotalStkList.TV2DblClick(Sender: TObject);
+begin
+  cxPageControl1.ActivePageIndex := 1;
+  InitGrid1();
+end;
+
 end.