diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj
index 9f987d8..78a14e0 100644
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@@ -124,7 +124,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10myChangyou\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10xhGemei\A09财务通用管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
diff --git a/A09财务通用管理/U_CollectInput.pas b/A09财务通用管理/U_CollectInput.pas
index 1f55311..912735c 100644
--- a/A09财务通用管理/U_CollectInput.pas
+++ b/A09财务通用管理/U_CollectInput.pas
@@ -88,7 +88,7 @@ type
     function SaveData(): Boolean;
   public
     { Public declarations }
-    FFFID, FAuthority: string;
+    FFFID, FAuthority, canshu4: string;
     CopyFlag: Integer;
   end;
 
@@ -569,6 +569,7 @@ begin
         FieldByName('Editer').Value := Trim(DName);
         FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
       end;
+      FieldByName('Store').Value := Trim(canshu4);
       FieldByName('OppCoNo').Value := Trim(OppCoName.Properties.LookupItems.Text);
       FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text);
       FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.Properties.LookupItems.Text);
diff --git a/A09财务通用管理/U_CollectList.dfm b/A09财务通用管理/U_CollectList.dfm
index 74d3ee2..3aa7329 100644
--- a/A09财务通用管理/U_CollectList.dfm
+++ b/A09财务通用管理/U_CollectList.dfm
@@ -291,12 +291,11 @@ inherited frmCollectList: TfrmCollectList
       ExplicitTop = 2
       ExplicitWidth = 1621
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_CollectList.pas b/A09财务通用管理/U_CollectList.pas
index 6aa02db..52f5a39 100644
--- a/A09财务通用管理/U_CollectList.pas
+++ b/A09财务通用管理/U_CollectList.pas
@@ -119,7 +119,7 @@ type
     procedure InitGrid();
     procedure SetStatus();
   public
-    FAuthority: string;
+    FAuthority, canshu4: string;
   end;
 
 implementation
@@ -210,7 +210,7 @@ begin
         SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' ';
       end;
   end;
-
+  SqlStr := SqlStr + ' and isnull(A.Store,'''')=' + QuotedStr(Trim(canshu4));
   InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
 
 end;
@@ -297,6 +297,7 @@ end;
 procedure TfrmCollectList.FormShow(Sender: TObject);
 begin
   inherited;
+  canshu4 := Trim(Self.fParameters4);
   ReadCxGrid(trim(Self.Caption), Tv1, '�������');
   frmFrameDateSel1.Enddate.Date := SGetServerDate(ADOQueryTemp);
   frmFrameDateSel1.begdate.Date := frmFrameDateSel1.Enddate.Date - 30;
@@ -492,6 +493,7 @@ begin
     with frmCollectInput do
     begin
       FFFID := '';
+      canshu4 := Self.canshu4;
       FAuthority := Self.FAuthority;
       if ShowModal = 1 then
       begin
@@ -529,6 +531,7 @@ begin
     begin
       FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
       CopyFlag := 99;
+      canshu4 := Self.canshu4;
       FAuthority := Self.FAuthority;
       if ShowModal = 1 then
       begin
@@ -677,6 +680,7 @@ begin
     frmCollectInput := TfrmCollectInput.Create(Application);
     with frmCollectInput do
     begin
+      canshu4 := Self.canshu4;
       FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
       FAuthority := Self.FAuthority;
       if ShowModal = 1 then
diff --git a/A09财务通用管理/U_CustStatement.dfm b/A09财务通用管理/U_CustStatement.dfm
index 4f04cdc..3efcae4 100644
--- a/A09财务通用管理/U_CustStatement.dfm
+++ b/A09财务通用管理/U_CustStatement.dfm
@@ -139,12 +139,11 @@ inherited frmCustStatement: TfrmCustStatement
       ExplicitTop = 2
       ExplicitWidth = 1432
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_CustStatement.pas b/A09财务通用管理/U_CustStatement.pas
index 30898f5..5d289bf 100644
--- a/A09财务通用管理/U_CustStatement.pas
+++ b/A09财务通用管理/U_CustStatement.pas
@@ -67,7 +67,7 @@ type
     procedure FormCreate(Sender: TObject);
   private
     { Private declarations }
-    FAuthority: string;
+    FAuthority, canshu4: string;
     procedure InitGrid();
   public
     fmanage, FZKType: string;
@@ -141,6 +141,7 @@ procedure TfrmCustStatement.FormCreate(Sender: TObject);
 begin
   inherited;
   FAuthority := Trim(Self.fParameters1);
+  canshu4 := Trim(Self.fParameters4);
 end;
 
 procedure TfrmCustStatement.TBCloseClick(Sender: TObject);
diff --git a/A09财务通用管理/U_ExpenseInput.pas b/A09财务通用管理/U_ExpenseInput.pas
index 52839d5..393c0fe 100644
--- a/A09财务通用管理/U_ExpenseInput.pas
+++ b/A09财务通用管理/U_ExpenseInput.pas
@@ -77,7 +77,7 @@ type
     function SaveData(): Boolean;
   public
     { Public declarations }
-    FFFID: string;
+    FFFID, canshu4: string;
   end;
 
 var
@@ -455,6 +455,7 @@ begin
         FieldByName('Editer').Value := Trim(DName);
         FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
       end;
+      FieldByName('Store').Value := Trim(canshu4);
       FieldByName('OppCoNo').Value := Trim(OppCoName.Properties.LookupItems.Text);
       FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text);
       FieldByName('OurBankID').Value := Trim(OurBankName.Properties.LookupItems.Text);
diff --git a/A09财务通用管理/U_ExpenseList.dfm b/A09财务通用管理/U_ExpenseList.dfm
index 89ce437..985289f 100644
--- a/A09财务通用管理/U_ExpenseList.dfm
+++ b/A09财务通用管理/U_ExpenseList.dfm
@@ -238,12 +238,11 @@ inherited frmExpenseList: TfrmExpenseList
       ExplicitTop = 2
       ExplicitWidth = 1621
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_ExpenseList.pas b/A09财务通用管理/U_ExpenseList.pas
index 2e78693..74e19be 100644
--- a/A09财务通用管理/U_ExpenseList.pas
+++ b/A09财务通用管理/U_ExpenseList.pas
@@ -95,11 +95,12 @@ type
     procedure N3Click(Sender: TObject);
     procedure TBFindClick(Sender: TObject);
     procedure OppCoNamePropertiesChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
   private
     procedure InitGrid();
     procedure SetStatus();
   public
-    FAuthority: string;
+    FAuthority, canshu4: string;
   end;
 
 implementation
@@ -161,6 +162,7 @@ begin
         SqlStr := SqlStr + ' and isnull(status,''0'')=''9'' ';
       end;
   end;
+  SqlStr := SqlStr + ' and isnull(A.Store,'''')=' + QuotedStr(Trim(canshu4));
 //  showmessage(SqlStr);
   InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
 
@@ -189,6 +191,12 @@ begin
   Action := caFree;
 end;
 
+procedure TfrmExpenseList.FormCreate(Sender: TObject);
+begin
+  inherited;
+  canshu4 := Trim(Self.fParameters4);
+end;
+
 procedure TfrmExpenseList.TBCloseClick(Sender: TObject);
 begin
 
@@ -438,6 +446,7 @@ begin
     with frmExpenseInput do
     begin
       FFFID := '';
+      canshu4 := Self.canshu4;
       if ShowModal = 1 then
       begin
         InitGrid();
@@ -493,6 +502,7 @@ begin
     frmExpenseInput := TfrmExpenseInput.Create(Application);
     with frmExpenseInput do
     begin
+      canshu4 := Self.canshu4;
       FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
       if ShowModal = 1 then
       begin
diff --git a/A09财务通用管理/U_FtyStatement.dfm b/A09财务通用管理/U_FtyStatement.dfm
index 66febab..e4fccff 100644
--- a/A09财务通用管理/U_FtyStatement.dfm
+++ b/A09财务通用管理/U_FtyStatement.dfm
@@ -112,6 +112,7 @@ inherited frmFtyStatement: TfrmFtyStatement
     Color = clWhite
     ParentBackground = False
     TabOrder = 5
+    ExplicitWidth = 304
     object Label3: TLabel
       Left = 20
       Top = 51
@@ -144,14 +145,13 @@ inherited frmFtyStatement: TfrmFtyStatement
       TabOrder = 1
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1243
+      ExplicitWidth = 300
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas
index 41537d2..5f2495c 100644
--- a/A09财务通用管理/U_GetDllForm.pas
+++ b/A09财务通用管理/U_GetDllForm.pas
@@ -72,17 +72,14 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-//    server := '127.0.0.1';
-//    dtbase := 'xushangData';
-//    user := 'sa';
-//    pswd := 'rightsoft';
     server := '101.132.143.144,7781';
-    dtbase := 'changyoudata';
+    dtbase := 'gemeiData';
     user := 'rtsa';
     pswd := 'rightsoft@5740';
+
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//    Parameters1 := '����';
-    Parameters1 := '��Ȩ��';
+    Parameters1 := '����';
+//    Parameters1 := '��Ȩ��';
 //    Parameters1 := '���';
 //    Parameters1 := '¼��';
     DCode := '005';
diff --git a/A09财务通用管理/U_InvoiceInList.dfm b/A09财务通用管理/U_InvoiceInList.dfm
index 0b61e90..3be1506 100644
--- a/A09财务通用管理/U_InvoiceInList.dfm
+++ b/A09财务通用管理/U_InvoiceInList.dfm
@@ -145,6 +145,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
     Color = clWhite
     ParentBackground = False
     TabOrder = 5
+    ExplicitWidth = 304
     object Label3: TLabel
       Left = 27
       Top = 47
@@ -233,14 +234,13 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       TabOrder = 5
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1554
+      ExplicitWidth = 300
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_PayList.dfm b/A09财务通用管理/U_PayList.dfm
index 9ac55b9..c210b1b 100644
--- a/A09财务通用管理/U_PayList.dfm
+++ b/A09财务通用管理/U_PayList.dfm
@@ -160,6 +160,7 @@ inherited frmPayList: TfrmPayList
     Color = clWhite
     ParentBackground = False
     TabOrder = 5
+    ExplicitWidth = 304
     object Label3: TLabel
       Left = 28
       Top = 48
@@ -268,14 +269,13 @@ inherited frmPayList: TfrmPayList
       TabOrder = 6
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1536
+      ExplicitWidth = 300
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_PayableList.dfm b/A09财务通用管理/U_PayableList.dfm
index 439ba25..028a745 100644
--- a/A09财务通用管理/U_PayableList.dfm
+++ b/A09财务通用管理/U_PayableList.dfm
@@ -160,6 +160,7 @@ inherited frmPayableList: TfrmPayableList
     Color = clWhite
     ParentBackground = False
     TabOrder = 5
+    ExplicitWidth = 304
     object Label3: TLabel
       Left = 26
       Top = 50
@@ -273,14 +274,13 @@ inherited frmPayableList: TfrmPayableList
       TabOrder = 6
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1621
+      ExplicitWidth = 300
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
   end
diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas
index ea420ed..0a6770f 100644
--- a/A09财务通用管理/U_ReceivableInput.pas
+++ b/A09财务通用管理/U_ReceivableInput.pas
@@ -109,7 +109,7 @@ type
     function SaveData(): Boolean;
   public
     { Public declarations }
-    FFFID, FAuthority: string;
+    FFFID, FAuthority, canshu4: string;
   end;
 
 var
@@ -503,6 +503,7 @@ begin
         FieldByName('Editer').Value := Trim(DName);
         FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
       end;
+      FieldByName('Store').Value := Trim(canshu4);
       FieldByName('OppCoNo').Value := Trim(OppCoName.Properties.LookupItems.Text);
       FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text);
       FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.Properties.LookupItems.Text);
diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm
index 913790b..a4ad0dd 100644
--- a/A09财务通用管理/U_ReceivableList.dfm
+++ b/A09财务通用管理/U_ReceivableList.dfm
@@ -2,13 +2,13 @@ inherited frmReceivableList: TfrmReceivableList
   Left = 315
   Top = 101
   Caption = #24212#25910#27454#31649#29702
-  ClientHeight = 587
+  ClientHeight = 591
   ClientWidth = 1540
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
   ExplicitWidth = 1556
-  ExplicitHeight = 626
+  ExplicitHeight = 630
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
@@ -36,22 +36,22 @@ inherited frmReceivableList: TfrmReceivableList
       ImageIndex = 1
       OnClick = TBRafreshClick
     end
-    object btnAdd: TToolButton
-      Left = 71
-      Top = 0
-      AutoSize = True
-      Caption = #26032#22686
-      ImageIndex = 9
-      OnClick = btnAddClick
-    end
     object TBFind: TToolButton
-      Left = 142
+      Left = 71
       Top = 0
       AutoSize = True
       Caption = #36807#28388
       ImageIndex = 0
       OnClick = TBFindClick
     end
+    object btnAdd: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686
+      ImageIndex = 9
+      OnClick = btnAddClick
+    end
     object btnEdit: TToolButton
       Left = 213
       Top = 0
@@ -277,12 +277,11 @@ inherited frmReceivableList: TfrmReceivableList
       ExplicitTop = 2
       ExplicitWidth = 1536
       ExplicitHeight = 37
-      inherited TimeType: TcxComboBox
-        ExplicitHeight = 29
-      end
-      inherited jqModel: TcxCheckBox
-        ExplicitWidth = 84
-        ExplicitHeight = 25
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
       end
     end
     object OrderNo: TcxTextEdit
@@ -298,10 +297,11 @@ inherited frmReceivableList: TfrmReceivableList
     Left = 0
     Top = 179
     Width = 1540
-    Height = 408
+    Height = 412
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 185
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas
index 7614304..a20a1e4 100644
--- a/A09财务通用管理/U_ReceivableList.pas
+++ b/A09财务通用管理/U_ReceivableList.pas
@@ -141,7 +141,7 @@ type
     procedure InitGrid();
     procedure SetStatus();
   public
-    FAuthority: string;
+    FAuthority, canshu4: string;
   end;
 
 implementation
@@ -231,6 +231,9 @@ begin
         SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' ';
       end;
   end;
+
+  SqlStr := SqlStr + ' and isnull(A.Store,'''')=' + QuotedStr(Trim(canshu4));
+
 //  ShowMessage(SqlStr);
   InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
 
@@ -331,6 +334,7 @@ procedure TfrmReceivableList.FormShow(Sender: TObject);
 begin
   inherited;
   ReadCxGrid(trim(Self.Caption), Tv1, '�������');
+  canshu4 := Trim(Self.fParameters4);
   frmFrameDateSel1.Enddate.Date := SGetServerDate(ADOQueryTemp);
   frmFrameDateSel1.begdate.Date := frmFrameDateSel1.Enddate.Date - 30;
   SetStatus();
@@ -563,6 +567,7 @@ begin
     with frmReceivableInput do
     begin
       FFFID := '';
+      canshu4 := Self.canshu4;
       FAuthority := Self.FAuthority;
       if ShowModal = 1 then
       begin
@@ -698,6 +703,7 @@ begin
     frmReceivableInput := TfrmReceivableInput.Create(Application);
     with frmReceivableInput do
     begin
+      canshu4 := Self.canshu4;
       FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
       FAuthority := Self.FAuthority;
       if ShowModal = 1 then
diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm
index b00e551..5f20c3f 100644
--- a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm
+++ b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm
@@ -94,7 +94,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
     BevelOuter = bvLowered
     ParentBackground = False
     TabOrder = 5
-    ExplicitTop = 27
     object Label3: TLabel
       Left = 24
       Top = 51
@@ -185,8 +184,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 3
-    ExplicitTop = 149
-    ExplicitHeight = 445
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -201,6 +198,18 @@ inherited frmTradeMarketList: TfrmTradeMarketList
         end
         item
           Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column14
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column15
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column11
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.CellHints = True
@@ -362,6 +371,22 @@ inherited frmTradeMarketList: TfrmTradeMarketList
         Options.Editing = False
         Width = 88
       end
+      object Tv1Column15: TcxGridDBColumn
+        Caption = #20986#24211#21305#25968
+        DataBinding.FieldName = 'OutPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 109
+      end
+      object Tv1Column14: TcxGridDBColumn
+        Caption = #20986#24211#25968#37327
+        DataBinding.FieldName = 'OutQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 108
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -382,7 +407,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
       '      '#24050#23436#25104'      '
       '      '#20840#37096'      ')
     OnChange = cxTabControl1Change
-    ExplicitTop = 115
     ClientRectBottom = 31
     ClientRectRight = 1985
     ClientRectTop = 28
diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.pas b/T02贸易汇总仓库/U_TradeXinYuOutList.pas
index 99cbe7a..81f17cc 100644
--- a/T02贸易汇总仓库/U_TradeXinYuOutList.pas
+++ b/T02贸易汇总仓库/U_TradeXinYuOutList.pas
@@ -83,6 +83,8 @@ type
     Tv1Column20: TcxGridDBColumn;
     TBFind: TToolButton;
     xxx1: TMenuItem;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
diff --git a/T02贸易汇总仓库/U_TradeXinYuStkList.dfm b/T02贸易汇总仓库/U_TradeXinYuStkList.dfm
index d120ae4..16e44e3 100644
--- a/T02贸易汇总仓库/U_TradeXinYuStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeXinYuStkList.dfm
@@ -167,8 +167,6 @@ inherited frmTradeXinYuStkList: TfrmTradeXinYuStkList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 4
-    ExplicitTop = 8
-    ExplicitHeight = 394
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm
index 90da83c..0cfc7ac 100644
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@@ -6,6 +6,7 @@ inherited frmMachRollMain: TfrmMachRollMain
   Font.Charset = ANSI_CHARSET
   Font.Height = -16
   FormStyle = fsMDIChild
+  Visible = True
   ExplicitWidth = 1459
   ExplicitHeight = 795
   PixelsPerInch = 96
@@ -569,7 +570,6 @@ inherited frmMachRollMain: TfrmMachRollMain
     DoubleBuffered = False
     ParentDoubleBuffered = False
     TabOrder = 3
-    ExplicitWidth = 1292
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
@@ -577,8 +577,6 @@ inherited frmMachRollMain: TfrmMachRollMain
       Height = 421
       Align = alClient
       TabOrder = 0
-      ExplicitWidth = 1290
-      ExplicitHeight = 450
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -742,7 +740,6 @@ inherited frmMachRollMain: TfrmMachRollMain
       Height = 333
       Align = alBottom
       TabOrder = 1
-      ExplicitWidth = 1290
       object cxGrid3: TcxGrid
         Tag = 9999
         Left = 1
@@ -751,10 +748,6 @@ inherited frmMachRollMain: TfrmMachRollMain
         Height = 301
         Align = alClient
         TabOrder = 0
-        ExplicitLeft = 6
-        ExplicitTop = 487
-        ExplicitWidth = 1290
-        ExplicitHeight = 274
         object Tv3: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -903,9 +896,6 @@ inherited frmMachRollMain: TfrmMachRollMain
         ParentDoubleBuffered = False
         ShowCaptions = True
         TabOrder = 1
-        ExplicitLeft = 5
-        ExplicitTop = 6
-        ExplicitWidth = 1288
         object ToolButton3: TToolButton
           Left = 0
           Top = 0
@@ -938,7 +928,7 @@ inherited frmMachRollMain: TfrmMachRollMain
           OnClick = ToolButton2Click
         end
         object ToolButton1: TToolButton
-          Left = 356
+          Left = 380
           Top = 0
           AutoSize = True
           Caption = #25171#21367#35774#32622
@@ -946,14 +936,14 @@ inherited frmMachRollMain: TfrmMachRollMain
           OnClick = ToolButton1Click
         end
         object Tlog: TToolButton
-          Left = 459
+          Left = 483
           Top = 0
           AutoSize = True
           Caption = #26085#24535
           ImageIndex = 30
         end
         object ToolButton8: TToolButton
-          Left = 530
+          Left = 554
           Top = 0
           AutoSize = True
           Caption = #20851#38381
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 42e2899..29f6032 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -428,7 +428,7 @@ begin
         Sql.Add(' ,@TMSId =' + quotedstr(MTMSId));
         Sql.Add(' ,@Dcode=' + quotedstr(Trim(Dcode)));
         Sql.Add(' ,@DName=' + quotedstr(Trim(DName)));
-        showmessage(sql.Text);
+//        showmessage(sql.Text);
         open;
       end;
 
diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas
index 9416679..9fccac8 100644
--- a/T05贸易门市管理/U_GetDllForm.pas
+++ b/T05贸易门市管理/U_GetDllForm.pas
@@ -76,6 +76,7 @@ begin
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //   DParameters1:='��Ȩ��';
 //    Parameters2 := '��֯';
+    Parameters4 := '����';
     DCode := 'ADMIN';
     DName := 'ADMIN';
   end
diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm
index b758284..8d44501 100644
--- a/T05贸易门市管理/U_TradeMarketInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut.dfm
@@ -93,7 +93,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
     Align = alClient
     Caption = 'Panel2'
     TabOrder = 2
-    ExplicitHeight = 443
     object Panel3: TPanel
       Left = 1
       Top = 1
@@ -102,7 +101,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
       Align = alClient
       Caption = 'Panel2'
       TabOrder = 0
-      ExplicitHeight = 441
       object cxGrid1: TcxGrid
         Left = 1
         Top = 1
@@ -110,8 +108,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
         Height = 486
         Align = alClient
         TabOrder = 0
-        ExplicitLeft = -1
-        ExplicitTop = -1
         object Tv1: TcxGridDBTableView
           OnMouseDown = Tv1MouseDown
           Navigator.Buttons.CustomButtons = <>
@@ -376,7 +372,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
       Align = alRight
       Caption = 'Panel4'
       TabOrder = 1
-      ExplicitHeight = 441
       object Panel5: TPanel
         Left = 1
         Top = 1
@@ -414,7 +409,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
         Align = alClient
         Caption = #21452#20987#21024#38500#26126#32454#20449#24687
         TabOrder = 1
-        ExplicitHeight = 398
         object cxGrid2: TcxGrid
           Left = 2
           Top = 23
@@ -422,7 +416,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
           Height = 420
           Align = alClient
           TabOrder = 0
-          ExplicitHeight = 373
           object TvMX: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             Navigator.Buttons.Delete.Enabled = False
@@ -495,7 +488,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
     ParentCtl3D = False
     TabOrder = 3
     OnClick = ScrollBox1Click
-    ExplicitTop = 24
     object Label3: TLabel
       Left = 730
       Top = 70
diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm
index efbb149..7bfbfde 100644
--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@@ -510,10 +510,10 @@ inherited frmTradeMarketList: TfrmTradeMarketList
     ExplicitTop = 346
   end
   inherited cxProgressBar2: TcxProgressBar
-    Left = 484
-    Top = 280
-    ExplicitLeft = 484
-    ExplicitTop = 280
+    Left = 616
+    Top = 296
+    ExplicitLeft = 616
+    ExplicitTop = 296
     ExplicitHeight = 29
   end
   inherited ADOQueryBaseCmd: TADOQuery