库存查询调整

2025-03-06 17:34:17 +08:00 · 2025-03-06 17:34:17 +08:00 · 5383037be5
commit 5383037be5
parent 7d40dcb34b
14 changed files with 837 additions and 690 deletions
--- a/A02基础产品管理/U_ClothTypeSel.dfm
+++ b/A02基础产品管理/U_ClothTypeSel.dfm
@ -35,6 +35,7 @@ object frmClothTypeSel: TfrmClothTypeSel
    OptionsView.CellAutoHeight = True
    OptionsView.Headers = False
    RootValue = -1
+    ScrollbarAnnotations.CustomAnnotations = <>
    TabOrder = 0
    OnDblClick = cxDBTreeList1DblClick
    object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
--- a/A02基础产品管理/U_ClothTypeSel.pas
+++ b/A02基础产品管理/U_ClothTypeSel.pas
@ -7,7 +7,7 @@ uses
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB, cxLookAndFeels,
  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, 
-  dxSkinsDefaultPainters;
+  dxSkinsDefaultPainters, dxSkinsCore, cxFilter, dxScrollbarAnnotations;

 type
  TfrmClothTypeSel = class(TForm)
--- a/T02贸易汇总仓库/U_ClothPurchaseEnterList.dfm
+++ b/T02贸易汇总仓库/U_ClothPurchaseEnterList.dfm
@ -7,7 +7,6 @@ inherited frmClothPurchaseEnterList: TfrmClothPurchaseEnterList
  Color = clBtnFace
  Font.Height = -16
  FormStyle = fsMDIChild
-  Visible = True
  ExplicitWidth = 1751
  ExplicitHeight = 683
  PixelsPerInch = 96
--- a/T02贸易汇总仓库/U_ClothScheduleList.dfm
+++ b/T02贸易汇总仓库/U_ClothScheduleList.dfm
@ -7,7 +7,6 @@ inherited frmClothScheduleList: TfrmClothScheduleList
  Color = clBtnFace
  Font.Height = -16
  FormStyle = fsMDIChild
-  Visible = True
  ExplicitWidth = 1536
  ExplicitHeight = 764
  PixelsPerInch = 96
@ -531,6 +530,9 @@ inherited frmClothScheduleList: TfrmClothScheduleList
    object cxTabSheet2: TcxTabSheet
      Caption = '  '#37197#24067#25968#25454'  '
      ImageIndex = 1
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
      object cxGrid2: TcxGrid
        Left = 0
        Top = 0
@ -891,6 +893,9 @@ inherited frmClothScheduleList: TfrmClothScheduleList
    object cxTabSheet1: TcxTabSheet
      Caption = '  '#23436#24037#21450#25220#30721#25968#25454'  '
      ImageIndex = 2
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
      object cxGrid4: TcxGrid
        Left = 0
        Top = 0
@ -1106,6 +1111,9 @@ inherited frmClothScheduleList: TfrmClothScheduleList
    object cxTabSheet4: TcxTabSheet
      Caption = #38754#26009#20986#24211
      ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
      object cxGrid5: TcxGrid
        Left = 0
        Top = 0
@ -1300,6 +1308,9 @@ inherited frmClothScheduleList: TfrmClothScheduleList
    object cxTabSheet5: TcxTabSheet
      Caption = #29983#20135#22791#27880
      ImageIndex = 4
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
      object cxGrid6: TcxGrid
        Tag = 2
        Left = 0
--- a/T02贸易汇总仓库/U_ItemizedListList.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListList.dfm
@ -8,7 +8,6 @@ inherited frmItemizedListList: TfrmItemizedListList
  Font.Height = -16
  FormStyle = fsMDIChild
  Position = poScreenCenter
-  Visible = True
  ExplicitWidth = 1789
  ExplicitHeight = 775
  PixelsPerInch = 96
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@ -7,7 +7,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
  Color = clBtnFace
  Font.Height = -16
  FormStyle = fsMDIChild
-  Visible = True
  ExplicitWidth = 1556
  ExplicitHeight = 593
  PixelsPerInch = 96
--- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
@ -860,6 +860,12 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
      GridView = Tv1
    end
  end
+  inherited loadProcess: TPanel
+    Left = 888
+    Top = 296
+    ExplicitLeft = 888
+    ExplicitTop = 296
+  end
  inherited cxProgressBar2: TcxProgressBar
    Left = 721
    Top = 398
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
@ -8,7 +8,6 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
  Font.Height = -16
  FormStyle = fsMDIChild
  Position = poDefault
-  Visible = True
  ExplicitWidth = 1420
  ExplicitHeight = 554
  PixelsPerInch = 96
@ -89,28 +88,28 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    ParentColor = True
    TabOrder = 3
    object Label3: TLabel
-      Left = 50
+      Left = 28
      Top = 18
      Width = 32
      Height = 21
      Caption = #21697#21517
    end
    object Label4: TLabel
-      Left = 651
+      Left = 598
      Top = 18
      Width = 64
      Height = 21
      Caption = #26469#33258#21333#20301
    end
    object Label2: TLabel
-      Left = 441
+      Left = 408
      Top = 18
      Width = 32
      Height = 21
      Caption = #39068#33394
    end
    object Label6: TLabel
-      Left = 240
+      Left = 218
      Top = 18
      Width = 32
      Height = 21
@ -118,7 +117,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    end
    object C_name: TcxTextEdit
      Tag = 2
-      Left = 86
+      Left = 64
      Top = 14
      Properties.OnChange = FromCoNamePropertiesChange
      TabOrder = 0
@ -127,7 +126,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    end
    object FromCoName: TcxTextEdit
      Tag = 2
-      Left = 719
+      Left = 666
      Top = 14
      Properties.OnChange = FromCoNamePropertiesChange
      TabOrder = 1
@ -136,7 +135,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    end
    object C_Color: TcxTextEdit
      Tag = 2
-      Left = 477
+      Left = 444
      Top = 14
      Properties.OnChange = FromCoNamePropertiesChange
      TabOrder = 2
@ -145,7 +144,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    end
    object C_ColorNo: TcxTextEdit
      Tag = 2
-      Left = 276
+      Left = 254
      Top = 14
      Properties.OnChange = FromCoNamePropertiesChange
      TabOrder = 3
@ -170,6 +169,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    Properties.ActivePage = cxTabSheet1
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 5
+    OnChange = cxPageControl1Change
    ClientRectBottom = 426
    ClientRectRight = 1404
    ClientRectTop = 32
@ -328,9 +328,6 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    object cxTabSheet2: TcxTabSheet
      Caption = #20135#21697#26126#32454
      ImageIndex = 1
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 211
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
@ -339,8 +336,6 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
        Align = alClient
        PopupMenu = PopupMenu1
        TabOrder = 0
-        ExplicitLeft = -464
-        ExplicitTop = -26
        object Tv1: TcxGridDBTableView
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
@ -125,6 +125,7 @@ type
    procedure FromCoNameKeyPress(Sender: TObject; var Key: Char);
    procedure ToolButton3Click(Sender: TObject);
    procedure TV2DblClick(Sender: TObject);
+    procedure cxPageControl1Change(Sender: TObject);
  private
    procedure InitGrid();
    procedure InitGrid1();
@ -152,6 +153,17 @@ begin
  frmTradeClothTotalStkList := nil;
 end;

+procedure TfrmTradeClothTotalStkList.cxPageControl1Change(Sender: TObject);
+begin
+  case cxPageControl1.ActivePageIndex of
+    1:
+      begin
+        InitGrid1();
+      end;
+  end;
+
+end;
+
 procedure TfrmTradeClothTotalStkList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
@ -201,6 +213,7 @@ begin

  SqlStr := SqlStr + ' group by 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;
@ -244,15 +257,17 @@ end;
 procedure TfrmTradeClothTotalStkList.FormShow(Sender: TObject);
 begin
  inherited;
-  ReadCxGrid(trim(Self.Caption), Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
+
+  ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
+  ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'Ã³Ò×»ã×Ü²Ö¿â');
  canshu4 := Trim(self.fParameters4);
-  InitGrid();
+  InitGrid2();
 end;

 procedure TfrmTradeClothTotalStkList.FromCoNameKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
-    InitGrid();
+    TBFind.Click;
 end;

 procedure TfrmTradeClothTotalStkList.FromCoNamePropertiesChange(Sender: TObject);
@ -296,7 +311,8 @@ end;

 procedure TfrmTradeClothTotalStkList.ToolButton2Click(Sender: TObject);
 begin
-  WriteCxGrid(trim(Self.Caption), Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
+  WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
+  WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'Ã³Ò×»ã×Ü²Ö¿â');
 end;

 procedure TfrmTradeClothTotalStkList.ToolButton3Click(Sender: TObject);
@ -330,7 +346,7 @@ end;
 procedure TfrmTradeClothTotalStkList.TV2DblClick(Sender: TObject);
 begin
  cxPageControl1.ActivePageIndex := 1;
-  InitGrid1();
+
 end;

 end.
--- a/T02贸易汇总仓库/U_TradeDeliveryRequest.dfm
+++ b/T02贸易汇总仓库/U_TradeDeliveryRequest.dfm
@ -9,7 +9,6 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest
  Font.Height = -16
  FormStyle = fsMDIChild
  Position = poScreenCenter
-  Visible = True
  ExplicitWidth = 1595
  ExplicitHeight = 780
  PixelsPerInch = 96
--- a/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm
+++ b/T02贸易汇总仓库/U_TradeTotallClothStkSel.dfm
@ -81,7 +81,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
    Left = 0
    Top = 30
    Width = 1266
-    Height = 89
+    Height = 43
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -89,146 +89,247 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
    ParentColor = True
    TabOrder = 1
    object Label3: TLabel
-      Left = 273
-      Top = 13
+      Left = 17
+      Top = 10
      Width = 32
      Height = 21
      Caption = #21697#21517
    end
    object Label4: TLabel
-      Left = 19
-      Top = 13
+      Left = 587
+      Top = 10
      Width = 64
      Height = 21
      Caption = #26469#33258#21333#20301
    end
-    object Label8: TLabel
-      Left = 506
-      Top = 13
-      Width = 32
-      Height = 21
-      Caption = #35268#26684
-    end
-    object Label2: TLabel
-      Left = 506
-      Top = 50
-      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
+      Left = 397
+      Top = 10
+      Width = 32
      Height = 21
-      Caption = #21152#24037#21035
+      Caption = #39068#33394
    end
    object Label6: TLabel
-      Left = 735
-      Top = 13
+      Left = 207
+      Top = 10
      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 = 9
-      Properties.OnChange = FromCoNamePropertiesChange
+      Left = 53
+      Top = 6
      TabOrder = 0
      OnKeyPress = FromCoNameKeyPress
      Width = 150
    end
    object FromCoName: TcxTextEdit
      Tag = 2
-      Left = 87
-      Top = 9
-      Properties.OnChange = FromCoNamePropertiesChange
+      Left = 655
+      Top = 6
      TabOrder = 1
      OnKeyPress = FromCoNameKeyPress
      Width = 150
    end
-    object C_spec: TcxTextEdit
+    object C_Color: TcxTextEdit
      Tag = 2
-      Left = 542
-      Top = 9
-      Properties.OnChange = FromCoNamePropertiesChange
+      Left = 433
+      Top = 6
      TabOrder = 2
      OnKeyPress = FromCoNameKeyPress
      Width = 150
    end
-    object BatchNo: TcxTextEdit
+    object C_ColorNo: TcxTextEdit
      Tag = 2
-      Left = 542
-      Top = 46
-      Properties.OnChange = FromCoNamePropertiesChange
+      Left = 243
+      Top = 6
      TabOrder = 3
      OnKeyPress = FromCoNameKeyPress
      Width = 150
    end
-    object GC_Name: TcxTextEdit
-      Tag = 2
-      Left = 87
-      Top = 46
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 4
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
  end
-    object CraftCode: TcxTextEdit
-      Tag = 2
-      Left = 323
-      Top = 46
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 5
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-    object FtyPCId: TcxTextEdit
-      Tag = 2
-      Left = 805
-      Top = 9
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 6
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-    object FromConNo: TcxTextEdit
-      Tag = 2
-      Left = 805
-      Top = 46
-      Properties.OnChange = FromCoNamePropertiesChange
-      TabOrder = 7
-      OnKeyPress = FromCoNameKeyPress
-      Width = 150
-    end
-  end
-  object cxGrid1: TcxGrid [2]
+  object cxPageControl1: TcxPageControl [2]
    Left = 0
-    Top = 119
+    Top = 73
    Width = 1266
-    Height = 371
+    Height = 417
+    Align = alClient
+    TabOrder = 2
+    Properties.ActivePage = cxTabSheet1
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 5
+    OnChange = cxPageControl1Change
+    ClientRectBottom = 417
+    ClientRectRight = 1266
+    ClientRectTop = 32
+    object cxTabSheet1: TcxTabSheet
+      Caption = '  '#20135#21697#27719#24635'  '
+      ImageIndex = 0
+      object cxGrid2: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1266
+        Height = 385
        Align = alClient
        PopupMenu = PopupMenu1
-    TabOrder = 2
+        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
+      object cxGrid1: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1266
+        Height = 385
+        Align = alClient
+        PopupMenu = PopupMenu1
+        TabOrder = 0
        object Tv1: TcxGridDBTableView
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
-      DataController.DataSource = DS_1
+          DataController.DataSource = DS_2
          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
          DataController.Summary.DefaultGroupSummaryItems = <
            item
@ -258,25 +359,28 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            item
              Kind = skSum
            end
-        item
-          Kind = skSum
-          Column = v1Column15
-        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 = 44
+            Width = 55
          end
          object Tv1Column13: TcxGridDBColumn
            Caption = #35745#21010#21333#21495
@ -284,23 +388,15 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column37: TcxGridDBColumn
-        Caption = #20837#24211#21333#21495
-        DataBinding.FieldName = 'BCIONO'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 97
+            Width = 94
          end
          object v1Column6: TcxGridDBColumn
-        Caption = #20837#24211#26465#30721
+            Caption = #20837#24211#21333#21495
            DataBinding.FieldName = 'BCIOID'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 151
+            Width = 99
          end
          object v1Column2: TcxGridDBColumn
            Tag = 2
@ -312,7 +408,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            Properties.ShowTime = False
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 96
          end
          object v1Column4: TcxGridDBColumn
            Tag = 2
@ -327,7 +423,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
              #26399#21021#20837#24211)
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 91
          end
          object v1Column14: TcxGridDBColumn
            Tag = 2
@ -344,7 +440,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            Properties.ReadOnly = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 99
          end
          object Tv1Column11: TcxGridDBColumn
            Caption = #37319#36141#21333#21495
@ -352,15 +448,15 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 88
          end
-      object Tv1Column20: TcxGridDBColumn
-        Caption = #33521#25991#21697#21517
-        DataBinding.FieldName = 'C_EName'
+          object Tv1Column6: TcxGridDBColumn
+            Caption = #32534#21495
+            DataBinding.FieldName = 'C_Code'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v2Column1: TcxGridDBColumn
            Tag = 2
@ -375,7 +471,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
              end>
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column8: TcxGridDBColumn
            Tag = 2
@ -385,7 +481,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            HeaderAlignmentHorz = taCenter
            HeaderGlyphAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column4: TcxGridDBColumn
            Caption = #32568#21495
@ -393,7 +489,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column13: TcxGridDBColumn
            Caption = #38376#24133
@ -401,7 +497,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column11: TcxGridDBColumn
            Caption = #20811#37325
@ -409,15 +505,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #32534#21495
-        DataBinding.FieldName = 'C_Code'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column15: TcxGridDBColumn
            Caption = #24211#23384#21305#25968
@ -425,7 +513,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 91
          end
          object v2Column6: TcxGridDBColumn
            Tag = 2
@ -435,7 +523,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            PropertiesClassName = 'TcxTextEditProperties'
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 75
          end
          object v1Column3: TcxGridDBColumn
            Tag = 2
@ -450,23 +538,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
              'Y')
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
-      end
-      object v1Column5: TcxGridDBColumn
-        Tag = 2
-        Caption = #24211#20301
-        DataBinding.FieldName = 'StkPosition'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        Properties.ReadOnly = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column19: TcxGridDBColumn
            Caption = #21512#21516#21495
@ -474,7 +546,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column19: TcxGridDBColumn
            Caption = #36710#38388
@ -482,7 +554,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column12: TcxGridDBColumn
            Tag = 2
@ -491,7 +563,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object v1Column20: TcxGridDBColumn
            Caption = #19994#21153#21592
@ -499,7 +571,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column3: TcxGridDBColumn
            Caption = #33394#21035
@ -507,7 +579,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column5: TcxGridDBColumn
            Caption = #30721#23610
@ -515,7 +587,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column1: TcxGridDBColumn
            Caption = #39068#33394
@ -523,7 +595,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column21: TcxGridDBColumn
            Caption = #33521#25991#39068#33394
@ -531,7 +603,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column2: TcxGridDBColumn
            Caption = #33394#21495
@ -539,7 +611,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column10: TcxGridDBColumn
            Caption = #27454#21495
@ -547,7 +619,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column7: TcxGridDBColumn
            Caption = #31867#22411
@ -555,7 +627,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column8: TcxGridDBColumn
            Caption = #33457#22411
@ -563,7 +635,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column9: TcxGridDBColumn
            Caption = #25104#20998
@ -571,7 +643,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column12: TcxGridDBColumn
            Caption = #38468#20214
@ -580,7 +652,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            PropertiesClassName = 'TcxCheckBoxProperties'
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column27: TcxGridDBColumn
            Caption = #25209#21495
@ -588,15 +660,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column14: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column15: TcxGridDBColumn
            Caption = #30331#35760#20154
@ -604,7 +668,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column16: TcxGridDBColumn
            Caption = #30331#35760#26102#38388
@ -612,7 +676,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column17: TcxGridDBColumn
            Caption = #20462#25913#20154
@ -620,7 +684,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column18: TcxGridDBColumn
            Caption = #20462#25913#26102#38388
@ -628,7 +692,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column22: TcxGridDBColumn
            Caption = #31867#22411
@ -636,7 +700,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column25: TcxGridDBColumn
            Caption = #24067#31181
@ -644,38 +708,14 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column28: TcxGridDBColumn
            Caption = #22383#24067#20379#24212#21830
            DataBinding.FieldName = 'GCFtyName'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
-        Width = 44
-      end
-      object Tv1Column24: TcxGridDBColumn
-        Caption = #21518#25972#29702#33521#25991
-        DataBinding.FieldName = 'CraftEName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column26: TcxGridDBColumn
-        Caption = #21518#25972#29702#20013#25991
-        DataBinding.FieldName = 'CraftName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
-      end
-      object Tv1Column23: TcxGridDBColumn
-        Caption = #21152#24037#21035
-        DataBinding.FieldName = 'CraftCode'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column29: TcxGridDBColumn
            Caption = #21512#24182#21333#21495
@ -683,7 +723,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column30: TcxGridDBColumn
            Caption = #35843#20986#21512#24182#21333#21495
@ -691,7 +731,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column31: TcxGridDBColumn
            Caption = #35843#20986#35745#21010#21333#21495
@ -699,7 +739,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column32: TcxGridDBColumn
            Caption = #35843#20986#21512#21516#21495
@ -707,23 +747,7 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            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
-      object Tv1Column35: TcxGridDBColumn
-        Caption = #27611#37325
-        DataBinding.FieldName = 'QtyKgGross'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 44
+            Width = 55
          end
          object Tv1Column36: TcxGridDBColumn
            Caption = #21367#21495
@ -731,13 +755,30 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Options.Editing = False
-        Width = 61
+            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 = 272
@ -758,12 +799,12 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
    Left = 544
    Top = 136
  end
-  object ADOQueryMain: TADOQuery
+  object ADO_1: TADOQuery
    Connection = DataLink_TradeTotalClothStk.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 672
-    Top = 160
+    Left = 448
+    Top = 264
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_TradeTotalClothStk.ADOLink
@ -801,4 +842,28 @@ inherited frmTradeTotallClothStkSel: TfrmTradeTotallClothStkSel
    Left = 664
    Top = 256
  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 = 448
+    Top = 325
+  end
 end
--- a/T02贸易汇总仓库/U_TradeTotallClothStkSel.pas
+++ b/T02贸易汇总仓库/U_TradeTotallClothStkSel.pas
@ -13,7 +13,7 @@ uses
  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
  dxBarBuiltInMenu, U_BaseHelp, System.ImageList, Vcl.ImgList,
-  dxScrollbarAnnotations, cxContainer, dxSkinsCore, dxSkinsDefaultPainters;
+  dxScrollbarAnnotations, cxContainer, dxSkinsCore, dxSkinsDefaultPainters, cxPC;

 type
  TfrmTradeTotallClothStkSel = class(TfrmBaseHelp)
@ -23,7 +23,7 @@ type
    TBClose: TToolButton;
    Panel1: TPanel;
    ADOQueryCmd: TADOQuery;
-    ADOQueryMain: TADOQuery;
+    ADO_1: TADOQuery;
    ADOQueryTemp: TADOQuery;
    PopupMenu1: TPopupMenu;
    N1: TMenuItem;
@ -32,39 +32,44 @@ type
    ToolButton2: TToolButton;
    Label3: TLabel;
    Label4: TLabel;
-    Label8: TLabel;
-    Label2: TLabel;
-    Label1: TLabel;
-    Label5: TLabel;
    C_name: TcxTextEdit;
    FromCoName: TcxTextEdit;
-    C_spec: TcxTextEdit;
-    BatchNo: TcxTextEdit;
-    GC_Name: TcxTextEdit;
-    CraftCode: TcxTextEdit;
-    Label6: TLabel;
-    Label7: TLabel;
-    FtyPCId: TcxTextEdit;
-    FromConNo: TcxTextEdit;
+    GPM_1: TcxGridPopupMenu;
+    CDS_1: TClientDataSet;
+    DS_1: TDataSource;
+    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;
+    Tv1Column33: TcxGridDBColumn;
    Tv1Column13: TcxGridDBColumn;
    v1Column6: TcxGridDBColumn;
    v1Column2: TcxGridDBColumn;
    v1Column4: TcxGridDBColumn;
    v1Column14: TcxGridDBColumn;
    Tv1Column11: TcxGridDBColumn;
-    Tv1Column20: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
    v2Column1: TcxGridDBColumn;
    v1Column8: TcxGridDBColumn;
    Tv1Column4: TcxGridDBColumn;
    v1Column13: TcxGridDBColumn;
    v1Column11: TcxGridDBColumn;
-    Tv1Column6: TcxGridDBColumn;
    v1Column15: TcxGridDBColumn;
    v2Column6: TcxGridDBColumn;
    v1Column3: TcxGridDBColumn;
-    v1Column5: TcxGridDBColumn;
    Tv1Column19: TcxGridDBColumn;
    v1Column19: TcxGridDBColumn;
    v1Column12: TcxGridDBColumn;
@ -80,7 +85,6 @@ type
    Tv1Column9: TcxGridDBColumn;
    Tv1Column12: TcxGridDBColumn;
    Tv1Column27: TcxGridDBColumn;
-    Tv1Column14: TcxGridDBColumn;
    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
    Tv1Column17: TcxGridDBColumn;
@ -88,26 +92,25 @@ type
    Tv1Column22: TcxGridDBColumn;
    Tv1Column25: TcxGridDBColumn;
    Tv1Column28: TcxGridDBColumn;
-    Tv1Column24: TcxGridDBColumn;
-    Tv1Column26: TcxGridDBColumn;
-    Tv1Column23: TcxGridDBColumn;
    Tv1Column29: TcxGridDBColumn;
    Tv1Column30: TcxGridDBColumn;
    Tv1Column31: TcxGridDBColumn;
    Tv1Column32: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
-    GPM_1: TcxGridPopupMenu;
-    CDS_1: TClientDataSet;
-    DS_1: TDataSource;
-    Tv1Column33: TcxGridDBColumn;
-    Tv1Column34: TcxGridDBColumn;
-    Tv1Column35: TcxGridDBColumn;
    Tv1Column36: TcxGridDBColumn;
-    Tv1Column37: TcxGridDBColumn;
+    Tv1Column39: TcxGridDBColumn;
+    Tv1Column40: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    GPM_2: TcxGridPopupMenu;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    ADO_2: TADOQuery;
+    Label5: TLabel;
+    Label6: TLabel;
+    C_Color: TcxTextEdit;
+    C_ColorNo: TcxTextEdit;
    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);
@ -117,9 +120,12 @@ type
    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
    procedure ToolButton2Click(Sender: TObject);
    procedure FromCoNameKeyPress(Sender: TObject; var Key: Char);
-    procedure FromCoNamePropertiesChange(Sender: TObject);
+    procedure TV2DblClick(Sender: TObject);
+    procedure cxPageControl1Change(Sender: TObject);
  private
    procedure InitGrid();
+    procedure InitGrid1();
+    procedure InitGrid2();
    { Private declarations }
  public
    FstkName, FC_Degree, FStkIdS: string;
@ -142,6 +148,16 @@ begin
  frmTradeTotallClothStkSel := nil;
 end;

+procedure TfrmTradeTotallClothStkSel.cxPageControl1Change(Sender: TObject);
+begin
+  case cxPageControl1.ActivePageIndex of
+    1:
+      begin
+        InitGrid1();
+      end;
+  end;
+end;
+
 procedure TfrmTradeTotallClothStkSel.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
@ -149,42 +165,77 @@ begin
 end;

 procedure TfrmTradeTotallClothStkSel.InitGrid();
+begin
+  case cxPageControl1.ActivePageIndex of
+    0:
+      begin
+        InitGrid2();
+      end;
+    1:
+      begin
+
+        InitGrid1();
+      end;
+  end;
+
+end;
+
+procedure TfrmTradeTotallClothStkSel.InitGrid1();
 var
-  SqlStr: string;
+  SqlStr, WSqlStr: string;
 begin

-  SqlStr := ' select A.*,StkPieceint=CEILING(A.StkPiece),B.BuyRepresentative,B.BuyAddress,B.BuyTel ';
-  SqlStr := SqlStr + ' from BS_Cloth_IO A  left join Bs_Contract_Main B on A.FROMConMId=B.ConMId  ';
+  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) ';
-//  SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
+  SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
+
  if Trim(FStkIdS) <> '' then
    SqlStr := SqlStr + '   and not EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + Quotedstr(FStkIdS) + ','','') SP where SP.RTValue=A.BCIOID ) ';

  if FC_Degree <> '' then
    SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';

+  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(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
+  InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
+
+end;
+
+procedure TfrmTradeTotallClothStkSel.InitGrid2();
+var
+  SqlStr, WSqlStr: 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 Trim(FStkIdS) <> '' then
+    SqlStr := SqlStr + '   and not EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + Quotedstr(FStkIdS) + ','','') SP where SP.RTValue=A.BCIOID ) ';
+
+  if FC_Degree <> '' then
+    SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
+
+  SqlStr := SqlStr + ' group by 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 TfrmTradeTotallClothStkSel.TBRafreshClick(Sender: TObject);
 begin
-  InitGrid();
-end;
-
-procedure TfrmTradeTotallClothStkSel.ConNoMChange(Sender: TObject);
-begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-  end;
+  InitGrid2();
 end;

 procedure TfrmTradeTotallClothStkSel.TBCloseClick(Sender: TObject);
 begin
-
  Close;
 end;

@ -192,31 +243,28 @@ procedure TfrmTradeTotallClothStkSel.FormShow(Sender: TObject);
 begin
  inherited;
  ReadCxGrid(trim(self.Caption), Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
-  InitGrid();
+  InitGrid2();
 end;

 procedure TfrmTradeTotallClothStkSel.FromCoNameKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
  begin
-    InitGrid();
-  end;
-end;
-
-procedure TfrmTradeTotallClothStkSel.FromCoNamePropertiesChange(Sender: TObject);
-begin
-  if Length(Trim(TcxTextEdit(Sender).Text)) < 4 then
-    Exit;
    TBFind.Click;
+  end;
 end;

 procedure TfrmTradeTotallClothStkSel.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryMain.Active then
+  case cxPageControl1.ActivePageIndex of
+    0:
      begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-    SCreateCDS(ADOQueryMain, CDS_1);
-    SInitCDSData(ADOQueryMain, CDS_1);
+        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;

@ -252,5 +300,11 @@ begin
  ModalResult := 1;
 end;

+procedure TfrmTradeTotallClothStkSel.TV2DblClick(Sender: TObject);
+begin
+  cxPageControl1.ActivePageIndex := 1;
+
+end;
+
 end.

--- a/T05贸易门市管理/U_TradeDispatchedList.dfm
+++ b/T05贸易门市管理/U_TradeDispatchedList.dfm
@ -153,7 +153,9 @@ inherited frmTradeDispatchedList: TfrmTradeDispatchedList
      Width = 1536
      Height = 37
      Align = alTop
+      Color = clWhite
      ParentBackground = False
+      ParentColor = False
      TabOrder = 3
      ExplicitLeft = 2
      ExplicitTop = 2
--- a/T05贸易门市管理/U_TradeDispatchedList.pas
+++ b/T05贸易门市管理/U_TradeDispatchedList.pas
@ -15,7 +15,8 @@ uses
  IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
  dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
-  dxScrollbarAnnotations, cxProgressBar, FrameDateSel;
+  dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
+  dxSkinsDefaultPainters;

 type
  TfrmTradeDispatchedList = class(TfrmBaseList)