123545

2026-06-13 16:49:18 +08:00 · 2026-06-13 16:49:18 +08:00 · 9f5fcadbd1
commit 9f5fcadbd1
parent 4d653360b5
119 changed files with 29948 additions and 1825 deletions
--- a/A00通用窗体/U_CompanySel.pas
+++ b/A00通用窗体/U_CompanySel.pas
@ -87,7 +87,7 @@ type
    procedure InitGrid();
    { Private declarations }
  public
-    FCoType, FAuthority, FStores, FsqlStr: string;
+    FCoType, FAuthority, FStores, FsqlStr, CANSHU4: string;
    { Public declarations }
  end;

@ -150,7 +150,7 @@ begin
      sql.Add(',ContactsId=(select top 1 UserID from SY_User X where X.UserName=B.Contacts )   ');
      sql.Add('from BS_Company A  ');
      sql.Add('left join  BS_Company_contact B ON A.COID=B.COID and B.IsDefault=1  ');
-      sql.Add('where 1=1 ');
+      sql.Add('where 1=1  AND VALID=''Y''');
      if Trim(FCoType) <> '' then
      begin
        sql.Add(' and A.CoType=''' + Trim(FCoType) + '''');
@ -163,8 +163,8 @@ begin
      begin
        sql.add(FsqlStr);
      end;
-//      if FStores = 'ÐÂÓà' then
-//        sql.Add(' and A.Stores=''' + Trim(FStores) + '''');
+      if CANSHU4 = 'ÐÂÓà' then
+        sql.Add(' and A.Stores=''' + Trim(CANSHU4) + '''');
 //      ShowMessage(sql.Text);
      Open;
    end;
--- a/A00通用窗体/U_UserSel.pas
+++ b/A00通用窗体/U_UserSel.pas
@ -214,7 +214,11 @@ end;

 procedure TfrmUserSel.Tv1DblClick(Sender: TObject);
 begin
-  btnOK.Click;
+
+  FRTUserID := CDS_1.FieldByName('EECode').AsString;
+  FRTUserName := CDS_1.FieldByName('EENAME').AsString;
+  ModalResult := 1;
+//  btnOK.Click;
 end;

 procedure TfrmUserSel.EENamePropertiesChange(Sender: TObject);
--- a/A01基础公司管理/Company.dproj
+++ b/A01基础公司管理/Company.dproj
@ -79,7 +79,7 @@
        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Debugger_HostApplication>E:\rtgit\trade\D10xhGemei\A01基础公司管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\A01基础公司管理\testDll.exe</Debugger_HostApplication>
        <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>
    </PropertyGroup>
    <ItemGroup>
--- a/A01基础公司管理/U_CustInput.dfm
+++ b/A01基础公司管理/U_CustInput.dfm
@ -351,7 +351,8 @@ inherited frmCustInput: TfrmCustInput
        #27425#26376'25'#21495
        #27425#27425#26376'25'#21495
        #27425#26376'30'#21495
-        #27425#27425#26376'30'#21495)
+        #27425#27425#26376'30'#21495
+        #29616#37329)
      TabOrder = 10
      Width = 200
    end
--- a/A01基础公司管理/U_CustInput.pas
+++ b/A01基础公司管理/U_CustInput.pas
@ -467,20 +467,7 @@ begin
      Application.MessageBox('名称重复!', '提示', 0);
      Exit;
    end;
-    with ADOQueryCmd do
-    begin
-      Close;
-      sql.Clear;
-      sql.Add('select * from BS_Company where CoAbbrName=' + quotedstr(trim(CoAbbrName.Text)));
-      sql.Add(' and CoType=''客户''    ');
-      Open;
-    end;
-    if ADOQueryCmd.RecordCount > 1 then
-    begin
-      ADOQueryCmd.Connection.RollbackTrans;
-      Application.MessageBox('简称重复!', '提示', 0);
-      Exit;
-    end;
+
 //////////////            联系人              ///////////////////
    if not CDS_LXR.IsEmpty then
    begin
@ -617,16 +604,17 @@ begin
    Application.MessageBox('地区不能为空!', '提示', 0);
    Exit;
  end;
-  if Trim(CoAbbrName.Text) = '' then
-  begin
-    Application.MessageBox('简称不能为空!', '提示', 0);
-    Exit;
-  end;
  if Trim(CoName.Text) = '' then
  begin
    Application.MessageBox('全称不能为空!', '提示', 0);
    Exit;
  end;
+  if Trim(CoAbbrName.Text) = '' then
+  begin
+    CoAbbrName.Text := CoName.Text;
+
+  end;
+
  if Trim(Saleser.Text) = '' then
  begin
    Application.MessageBox('业务员不能为空!', '提示', 0);
@ -673,12 +661,12 @@ begin
        EnableControls;
        Exit;
      end;
-//      if Trim(FieldByName('mxarea').AsString) = '' then
-//      begin
-//        Application.MessageBox('区域不能为空!', '提示', 0);
-//        EnableControls;
-//        Exit;
-//      end;
+      if Trim(FieldByName('mxarea').AsString) = '' then
+      begin
+        Application.MessageBox('区域不能为空!', '提示', 0);
+        EnableControls;
+        Exit;
+      end;
      Next;
    end;
    EnableControls;
@ -808,6 +796,8 @@ begin
      MainType := 'Cust';
      flag := 'AREA';
      flagname := '区域';
+      fnote := true;
+      V1Note.Caption := '区域代码';
      if ShowModal = 1 then
      begin
        with CDS_LXR do
--- a/A01基础公司管理/U_Customer.dfm
+++ b/A01基础公司管理/U_Customer.dfm
@ -21,7 +21,7 @@ inherited frmCustomer: TfrmCustomer
    Height = 30
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 131
+    ButtonWidth = 147
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_Company.cxImageList_bar
@ -119,16 +119,24 @@ inherited frmCustomer: TfrmCustomer
      ImageIndex = 16
      OnClick = ToolButton1Click
    end
-    object TBClose: TToolButton
+    object ToolButton4: TToolButton
      Left = 925
      Top = 0
      AutoSize = True
+      Caption = #26597#30475#23458#25143#20108#32500#30721
+      ImageIndex = 8
+      OnClick = ToolButton4Click
+    end
+    object TBClose: TToolButton
+      Left = 1076
+      Top = 0
+      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
    end
    object SetupStore: TToolButton
-      Left = 996
+      Left = 1147
      Top = 0
      AutoSize = True
      Caption = #19968#38190#35774#32622#38376#24215
@ -429,8 +437,8 @@ inherited frmCustomer: TfrmCustomer
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 6
+    ExplicitTop = 126
    object Tv1: TcxGridDBTableView
-      PopupMenu = PopupMenu1
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
@ -566,6 +574,20 @@ inherited frmCustomer: TfrmCustomer
        Options.Editing = False
        Width = 66
      end
+      object Tv1Column18: TcxGridDBColumn
+        Caption = #20462#25913#20154
+        DataBinding.FieldName = 'Editer'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column19: TcxGridDBColumn
+        Caption = #20462#25913#26102#38388
+        DataBinding.FieldName = 'Edittime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 89
+      end
      object Tv1Column5: TcxGridDBColumn
        Caption = #29702#21333
        DataBinding.FieldName = 'Tallyer'
@ -671,9 +693,10 @@ inherited frmCustomer: TfrmCustomer
    Top = 187
  end
  object GPM_1: TcxGridPopupMenu
+    Grid = cxGrid1
    PopupMenus = <>
    Left = 180
-    Top = 216
+    Top = 217
  end
  object DS_1: TDataSource
    DataSet = CDS_1
@ -730,4 +753,155 @@ inherited frmCustomer: TfrmCustomer
    Left = 521
    Top = 566
  end
+  object fRMDB_1: TfrxDBDataset
+    UserName = 'fRMDB_1'
+    CloseDataSource = False
+    DataSet = ADOQueryPrint
+    BCDToCurrency = False
+    Left = 539
+    Top = 462
+  end
+  object frxRichObject1: TfrxRichObject
+    Left = 539
+    Top = 511
+  end
+  object frxOLEObject1: TfrxOLEObject
+    Left = 622
+    Top = 461
+  end
+  object frxBarCodeObject1: TfrxBarCodeObject
+    Left = 456
+    Top = 461
+  end
+  object frxPPTXExport1: TfrxPPTXExport
+    UseFileCache = True
+    ShowProgress = True
+    OverwritePrompt = False
+    DataOnly = False
+    OpenAfterExport = False
+    PictureType = gpPNG
+    Left = 705
+    Top = 461
+  end
+  object frxReport1: TfrxReport
+    Version = '6.9.12'
+    DataSet = fRMDB_1
+    DataSetName = 'fRMDB_1'
+    DotMatrixReport = False
+    IniFile = '\Software\Fast Reports'
+    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
+    PreviewOptions.Zoom = 1.000000000000000000
+    PrintOptions.Printer = 'Default'
+    PrintOptions.PrintOnSheet = 0
+    ReportOptions.CreateDate = 45471.682319444440000000
+    ReportOptions.LastChange = 45471.682319444440000000
+    ScriptLanguage = 'PascalScript'
+    ScriptText.Strings = (
+      'begin'
+      ''
+      'end.')
+    ShowProgress = False
+    Left = 789
+    Top = 462
+    Datasets = <>
+    Variables = <>
+    Style = <>
+    object Data: TfrxDataPage
+      Height = 1000.000000000000000000
+      Width = 1000.000000000000000000
+    end
+    object Page1: TfrxReportPage
+      PaperWidth = 70.000000000000000000
+      PaperHeight = 50.000000000000000000
+      PaperSize = 256
+      LeftMargin = 10.000000000000000000
+      RightMargin = 10.000000000000000000
+      TopMargin = 10.000000000000000000
+      BottomMargin = 10.000000000000000000
+      Frame.Typ = []
+      MirrorMode = []
+    end
+  end
+  object ADOQueryPrint: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 788
+    Top = 311
+  end
+  object frxDBDataset1: TfrxDBDataset
+    UserName = 'fRMDB_1'
+    CloseDataSource = False
+    DataSet = ADOQuery1
+    BCDToCurrency = False
+    Left = 547
+    Top = 470
+  end
+  object frxRichObject2: TfrxRichObject
+    Left = 547
+    Top = 519
+  end
+  object frxOLEObject2: TfrxOLEObject
+    Left = 630
+    Top = 469
+  end
+  object frxBarCodeObject2: TfrxBarCodeObject
+    Left = 464
+    Top = 469
+  end
+  object frxPPTXExport2: TfrxPPTXExport
+    UseFileCache = True
+    ShowProgress = True
+    OverwritePrompt = False
+    DataOnly = False
+    OpenAfterExport = False
+    PictureType = gpPNG
+    Left = 713
+    Top = 469
+  end
+  object frxReport2: TfrxReport
+    Version = '6.9.12'
+    DataSet = frxDBDataset1
+    DataSetName = 'fRMDB_1'
+    DotMatrixReport = False
+    IniFile = '\Software\Fast Reports'
+    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
+    PreviewOptions.Zoom = 1.000000000000000000
+    PrintOptions.Printer = 'Default'
+    PrintOptions.PrintOnSheet = 0
+    ReportOptions.CreateDate = 45471.682319444440000000
+    ReportOptions.LastChange = 45471.682319444440000000
+    ScriptLanguage = 'PascalScript'
+    ScriptText.Strings = (
+      'begin'
+      ''
+      'end.')
+    ShowProgress = False
+    Left = 797
+    Top = 470
+    Datasets = <>
+    Variables = <>
+    Style = <>
+    object Data: TfrxDataPage
+      Height = 1000.000000000000000000
+      Width = 1000.000000000000000000
+    end
+    object Page1: TfrxReportPage
+      PaperWidth = 70.000000000000000000
+      PaperHeight = 50.000000000000000000
+      PaperSize = 256
+      LeftMargin = 10.000000000000000000
+      RightMargin = 10.000000000000000000
+      TopMargin = 10.000000000000000000
+      BottomMargin = 10.000000000000000000
+      Frame.Typ = []
+      MirrorMode = []
+    end
+  end
+  object ADOQuery1: TADOQuery
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 526
+    Top = 305
+  end
 end
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@ -18,7 +18,8 @@ uses
  FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Stan.Async,
  FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Comp.Client, cxContainer,
  dxScrollbarAnnotations, Vcl.Menus, cxProgressBar, dxSkinsCore,
-  dxSkinsDefaultPainters, dxSkinWXI;
+  dxSkinsDefaultPainters, dxSkinWXI, frxClass, frxExportBaseDialog,
+  frxExportPPTX, frxBarcode, frxOLE, frxRich, frxDBSet;

 type
  TfrmCustomer = class(TfrmBaseList)
@ -106,6 +107,23 @@ type
    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
    Tv1Column17: TcxGridDBColumn;
+    Tv1Column18: TcxGridDBColumn;
+    Tv1Column19: TcxGridDBColumn;
+    ToolButton4: TToolButton;
+    fRMDB_1: TfrxDBDataset;
+    frxRichObject1: TfrxRichObject;
+    frxOLEObject1: TfrxOLEObject;
+    frxBarCodeObject1: TfrxBarCodeObject;
+    frxPPTXExport1: TfrxPPTXExport;
+    frxReport1: TfrxReport;
+    ADOQueryPrint: TADOQuery;
+    frxDBDataset1: TfrxDBDataset;
+    frxRichObject2: TfrxRichObject;
+    frxOLEObject2: TfrxOLEObject;
+    frxBarCodeObject2: TfrxBarCodeObject;
+    frxPPTXExport2: TfrxPPTXExport;
+    frxReport2: TfrxReport;
+    ADOQuery1: TADOQuery;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -130,6 +148,7 @@ type
    procedure N1Click(Sender: TObject);
    procedure N2Click(Sender: TObject);
    procedure SetupStoreClick(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
    //procedure btnStoreOKClick(Sender: TObject);
  private
    fFlileFlag: string;
@ -388,6 +407,48 @@ begin

 end;

+procedure TfrmCustomer.ToolButton4Click(Sender: TObject);
+var
+  fPrintFile: string;
+  Txt, fImagePath, Txt2, fImagePath2: string;
+  Moudle: Thandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+begin
+
+  with ADOQueryPrint do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add(' select  ''' + trim(CDS_1.FieldByName('COID').AsString) + '''');
+
+    Open;
+  end;
+  if ADOQueryPrint.IsEmpty then
+  begin
+    Application.MessageBox('标签内容未找到！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+
+  ExportFtErpFile('客户二维码.fr3', ADOQueryBaseTemp);
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\客户二维码.fr3';
+  if FileExists(fPrintFile) then
+  begin
+
+    frxReport1.LoadFromFile(fPrintFile);
+    frxReport1.PrintOptions.Copies := 1;
+    frxReport1.PrintOptions.ShowDialog := false;
+    frxReport1.PrepareReport(True);
+    frxReport1.ShowReport();
+
+  end
+  else
+  begin
+    Application.MessageBox(PChar('没有找到' + fPrintFile), '提示', 0);
+  end;
+
+end;
+
 procedure TfrmCustomer.CoCodeKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
--- a/A01基础公司管理/U_CustomerInput.pas
+++ b/A01基础公司管理/U_CustomerInput.pas
@ -374,6 +374,7 @@ begin
  if SaveData() then
  begin
    Application.MessageBox('保存成功!', '提示', 0);
+    ModalResult := 1;
  end;
 end;

--- a/A01基础公司管理/testDll.res
+++ b/A01基础公司管理/testDll.res
--- a/A02基础产品管理/ClothInfo.dproj
+++ b/A02基础产品管理/ClothInfo.dproj
@ -80,7 +80,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>E:\rtgit\trade\D10xhGemei\A02基础产品管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\A02基础产品管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/A02基础产品管理/U_ClothInfo.dfm
+++ b/A02基础产品管理/U_ClothInfo.dfm
@ -385,7 +385,7 @@ inherited frmClothInfo: TfrmClothInfo
        object TCBNOR1: TComboBox
          Tag = 2
          Left = 123
-          Top = 4
+          Top = 5
          Width = 78
          Height = 29
          Anchors = [akLeft]
@ -641,17 +641,12 @@ inherited frmClothInfo: TfrmClothInfo
          Width = 104
        end
        object Tv1Column14: TcxGridDBColumn
-          Caption = #21518#25972#29702#20013#25991
-          DataBinding.FieldName = 'CraftName'
+          Caption = #24211#20301
+          DataBinding.FieldName = 'StkPosition'
          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
          Width = 141
        end
-        object Tv1Column15: TcxGridDBColumn
-          Caption = #21518#25972#29702#33521#25991
-          DataBinding.FieldName = 'CraftEName'
-          DataBinding.IsNullValueType = True
-          Width = 125
-        end
        object Tv1Column16: TcxGridDBColumn
          Caption = #20379#24212#21830
          DataBinding.FieldName = 'FtyName'
@ -776,13 +771,13 @@ inherited frmClothInfo: TfrmClothInfo
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
-    Left = 634
-    Top = 124
+    Left = 623
+    Top = 185
  end
  inherited ADOQueryBaseTemp: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
-    Left = 695
-    Top = 124
+    Left = 694
+    Top = 190
  end
  object DS_Tree: TDataSource
    DataSet = CDS_Tree
@ -806,8 +801,8 @@ inherited frmClothInfo: TfrmClothInfo
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
    Parameters = <>
-    Left = 756
-    Top = 124
+    Left = 763
+    Top = 165
  end
  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
@ -824,8 +819,8 @@ inherited frmClothInfo: TfrmClothInfo
    Connection = DataLink_ClothInfo.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 817
-    Top = 124
+    Left = 915
+    Top = 265
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
@ -894,8 +889,8 @@ inherited frmClothInfo: TfrmClothInfo
  object adoqueryPicture: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
    Parameters = <>
-    Left = 878
-    Top = 124
+    Left = 908
+    Top = 197
  end
  object OpenDialog1: TOpenDialog
    Left = 634
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@ -118,7 +118,6 @@ type
    Tv1Column3: TcxGridDBColumn;
    Tv1Column12: TcxGridDBColumn;
    Tv1Column14: TcxGridDBColumn;
-    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
    Tv1Column17: TcxGridDBColumn;
    Tv1Column18: TcxGridDBColumn;
@ -728,6 +727,8 @@ begin
      TypeInt := 2;
      FBCIID := Trim(Self.CDS_1.fieldbyname('BCIID').AsString);
      FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString);
+      fname := Trim(Self.CDS_1.fieldbyname('C_NAME').AsString);
+
        //²Ù×÷ÈÕÖ¾
      with ADOQueryCmd do
      begin
@ -743,6 +744,7 @@ begin
        sql.Add(')');
        EXECSQL;
      end;
+
      if ShowModal = 1 then
      begin
        Self.InitGrid();
@ -799,6 +801,7 @@ begin
    with frmClothTypeSel do
    begin
      FCTType := Self.FCTType;
+      canshu4 := Self.canshu4;
      if showmodal = 1 then
      begin
        MCTID := trim(ADOQueryHelp.fieldbyname('CTID').asstring);
@ -915,6 +918,13 @@ begin
      FBCIID := Trim(Self.CDS_1.fieldbyname('BCIID').AsString);
      FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString);
      ToolButton1.Visible := False;
+
+      ToolButton6.Visible := false;
+
+      ToolBar2.Visible := false;
+      ToolBar3.Visible := false;
+      ToolBar4.Visible := false;
+
      if ShowModal = 1 then
      begin
        Self.InitGrid();
--- a/A02基础产品管理/U_ClothInfoInput.dfm
+++ b/A02基础产品管理/U_ClothInfoInput.dfm
@ -428,12 +428,12 @@ object frmClothInfoInput: TfrmClothInfoInput
      end
      object quota: TcxCurrencyEdit
        Tag = 2
-        Left = 510
+        Left = 567
        Top = 131
        EditValue = 10.000000000000000000
        Properties.AssignedValues.DisplayFormat = True
        TabOrder = 15
-        Width = 234
+        Width = 177
      end
      object StkPosition: TcxMRUEdit
        Left = 119
@ -464,6 +464,21 @@ object frmClothInfoInput: TfrmClothInfoInput
        OnKeyPress = CYColorKeyPress
        Width = 234
      end
+      object quotaUNIT: TComboBox
+        Tag = 2
+        Left = 510
+        Top = 133
+        Width = 57
+        Height = 29
+        Style = csDropDownList
+        Ctl3D = False
+        ParentCtl3D = False
+        TabOrder = 19
+        Items.Strings = (
+          '+'
+          '-'
+          '+-')
+      end
    end
    object Panel3: TPanel
      Left = 0
@ -973,10 +988,18 @@ object frmClothInfoInput: TfrmClothInfoInput
        Visible = False
        OnClick = ToolButton11Click
      end
-      object ToolButton12: TToolButton
+      object ToolButton14: TToolButton
        Left = 284
        Top = 0
        AutoSize = True
+        Caption = #23548#20986
+        ImageIndex = 38
+        OnClick = ToolButton14Click
+      end
+      object ToolButton12: TToolButton
+        Left = 355
+        Top = 0
+        AutoSize = True
        Caption = #20840#37096#21024#38500
        ImageIndex = 33
        OnClick = ToolButton12Click
@ -984,14 +1007,15 @@ object frmClothInfoInput: TfrmClothInfoInput
    end
    object cxGrid1: TcxGrid
      Left = 1
-      Top = 31
+      Top = 72
      Width = 548
-      Height = 738
+      Height = 697
      Align = alClient
      TabOrder = 1
      object TV1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
-        FindPanel.DisplayMode = fpdmAlways
+        FilterBox.CustomizeDialog = False
+        FindPanel.DisplayMode = fpdmManual
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_1
        DataController.Filter.AutoDataSetFilter = True
@ -1061,6 +1085,44 @@ object frmClothInfoInput: TfrmClothInfoInput
        GridView = TV1
      end
    end
+    object Panel7: TPanel
+      Left = 1
+      Top = 31
+      Width = 548
+      Height = 41
+      Align = alTop
+      TabOrder = 2
+      object Label8: TLabel
+        Left = 22
+        Top = 10
+        Width = 32
+        Height = 21
+        Caption = #39068#33394
+      end
+      object Label17: TLabel
+        Left = 244
+        Top = 10
+        Width = 32
+        Height = 21
+        Caption = #33394#21495
+      end
+      object C_COLOR: TcxTextEdit
+        Tag = 2
+        Left = 72
+        Top = 6
+        Properties.OnChange = C_COLORPropertiesChange
+        TabOrder = 0
+        Width = 150
+      end
+      object C_COLORNO: TcxTextEdit
+        Tag = 2
+        Left = 312
+        Top = 6
+        Properties.OnChange = C_COLORPropertiesChange
+        TabOrder = 1
+        Width = 150
+      end
+    end
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@ -140,6 +140,13 @@ type
    Process: TcxButtonEdit;
    ToolButton13: TToolButton;
    TV3Column1: TcxGridDBColumn;
+    Panel7: TPanel;
+    Label8: TLabel;
+    Label17: TLabel;
+    C_COLOR: TcxTextEdit;
+    C_COLORNO: TcxTextEdit;
+    ToolButton14: TToolButton;
+    quotaUNIT: TComboBox;
    procedure FormShow(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
@ -176,6 +183,8 @@ type
    procedure C_FromName5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure CostPriceClick(Sender: TObject);
    procedure ToolButton13Click(Sender: TObject);
+    procedure C_COLORPropertiesChange(Sender: TObject);
+    procedure ToolButton14Click(Sender: TObject);
  private
    canshu1: string;
    Fint: Integer;
@ -190,7 +199,7 @@ type
  public
    FBCIID, FCTID: string;
    TypeInt: Integer; //0新增_1复制_2修改
-    fbuzhongedit, canshu3, canshu4: string;
+    fbuzhongedit, canshu3, canshu4, fname: string;
    { Public declarations }
  end;

@ -380,7 +389,7 @@ begin

  SqlStr := 'SELECT A.* FROM BS_Cloth_Info_Sub A ';
  SqlStr := SqlStr + 'WHERE A.BCIID = ''' + Trim(FBCIID) + ''' ';
-  SqlStr := SqlStr + 'ORDER BY ';
+  SqlStr := SqlStr + 'ORDER BY  CASE  WHEN C_COLORNO NOT LIKE ''%[^0-9]%'' THEN dbo.getNum(C_Colorno)  ELSE 9999999999  END, ';
  SqlStr := SqlStr + '    CASE ';
  SqlStr := SqlStr + '        WHEN C_ColorNo NOT LIKE ''%[^0-9]%'' THEN 0 ';
  SqlStr := SqlStr + '        ELSE 1 ';
@ -406,7 +415,7 @@ begin
  SqlStr := SqlStr + '            0 ';
  SqlStr := SqlStr + '    END, ';
  SqlStr := SqlStr + '    C_ColorNo';
- // ShowMessage(sqlstr);
+
  InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, '', '');

  SqlStr := 'select A.* from BS_Cloth_Info_GYSCP A ';
@ -617,6 +626,15 @@ begin

 end;

+procedure TfrmClothInfoInput.C_COLORPropertiesChange(Sender: TObject);
+begin
+  if ado_1.Active = False then
+    Exit;
+  SDofilter(ado_1, SGetFilters(Panel7, 1, 2));
+  SCreateCDS(ado_1, CDS_1);
+  SInitCDSData(ado_1, CDS_1);
+end;
+
 procedure TfrmClothInfoInput.C_FromName2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
  if C_fromName.text = '' then
@ -849,6 +867,12 @@ begin
    FBCIID := '';
    BCIID.text := '';
    C_Code.text := '';
+
+    ClearCDSColumn(CDS_1, ['BCISID', 'BCIID']);
+
+    ClearCDSColumn(CDS_3, ['CICID', 'BCIID']);
+
+    ClearCDSColumn(CDS_2, ['BCIGID', 'BCIID']);
  end;
  if canshu3 = '低权限' then
  begin
@ -866,7 +890,7 @@ end;

 function TfrmClothInfoInput.SaveData(): Boolean;
 var
-  MaxBCIID, MaxBCPID, maxId2, MAXID3, MAXID4: string;
+  MaxBCIID, MaxBCPID, maxId2, MAXID3, MAXID4, MAXID5: string;
 begin
  try
    ADOQueryCmd.Connection.BeginTrans;
@ -943,6 +967,16 @@ begin
        raise Exception.Create('编号重复!');

    end;
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select count(*) as AA from BS_Cloth_Info where C_name=''' + Trim(C_name.Text) + '''');
+      Open;
+      if FieldByName('AA').AsInteger > 1 then
+        raise Exception.Create('名称重复!');
+
+    end;
 ////////////////       保存主表          //////////////////////
 ///
 ////////////////       保存子布          //////////////////////
@ -1136,17 +1170,80 @@ begin
      end;
    end;
 //////////////////////////            保存单位系数子表              //////////////////////////
-    ADOQueryCmd.Connection.CommitTrans;
+///
+///
+///
+///
+///  //////////////////////////            保存子表颜色（复制时）            //////////////////////////

-//    with ADOQueryCmd do
-//    begin
-//      Close;
-//      SQL.Clear;
-//      sql.Add(' exec P_BS_CloInfo_UpAllTab @BCIID=' + QuotedStr(trim(MaxBCIID)));
-//      Sql.Add(',@UpId=' + quotedstr(Trim(DCode)));
-//      Sql.Add(',@Uper=' + quotedstr(Trim(DName)));
-//      ExecSQL;
-//    end;
+    if TypeInt = 1 then
+    begin
+      with CDS_1 do
+      begin
+        First;
+        while not Eof do
+        begin
+          if Trim(CDS_1.fieldbyname('BCISID').AsString) = '' then
+          begin
+            if GetLSNo(ADOQueryTemp, MAXID5, 'YS', 'BS_Cloth_Info_Sub', 4, 1) = False then
+              raise Exception.Create('取子流水号失败!');
+          end
+          else
+          begin
+            MAXID5 := Trim(CDS_1.fieldbyname('BCISID').AsString);
+          end;
+
+          with ADOQueryCmd do
+          begin
+            Close;
+            SQL.Clear;
+            sql.Add(' select * from BS_Cloth_Info_Sub where ');
+            sql.Add(' BCISID=''' + Trim(MAXID5) + '''');
+            Open;
+          end;
+          with ADOQueryCmd do
+          begin
+            if Trim(CDS_1.fieldbyname('BCISID').AsString) = '' then
+            begin
+              Append;
+              FieldByName('FillID').Value := Trim(DCode);
+              FieldByName('Filler').Value := Trim(DName);
+              FieldByName('FillTime').Value := SGetServerDateTime(ADOQueryTemp);
+            end
+            else
+            begin
+              Edit;
+              FieldByName('EditID').Value := Trim(DCode);
+              FieldByName('Editer').Value := Trim(DName);
+              FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTemp);
+            end;
+            FieldByName('BCIID').Value := Trim(MaxBCIID);
+            FieldByName('BCISID').Value := Trim(MAXID5);
+            RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'BS_Cloth_Info_Sub', 0);
+            Post;
+          end;
+          Next;
+        end;
+      end;
+
+    end;
+
+
+//////////////////////////            保存子表颜色              //////////////////////////
+    ADOQueryCmd.Connection.CommitTrans;
+    if (fname <> '') and (fname <> (C_Name.Text)) then
+    begin
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        sql.Add(' exec P_BS_CloInfo_UpAlLNAME @BCIID=' + QuotedStr(trim(MaxBCIID)));
+        Sql.Add(',@UpId=' + quotedstr(Trim(DCode)));
+        Sql.Add(',@Uper=' + quotedstr(Trim(DName)));
+        ExecSQL;
+      end;
+
+    end;

    FBCIID := MaxBCIID;

@ -1351,6 +1448,13 @@ begin
  end;
 end;

+procedure TfrmClothInfoInput.ToolButton14Click(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+  TcxGridToExcel(C_CODE.TEXT + '色号明细', cxGrid1);
+end;
+
 procedure TfrmClothInfoInput.ToolButton1Click(Sender: TObject);
 var
  MC_Code: string;
--- a/A02基础产品管理/U_ClothTypeSel.pas
+++ b/A02基础产品管理/U_ClothTypeSel.pas
@ -6,8 +6,8 @@ uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB, cxLookAndFeels,
-  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, 
-  dxSkinsDefaultPainters, dxSkinsCore, cxFilter, dxScrollbarAnnotations;
+  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxSkinsDefaultPainters,
+  dxSkinsCore, cxFilter, dxScrollbarAnnotations;

 type
  TfrmClothTypeSel = class(TForm)
@ -22,7 +22,7 @@ type
  private
    { Private declarations }
  public
-    FCTType: string;
+    FCTType, canshu4: string;
    { Public declarations }
  end;

@ -55,7 +55,16 @@ begin
  begin
    Close;
    SQL.Clear;
-    SQL.Add('select * from BS_Cloth_Type where CTType=' + quotedstr(FCTType) + ' order by CTlevel,CTOrder,CTName');
+//    SQL.Add('select * from BS_Cloth_Type where CTType=' + quotedstr(FCTType));
+    if canshu4 = '¶þ´Î¼Ó¹¤' then
+    begin
+      SQL.Add('SELECT * FROM dbo.F_BS_CloType(''CT2505100001'') A ORDER BY CTName ');
+    end
+    else
+    begin
+      SQL.Add('SELECT * FROM dbo.F_BS_CloType(''CT2412300003'') A ORDER BY CTName ');
+    end;
+//    sql.Add(' order by CTlevel,CTOrder,CTName');
    Open;
  end;
  cxDBTreeList1.Items[0].Expand(false);
--- a/A02基础产品管理/U_Edit.dfm
+++ b/A02基础产品管理/U_Edit.dfm
@ -32,9 +32,11 @@ object frmEdit: TfrmEdit
      PopupMenu = PopupMenu1
      TabOrder = 0
      object TV4: TcxGridDBTableView
+        OnKeyDown = TV4KeyDown
        Navigator.Buttons.CustomButtons = <>
        FindPanel.DisplayMode = fpdmAlways
        ScrollbarAnnotations.CustomAnnotations = <>
+        OnCustomDrawCell = TV4CustomDrawCell
        DataController.DataSource = DS_4
        DataController.Filter.AutoDataSetFilter = True
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -96,6 +98,14 @@ object frmEdit: TfrmEdit
          HeaderAlignmentHorz = taCenter
          Width = 100
        end
+        object TV4Column1: TcxGridDBColumn
+          Tag = 3
+          Caption = #26159#21542#37325#22797
+          DataBinding.FieldName = 'IsRepeat'
+          DataBinding.IsNullValueType = True
+          Visible = False
+          Width = 70
+        end
      end
      object cxGridLevel4: TcxGridLevel
        GridView = TV4
--- a/A02基础产品管理/U_Edit.pas
+++ b/A02基础产品管理/U_Edit.pas
@ -42,6 +42,7 @@ type
    CDS_LM: TClientDataSet;
    OpenDialog1: TOpenDialog;
    ToolButton5: TToolButton;
+    TV4Column1: TcxGridDBColumn;
    procedure Button2Click(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
@ -53,6 +54,8 @@ type
    procedure ToolButton3Click(Sender: TObject);
    procedure ToolButton4Click(Sender: TObject);
    procedure ToolButton5Click(Sender: TObject);
+    procedure TV4CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure TV4KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    { Private declarations }
  public
@ -81,7 +84,7 @@ var
  SqlStr: string;
 begin
  readCxGrid(self.Caption + 'TV4', Tv4, 'ÑùÆ·¹ÜÀí');
-  SqlStr := 'select A.* from BS_Cloth_Info_Sub A ';
+  SqlStr := 'select A.*,IsRepeat=0 from BS_Cloth_Info_Sub A ';
  if FBCISID = '' then
  begin
    SqlStr := SqlStr + ' where 1<>1';
@ -286,6 +289,24 @@ begin
  WriteCxGrid(self.Caption + 'TV4', Tv4, 'ÑùÆ·¹ÜÀí');
 end;

+procedure TfrmEdit.TV4CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+begin
+  if '1' = AViewInfo.GridRecord.Values[TV4Column1.Index] then
+    ACanvas.Brush.Color := $008080FF;
+end;
+
+procedure TfrmEdit.TV4KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_DOWN then
+  begin
+    // 触发按钮的点击事件（把 Button1 换成你的按钮名称）
+    ToolButton2.Click;
+
+    // 可选：阻止 TreeView 本身的向下移动（不需要就删掉这行）
+    Key := 0;
+  end;
+end;
+
 function TfrmEdit.SaveData(): Boolean;
 var
  maxId4: string;
@ -341,16 +362,64 @@ begin
      end;
    end;

+    CDS_4.DisableControls;
+    try
+  // 先清空所有标记
+      CDS_4.First;
+      while not CDS_4.Eof do
+      begin
+        CDS_4.Edit;
+        CDS_4.FieldByName('IsRepeat').AsString := '0';
+        CDS_4.Post;
+        CDS_4.Next;
+      end;
+
+  // 查询重复的颜色+色号
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select C_Color,C_ColorNo from BS_Cloth_Info_Sub where BCIID=''' + Trim(FBCIID) + '''');
+        SQL.Add(' group by C_Color,C_ColorNo having count(*)>1');
+        Open;
+      end;
+
+  // 标记重复行
+      while not ADOQueryTemp.Eof do
+      begin
+        CDS_4.First;
+        while not CDS_4.Eof do
+        begin
+          if (Trim(CDS_4.FieldByName('C_Color').AsString) = Trim(ADOQueryTemp.FieldByName('C_Color').AsString)) and (Trim(CDS_4.FieldByName('C_ColorNo').AsString) = Trim(ADOQueryTemp.FieldByName('C_ColorNo').AsString)) then
+          begin
+            CDS_4.Edit;
+            CDS_4.FieldByName('IsRepeat').AsString := '1'; // 标红标记
+            CDS_4.Post;
+          end;
+          CDS_4.Next;
+        end;
+        ADOQueryTemp.Next;
+      end;
+    finally
+      CDS_4.EnableControls;
+    end;
+
+// 第二步：保留你原来的报错抛出（完全不变）
    with ADOQueryTemp do
    begin
      Close;
      sql.Clear;
-      sql.Add('select count(BCISID) as AA from BS_Cloth_Info_Sub where BCIID=''' + Trim(FBCIID) + '''');
-      sql.Add(' group by C_Color,C_ColorNo  having count(BCISID)>1');
+      sql.Add('select count(BCISID) as AA,C_Color,C_ColorNo from BS_Cloth_Info_Sub where BCIID=''' + Trim(FBCIID) + '''');
+      sql.Add(' group by C_Color,C_ColorNo  having count(*)>1');
      Open;
    end;
+    if ADOQueryTemp.Active and not ADOQueryTemp.IsEmpty then
+    begin
      if StrToFloatDef(ADOQueryTemp.fieldbyname('AA').asstring, 1) > 1 then
-      raise Exception.Create('颜色色号重复!');
+      begin
+        raise Exception.Create('色号重复，已标红');
+      end;
+    end;

    with ADOQueryCmd do
    begin
--- a/A02基础产品管理/U_GetDllForm.pas
+++ b/A02基础产品管理/U_GetDllForm.pas
@ -75,7 +75,7 @@ begin
    user := 'rtsa';
    pswd := 'rightsoft@5740';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//   DParameters1:='¸ßÈ¨ÏÞ';
+    Parameters1 := '¹ÜÀí';
 //    Parameters2 := '梭织';
    Parameters2 := '通用';

@ -133,7 +133,7 @@ begin

    191:  //工序管理
      begin
-        with TfrmClothInfoProcessList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmClothInfoProcessList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
@ -145,7 +145,7 @@ begin

    192:  //工艺管理
      begin
-        with TfrmClothInfoTechnicsList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmClothInfoTechnicsList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
@ -157,7 +157,7 @@ begin

    111:  // 产品类别
      begin
-        with TfrmClothType.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmClothType.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
@ -169,7 +169,7 @@ begin

    112:  // 成品信息管理
      begin
-        with TfrmClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          WindowState := mstate;
@ -179,7 +179,7 @@ begin

    122:  // 坯布信息管理
      begin
-        with TfrmTatClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmTatClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
@ -191,7 +191,7 @@ begin

    132:  // 针织产品信息管理
      begin
-        with TfrmKnitClothInfoList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmKnitClothInfoList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
--- a/A02基础产品管理/U_SelectQtyUnit.dfm
+++ b/A02基础产品管理/U_SelectQtyUnit.dfm
@ -25,7 +25,7 @@ inherited frmSelectQtyUnit: TfrmSelectQtyUnit
    Items.Strings = (
      'M'
      'Y'
-      'Kg'
+      'KG'
      #20214
      #21452
      #24352
--- a/A02基础产品管理/testDll.res
+++ b/A02基础产品管理/testDll.res
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@ -80,7 +80,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>E:\rtgit\trade\D10xhGemei\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\A09财务通用管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/A09财务通用管理/U_CollectInput.dfm
+++ b/A09财务通用管理/U_CollectInput.dfm
@ -65,6 +65,7 @@ object frmCollectInput: TfrmCollectInput
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 1
+    ExplicitTop = 36
    object Label18: TLabel
      Left = 37
      Top = 61
@ -144,7 +145,7 @@ object frmCollectInput: TfrmCollectInput
    end
    object Label7: TLabel
      Left = 37
-      Top = 200
+      Top = 229
      Width = 62
      Height = 21
      Caption = #22791'      '#27880
@ -170,6 +171,20 @@ object frmCollectInput: TfrmCollectInput
      Height = 21
      Caption = #21457#31080#21495
    end
+    object Label6: TLabel
+      Left = 38
+      Top = 193
+      Width = 62
+      Height = 21
+      Caption = #35843'      '#22686
+    end
+    object Label10: TLabel
+      Left = 276
+      Top = 192
+      Width = 62
+      Height = 21
+      Caption = #35843'      '#20943
+    end
    object OurCoName: TcxButtonEdit
      Left = 107
      Top = 11
@ -335,7 +350,7 @@ object frmCollectInput: TfrmCollectInput
    end
    object Note: TcxMemo
      Left = 107
-      Top = 199
+      Top = 228
      TabOrder = 12
      Height = 127
      Width = 886
@ -371,13 +386,27 @@ object frmCollectInput: TfrmCollectInput
          Default = True
          Kind = bkEllipsis
        end>
-      Properties.ReadOnly = True
+      Properties.ReadOnly = False
      Properties.OnButtonClick = cxButtonEdit1PropertiesButtonClick
      Style.ButtonStyle = btsDefault
      TabOrder = 15
      OnDblClick = OurCoNameDblClick
      Width = 395
    end
+    object ADDMONEY: TcxCurrencyEdit
+      Left = 107
+      Top = 189
+      Properties.AssignedValues.DisplayFormat = True
+      TabOrder = 16
+      Width = 84
+    end
+    object Deduction: TcxCurrencyEdit
+      Left = 345
+      Top = 188
+      Properties.AssignedValues.DisplayFormat = True
+      TabOrder = 17
+      Width = 84
+    end
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
--- a/A09财务通用管理/U_CollectInput.pas
+++ b/A09财务通用管理/U_CollectInput.pas
@ -57,6 +57,10 @@ type
    ReconciliationDate: TcxDateEdit;
    Label4: TLabel;
    IVNo: TcxButtonEdit;
+    Label6: TLabel;
+    ADDMONEY: TcxCurrencyEdit;
+    Label10: TLabel;
+    Deduction: TcxCurrencyEdit;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
--- a/A09财务通用管理/U_CollectList.dfm
+++ b/A09财务通用管理/U_CollectList.dfm
@ -7,6 +7,7 @@ inherited frmCollectList: TfrmCollectList
  Font.Height = -16
  FormStyle = fsMDIChild
  Visible = True
+  ExplicitLeft = -435
  ExplicitWidth = 1641
  ExplicitHeight = 629
  PixelsPerInch = 96
@ -82,6 +83,7 @@ inherited frmCollectList: TfrmCollectList
      AutoSize = True
      Caption = #25552#20132
      ImageIndex = 12
+      Visible = False
      OnClick = btnTJClick
    end
    object btnCXTJ: TToolButton
@ -90,6 +92,7 @@ inherited frmCollectList: TfrmCollectList
      AutoSize = True
      Caption = #25764#38144#25552#20132
      ImageIndex = 11
+      Visible = False
      OnClick = btnCXTJClick
    end
    object btnChk: TToolButton
@ -307,6 +310,7 @@ inherited frmCollectList: TfrmCollectList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
+    ExplicitTop = 185
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -519,6 +523,20 @@ inherited frmCollectList: TfrmCollectList
        Options.Editing = False
        Width = 82
      end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'addmoney'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column13: TcxGridDBColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv1
@ -535,7 +553,6 @@ inherited frmCollectList: TfrmCollectList
    Properties.Style = 9
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
-      #26410#25552#20132
      #24453#23457#26680
      #24050#23457#26680
      #20840#37096)
--- a/A09财务通用管理/U_CollectList.pas
+++ b/A09财务通用管理/U_CollectList.pas
@ -88,6 +88,8 @@ type
    btnTJ: TToolButton;
    btnCXTJ: TToolButton;
    Tv1Column11: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -156,16 +158,16 @@ begin
        begin
          btnEdit.Enabled := true;
          btnDel.Enabled := true;
-          btnTJ.Enabled := true;
+          btnChk.Enabled := true;
        end;
      1:
        begin
-          btnCXTJ.Enabled := true;
-          btnChk.Enabled := true;
+          btnReChk.Enabled := true;
+
        end;
      2:
        begin
-          btnReChk.Enabled := true;
+
        end;
      3:
        begin
@ -202,13 +204,10 @@ begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' ';
      end;
    1:
-      begin
-        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' ';
-      end;
-    2:
      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');
--- a/A09财务通用管理/U_CustStatement.dfm
+++ b/A09财务通用管理/U_CustStatement.dfm
@ -117,6 +117,7 @@ inherited frmCustStatement: TfrmCustStatement
      Left = 115
      Top = 54
      TabOrder = 0
+      OnKeyPress = OppCoNameKeyPress
      Width = 265
    end
    inline frmFrameDateSel1: TfrmFrameDateSel
@ -242,6 +243,14 @@ inherited frmCustStatement: TfrmCustStatement
        item
          Kind = skSum
          Column = Tv2Column2
+        end
+        item
+          Kind = skSum
+          Column = Tv2Column3
+        end
+        item
+          Kind = skSum
+          Column = Tv2Column4
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -323,6 +332,20 @@ inherited frmCustStatement: TfrmCustStatement
        Options.Editing = False
        Width = 77
      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'BQaddmoney'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'BQDeduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv2
@ -335,9 +358,10 @@ inherited frmCustStatement: TfrmCustStatement
    Height = 29
    Align = alTop
    TabOrder = 3
+    Visible = False
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
    Properties.Tabs.Strings = (
      '             $              '
      '            '#65509'             '
--- a/A09财务通用管理/U_CustStatement.pas
+++ b/A09财务通用管理/U_CustStatement.pas
@ -51,6 +51,8 @@ type
    ToolButton5: TToolButton;
    ToolButton6: TToolButton;
    frmFrameDateSel1: TfrmFrameDateSel;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column4: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -65,6 +67,7 @@ type
    procedure ToolButton5Click(Sender: TObject);
    procedure ToolButton6Click(Sender: TObject);
    procedure FormCreate(Sender: TObject);
+    procedure OppCoNameKeyPress(Sender: TObject; var Key: Char);
  private
    { Private declarations }
    FAuthority, canshu4: string;
@ -113,6 +116,9 @@ begin
      if FAuthority = '低权限' then
        sql.Add(' ,@DCode=' + QuotedStr(Trim(DCode)));

+      sql.Add(' ,@store=' + QuotedStr(Trim(CANSHU4)));
+
+//      ShowMessage(sql.Text);
      Open;
    end;
    SCreateCDS(ADOQueryMain, CDS_HZ);
@ -156,6 +162,7 @@ begin
  ReadCxGrid(trim(self.Caption), Tv2, '财务管理');
  frmFrameDateSel1.Enddate.Date := SGetServerDate(ADOQueryTemp);
  frmFrameDateSel1.begdate.Date := StartOfTheMonth(frmFrameDateSel1.Enddate.Date);
+  canshu4 := Trim(Self.fParameters4);
  InitGrid();
 end;

@ -187,6 +194,14 @@ begin
  ToolButton2.Click;
 end;

+procedure TfrmCustStatement.OppCoNameKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #13 then
+  begin
+    InitGrid();
+  end;
+end;
+
 procedure TfrmCustStatement.ToolButton3Click(Sender: TObject);
 begin
  if CDS_HZ.IsEmpty then
--- a/A09财务通用管理/U_DataLink.dfm
+++ b/A09财务通用管理/U_DataLink.dfm
@ -8,7 +8,6 @@ inherited DataLink_Financial: TDataLink_Financial
    StyleDisabled.LookAndFeel.SkinName = ''
    StyleFocused.LookAndFeel.SkinName = ''
    StyleHot.LookAndFeel.SkinName = ''
-    StyleReadOnly.LookAndFeel.SkinName = ''
    PixelsPerInch = 96
  end
  inherited cxImageList_bar: TcxImageList
--- a/A09财务通用管理/U_FtyStatement.dfm
+++ b/A09财务通用管理/U_FtyStatement.dfm
@ -19,7 +19,7 @@ inherited frmFtyStatement: TfrmFtyStatement
    Height = 30
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 95
+    ButtonWidth = 115
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_Financial.ImageList_new32
@ -37,7 +37,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
-      Left = 63
+      Left = 71
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -45,7 +45,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton2Click
    end
    object ToolButton3: TToolButton
-      Left = 126
+      Left = 142
      Top = 0
      AutoSize = True
      Caption = #26597#30475#23545#36134#21333
@ -53,7 +53,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton3Click
    end
    object ToolButton4: TToolButton
-      Left = 225
+      Left = 261
      Top = 0
      AutoSize = True
      Caption = #24212#20184#27454#27719#24635
@ -61,7 +61,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton4Click
    end
    object ToolButton5: TToolButton
-      Left = 324
+      Left = 380
      Top = 0
      AutoSize = True
      Caption = #24212#20184#26126#32454#21333
@ -69,7 +69,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton5Click
    end
    object ToolButton6: TToolButton
-      Left = 423
+      Left = 499
      Top = 0
      AutoSize = True
      Caption = #26356#26032#25968#25454
@ -77,7 +77,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton6Click
    end
    object ToolButton1: TToolButton
-      Left = 510
+      Left = 602
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -85,7 +85,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 597
+      Left = 705
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -93,7 +93,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      OnClick = TBCloseClick
    end
    object ToolButton7: TToolButton
-      Left = 660
+      Left = 776
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -112,7 +112,6 @@ inherited frmFtyStatement: TfrmFtyStatement
    Color = clWhite
    ParentBackground = False
    TabOrder = 5
-    ExplicitWidth = 304
    object Label3: TLabel
      Left = 20
      Top = 51
@ -145,7 +144,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      TabOrder = 1
      ExplicitLeft = 2
      ExplicitTop = 2
-      ExplicitWidth = 300
+      ExplicitWidth = 1243
      ExplicitHeight = 37
      inherited lbl2: TLabel
        Width = 16
@ -163,6 +162,7 @@ inherited frmFtyStatement: TfrmFtyStatement
    Align = alClient
    PopupMenu = PM_1
    TabOrder = 2
+    ExplicitTop = 148
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -342,6 +342,20 @@ inherited frmFtyStatement: TfrmFtyStatement
        HeaderAlignmentHorz = taCenter
        Width = 77
      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'BQaddmoney'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'BQDeduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv2
@ -354,9 +368,10 @@ inherited frmFtyStatement: TfrmFtyStatement
    Height = 29
    Align = alTop
    TabOrder = 3
+    Visible = False
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
    Properties.Tabs.Strings = (
      '             $              '
      '            '#65509'             '
--- a/A09财务通用管理/U_FtyStatement.pas
+++ b/A09财务通用管理/U_FtyStatement.pas
@ -58,6 +58,8 @@ type
    ToolButton6: TToolButton;
    frmFrameDateSel1: TfrmFrameDateSel;
    ToolButton7: TToolButton;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column4: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
--- a/A09财务通用管理/U_GetDllForm.pas
+++ b/A09财务通用管理/U_GetDllForm.pas
@ -83,7 +83,7 @@ begin
 //    Parameters1 := '完成';
 //    Parameters1 := '录入';
    DCode := '005';
-    Parameters4 := '新余';
+    Parameters4 := '';
    DName := 'ADMIN';
  end
  else
--- a/A09财务通用管理/U_InvoiceOutList.dfm
+++ b/A09财务通用管理/U_InvoiceOutList.dfm
@ -235,12 +235,11 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      ExplicitTop = 2
      ExplicitWidth = 1554
      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
--- a/A09财务通用管理/U_PayInput.dfm
+++ b/A09财务通用管理/U_PayInput.dfm
@ -65,6 +65,7 @@ object frmPayInput: TfrmPayInput
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 1
+    ExplicitTop = 36
    object Label18: TLabel
      Left = 41
      Top = 61
@ -144,7 +145,7 @@ object frmPayInput: TfrmPayInput
    end
    object Label7: TLabel
      Left = 41
-      Top = 200
+      Top = 234
      Width = 62
      Height = 21
      Caption = #22791'      '#27880
@ -170,6 +171,20 @@ object frmPayInput: TfrmPayInput
      Height = 21
      Caption = #23545#36134#26085#26399
    end
+    object Label6: TLabel
+      Left = 38
+      Top = 193
+      Width = 62
+      Height = 21
+      Caption = #35843'      '#22686
+    end
+    object Label10: TLabel
+      Left = 276
+      Top = 192
+      Width = 62
+      Height = 21
+      Caption = #35843'      '#20943
+    end
    object OurCoName: TcxButtonEdit
      Left = 108
      Top = 11
@ -347,7 +362,7 @@ object frmPayInput: TfrmPayInput
    end
    object Note: TcxMemo
      Left = 107
-      Top = 199
+      Top = 233
      ParentColor = True
      TabOrder = 12
      Height = 127
@ -395,6 +410,20 @@ object frmPayInput: TfrmPayInput
      TabOrder = 15
      Width = 151
    end
+    object ADDMONEY: TcxCurrencyEdit
+      Left = 107
+      Top = 189
+      Properties.AssignedValues.DisplayFormat = True
+      TabOrder = 16
+      Width = 84
+    end
+    object Deduction: TcxCurrencyEdit
+      Left = 345
+      Top = 188
+      Properties.AssignedValues.DisplayFormat = True
+      TabOrder = 17
+      Width = 84
+    end
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
--- a/A09财务通用管理/U_PayInput.pas
+++ b/A09财务通用管理/U_PayInput.pas
@ -57,6 +57,10 @@ type
    CollectHeader: TcxButtonEdit;
    Label25: TLabel;
    ReconciliationDate: TcxDateEdit;
+    Label6: TLabel;
+    ADDMONEY: TcxCurrencyEdit;
+    Label10: TLabel;
+    Deduction: TcxCurrencyEdit;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
--- a/A09财务通用管理/U_PayList.dfm
+++ b/A09财务通用管理/U_PayList.dfm
@ -7,6 +7,7 @@ inherited frmPayList: TfrmPayList
  Font.Height = -16
  FormStyle = fsMDIChild
  Visible = True
+  ExplicitLeft = -25
  ExplicitWidth = 1556
  ExplicitHeight = 629
  PixelsPerInch = 96
@ -74,6 +75,7 @@ inherited frmPayList: TfrmPayList
      AutoSize = True
      Caption = #25552#20132
      ImageIndex = 12
+      Visible = False
      OnClick = btnTJClick
    end
    object btnCXTJ: TToolButton
@ -160,7 +162,6 @@ inherited frmPayList: TfrmPayList
    Color = clWhite
    ParentBackground = False
    TabOrder = 5
-    ExplicitWidth = 304
    object Label3: TLabel
      Left = 28
      Top = 48
@ -269,7 +270,7 @@ inherited frmPayList: TfrmPayList
      TabOrder = 6
      ExplicitLeft = 2
      ExplicitTop = 2
-      ExplicitWidth = 300
+      ExplicitWidth = 1536
      ExplicitHeight = 37
      inherited lbl2: TLabel
        Width = 16
@ -287,6 +288,7 @@ inherited frmPayList: TfrmPayList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
+    ExplicitTop = 185
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -473,6 +475,20 @@ inherited frmPayList: TfrmPayList
        Options.Editing = False
        Width = 57
      end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'addmoney'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv1
@ -489,7 +505,6 @@ inherited frmPayList: TfrmPayList
    Properties.Style = 9
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
-      #26410#25552#20132
      #24453#23457#26680
      #24050#23457#26680
      #20840#37096)
--- a/A09财务通用管理/U_PayList.pas
+++ b/A09财务通用管理/U_PayList.pas
@ -83,6 +83,8 @@ type
    Tv1Column8: TcxGridDBColumn;
    btnTJ: TToolButton;
    btnCXTJ: TToolButton;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -139,16 +141,16 @@ begin
        begin
          btnEdit.Enabled := true;
          btnDel.Enabled := true;
-          btnTJ.Enabled := true;
+          btnChk.Enabled := true;
        end;
      1:
        begin
-          btnCXTJ.Enabled := true;
-          btnChk.Enabled := true;
+          btnReChk.Enabled := true;
+
        end;
      2:
        begin
-          btnReChk.Enabled := true;
+
        end;
      3:
        begin
@ -177,13 +179,10 @@ begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' ';
      end;
    1:
-      begin
-        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' ';
-      end;
-    2:
      begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' ';
      end;
+
  end;

  InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
--- a/A09财务通用管理/U_PayableList.dfm
+++ b/A09财务通用管理/U_PayableList.dfm
@ -82,6 +82,7 @@ inherited frmPayableList: TfrmPayableList
      AutoSize = True
      Caption = #25552#20132
      ImageIndex = 12
+      Visible = False
      OnClick = btnTJClick
    end
    object btnCXTJ: TToolButton
@ -90,6 +91,7 @@ inherited frmPayableList: TfrmPayableList
      AutoSize = True
      Caption = #25764#38144#25552#20132
      ImageIndex = 11
+      Visible = False
      OnClick = btnCXTJClick
    end
    object btnChk: TToolButton
@ -160,7 +162,6 @@ inherited frmPayableList: TfrmPayableList
    Color = clWhite
    ParentBackground = False
    TabOrder = 5
-    ExplicitWidth = 304
    object Label3: TLabel
      Left = 26
      Top = 50
@ -274,7 +275,7 @@ inherited frmPayableList: TfrmPayableList
      TabOrder = 6
      ExplicitLeft = 2
      ExplicitTop = 2
-      ExplicitWidth = 300
+      ExplicitWidth = 1621
      ExplicitHeight = 37
      inherited lbl2: TLabel
        Width = 16
@ -669,7 +670,6 @@ inherited frmPayableList: TfrmPayableList
    Properties.Style = 9
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
-      #26410#25552#20132
      #24453#23457#26680
      #24050#23457#26680
      #20840#37096)
--- a/A09财务通用管理/U_PayableList.pas
+++ b/A09财务通用管理/U_PayableList.pas
@ -165,17 +165,16 @@ begin
        begin
          btnEdit.Enabled := true;
          btnDel.Enabled := true;
-          btnTJ.Enabled := true;
+          btnChk.Enabled := true;
        end;
      1:
        begin
-          btnCXTJ.Enabled := true;
-          btnChk.Enabled := true;
+          btnReChk.Enabled := true;
+          btnDJXG.Enabled := true;
        end;
      2:
        begin
-          btnReChk.Enabled := true;
-          btnDJXG.Enabled := true;
+
        end;
      3:
        begin
@ -204,13 +203,10 @@ begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' ';
      end;
    1:
-      begin
-        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' ';
-      end;
-    2:
      begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' ';
      end;
+
  end;

  InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
--- a/A09财务通用管理/U_ReceivableInput.dfm
+++ b/A09财务通用管理/U_ReceivableInput.dfm
@ -60,12 +60,14 @@ object frmReceivableInput: TfrmReceivableInput
    Height = 447
    Width = 1353
    object cxGrid1: TcxGrid
-      Left = 4
-      Top = 23
-      Width = 1345
-      Height = 408
+      Left = 2
+      Top = 26
+      Width = 1349
+      Height = 419
      Align = alClient
      TabOrder = 0
+      ExplicitLeft = -22
+      ExplicitTop = 48
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
@ -77,10 +79,27 @@ object frmReceivableInput: TfrmReceivableInput
        OptionsView.Indicator = True
        OptionsView.IndicatorWidth = 50
        OnCustomDrawIndicatorCell = Tv1CustomDrawIndicatorCell
+        object Tv1Column4: TcxGridDBColumn
+          Caption = #20135#21697#32534#21495
+          DataBinding.FieldName = 'F_CODE'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 81
+        end
        object Tv1Column1: TcxGridDBColumn
          Caption = #33394#24067#21517#31216
          DataBinding.FieldName = 'F_Name'
          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxLookupComboBoxProperties'
+          Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
+          Properties.KeyFieldNames = 'c_NAME'
+          Properties.ListColumns = <
+            item
+              FieldName = 'C_name'
+            end>
+          Properties.ListOptions.ShowHeader = False
+          Properties.ListSource = DS_PM
+          Properties.OnEditValueChanged = Tv1Column1PropertiesEditValueChanged
          HeaderAlignmentHorz = taCenter
          Width = 94
        end
@ -88,8 +107,21 @@ object frmReceivableInput: TfrmReceivableInput
          Caption = #33394#21495
          DataBinding.FieldName = 'F_ColorNo'
          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxLookupComboBoxProperties'
+          Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
+          Properties.KeyFieldNames = 'C_ColorNo'
+          Properties.ListColumns = <
+            item
+              FieldName = 'C_ColorNo'
+            end
+            item
+              FieldName = 'C_Color'
+            end>
+          Properties.ListOptions.ShowHeader = False
+          Properties.ListSource = DS_YS
+          Properties.OnEditValueChanged = Tv1Column2PropertiesEditValueChanged
          HeaderAlignmentHorz = taCenter
-          Width = 70
+          Width = 127
        end
        object Tv1Column3: TcxGridDBColumn
          Caption = #39068#33394
@ -286,6 +318,7 @@ object frmReceivableInput: TfrmReceivableInput
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 3
+    ExplicitTop = 36
    object Label2: TLabel
      Left = 262
      Top = 15
@ -293,13 +326,6 @@ object frmReceivableInput: TfrmReceivableInput
      Height = 21
      Caption = #23545#26041#21333#20301
    end
-    object Label6: TLabel
-      Left = 28
-      Top = 100
-      Width = 62
-      Height = 21
-      Caption = #32534'      '#21495
-    end
    object Label7: TLabel
      Left = 27
      Top = 143
@ -357,8 +383,8 @@ object frmReceivableInput: TfrmReceivableInput
      Caption = #25688'      '#35201
    end
    object Label18: TLabel
-      Left = 263
-      Top = 99
+      Left = 25
+      Top = 102
      Width = 64
      Height = 21
      Caption = #26159#21542#21547#31246
@ -493,15 +519,15 @@ object frmReceivableInput: TfrmReceivableInput
      Width = 151
    end
    object IsInvoice: TcxComboBox
-      Left = 337
-      Top = 95
+      Left = 99
+      Top = 98
      Properties.DropDownListStyle = lsEditFixedList
      Properties.Items.Strings = (
        #26159
        #21542)
      TabOrder = 8
      Text = #26159
-      Width = 159
+      Width = 151
    end
    object Note: TcxMemo
      Left = 95
@ -517,26 +543,11 @@ object frmReceivableInput: TfrmReceivableInput
      TabOrder = 10
      Width = 151
    end
-    object F_Code: TcxButtonEdit
-      Left = 99
-      Top = 96
-      Properties.Buttons = <
-        item
-          Default = True
-          Kind = bkEllipsis
-        end>
-      Properties.ReadOnly = True
-      Properties.OnButtonClick = F_CodePropertiesButtonClick
-      Style.ButtonStyle = btsDefault
-      TabOrder = 11
-      OnDblClick = OurCoNameDblClick
-      Width = 151
-    end
    object ExchangeRate: TcxCurrencyEdit
      Left = 1074
      Top = 53
      Properties.AssignedValues.DisplayFormat = True
-      TabOrder = 12
+      TabOrder = 11
      Width = 150
    end
  end
@ -544,8 +555,8 @@ object frmReceivableInput: TfrmReceivableInput
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 648
-    Top = 321
+    Left = 643
+    Top = 454
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_Financial.ADOLink
@ -557,14 +568,14 @@ object frmReceivableInput: TfrmReceivableInput
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 580
-    Top = 321
+    Left = 586
+    Top = 453
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 716
-    Top = 321
+    Left = 733
+    Top = 399
  end
  object DS_1: TDataSource
    DataSet = CDS_1
@ -588,4 +599,40 @@ object frmReceivableInput: TfrmReceivableInput
    Left = 920
    Top = 518
  end
+  object DS_YS: TDataSource
+    DataSet = ADO_YS
+    Left = 355
+    Top = 660
+  end
+  object DS_PM: TDataSource
+    DataSet = ADO_PM
+    Left = 601
+    Top = 598
+  end
+  object ADO_PM: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 273
+    Top = 476
+  end
+  object ADO_YS: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 437
+    Top = 475
+  end
+  object DS_DanWei: TDataSource
+    DataSet = ADO_DanWei
+    Left = 452
+    Top = 671
+  end
+  object ADO_DanWei: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 534
+    Top = 486
+  end
 end
--- a/A09财务通用管理/U_ReceivableInput.pas
+++ b/A09财务通用管理/U_ReceivableInput.pas
@ -15,7 +15,8 @@ uses
  cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer,
  cxCurrencyEdit, dxCore, cxDateUtils, cxMemo, dxSkinsCore,
-  dxSkinsDefaultPainters, dxScrollbarAnnotations, cxGroupBox, dxCoreGraphics;
+  dxSkinsDefaultPainters, dxScrollbarAnnotations, cxGroupBox, dxCoreGraphics,
+  cxDBLookupComboBox;

 type
  TfrmReceivableInput = class(TForm)
@ -55,7 +56,6 @@ type
    Tv1Column28: TcxGridDBColumn;
    ScrollBox1: TScrollBox;
    Label2: TLabel;
-    Label6: TLabel;
    Label7: TLabel;
    Label8: TLabel;
    Label5: TLabel;
@ -78,11 +78,17 @@ type
    IsInvoice: TcxComboBox;
    Note: TcxMemo;
    ReconciliationDate: TcxDateEdit;
-    F_Code: TcxButtonEdit;
    ExchangeRate: TcxCurrencyEdit;
    CDS_2: TClientDataSet;
    DS_2: TDataSource;
    ADO2: TADOQuery;
+    Tv1Column4: TcxGridDBColumn;
+    DS_YS: TDataSource;
+    DS_PM: TDataSource;
+    ADO_PM: TADOQuery;
+    ADO_YS: TADOQuery;
+    DS_DanWei: TDataSource;
+    ADO_DanWei: TADOQuery;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -102,12 +108,13 @@ type
    procedure ConNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure FFAbstractPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure F_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure ToolButton1Click(Sender: TObject);
    procedure ToolButton2Click(Sender: TObject);
    procedure v1QtyPropertiesEditValueChanged(Sender: TObject);
    procedure Tv1CustomDrawIndicatorCell(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxCustomGridIndicatorItemViewInfo; var ADone: Boolean);
    procedure ConNoPropertiesChange(Sender: TObject);
+    procedure Tv1Column1PropertiesEditValueChanged(Sender: TObject);
+    procedure Tv1Column2PropertiesEditValueChanged(Sender: TObject);
  private
    { Private declarations }
    procedure InitGrid();
@ -161,8 +168,8 @@ begin
      Filtered := False;
      Close;
      SQL.Clear;
-//      sql.Add(' select * from Finance_Flow where FFID=''' + Trim(FFFID) + '''');
-      sql.Add(' select * from Finance_Flow where FromID1=''' + Trim(FFFID) + '''');
+      sql.Add(' select * from Finance_Flow where ISNULL(FROMID1,FFID)=''' + Trim(FFFID) + '''');
+//      sql.Add(' select * from Finance_Flow where FromID1=''' + Trim(FFFID) + '''');
      Open;
    end;
    SCreateCDS(ADOQueryMain, CDS_1);
@ -194,7 +201,7 @@ begin
    with frmCompanySel do
    begin
      FCoType := '客户';
-
+      CANSHU4 := Self.canshu4;
      if self.FAuthority = '低权限' then
        FAuthority := '理单业务';

@ -265,7 +272,7 @@ begin

          self.ConNo.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('ConNo').AsString);
          self.OrderNo.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('OrderNo').AsString);
-          self.F_Code.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('C_Code').AsString);
+//          self.F_Code.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('C_Code').AsString);
          self.OppCoName.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('CustName').AsString);
           //  多选指示单信息
          First;
@ -276,6 +283,8 @@ begin
              Append;
              Self.CDS_1.FieldByName('QtyUnit').AsString := frmFinTradePlanSel.CDS_1.FieldByName('OrdUnit').AsString;
              Self.CDS_1.FieldByName('F_Name').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_Name').AsString;
+
+              Self.CDS_1.FieldByName('F_code').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_code').AsString;
              Self.CDS_1.FieldByName('F_ColorNo').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_ColorNo').AsString;
              Self.CDS_1.FieldByName('F_Color').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_Color').AsString;
              Self.CDS_1.FieldByName('Price').AsString := frmFinTradePlanSel.CDS_1.FieldByName('ProcessingPrice').AsString;
@ -422,8 +431,8 @@ begin
        with frmFinTradePlanSel.CDS_1 do
        begin
          self.ConNo.Text := Trim(frmFinTradeSalesContractSel.CDS_1.fieldbyname('ConNo').AsString);
-          self.F_Code.Text := Trim(frmFinTradeSalesContractSel.CDS_1.fieldbyname('C_Code').AsString);
-
+//          self.F_Code.Text := Trim(frmFinTradeSalesContractSel.CDS_1.fieldbyname('C_Code').AsString);
+          Fieldbyname('F_code').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_code').AsString);
          Fieldbyname('F_Name').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Name').AsString);
          Fieldbyname('F_Pattern').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Pattern').AsString);
          Fieldbyname('F_ColorNo').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_ColorNo').AsString);
@ -516,42 +525,44 @@ begin
    begin
      Close;
      SQL.Clear;
-      sql.Add(' select top 1 * from BS_Company where CoType=''ÎÒË¾''  order by CoCode ');
+      sql.Add(' select top 1 * from BS_Company where CoType=''ÎÒË¾'' AND VALID=''Y''  order by CoCode ');
      Open;
    end;
    OurCoName.Text := Trim(ADOQueryTemp.fieldbyname('CoAbbrName').AsString);
    OurCoName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('CoCode').AsString);
  end;
  InitGrid();
+
+  with ADO_PM do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT distinct A.C_Code,A.C_Name,A.qtyunit,A.HotQty,StkQty = SUM(B.StkQty) ');
+    SQL.ADD(' FROM Bs_Cloth_Info A  LEFT JOIN Bs_Cloth_Io B on A.C_Code=B.C_Code');
+    sql.add(' where B.ioflag=''Èë¿â'' ');
+    if Trim(canshu4) = 'ÐÂÓà' then
+      sql.Add(' and isnull(STKNAME,'''')=''ÐÂÓà'' ');
+    SQL.add('group by A.C_Code,A.C_Name,A.qtyunit,A.HotQty');
+    SQL.ADD('order by  A.C_Code ');
+//    showmessage(SQL.text);
+    Open;
+  end;
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT distinct A.C_Code,B.C_Color,B.C_ColorNo,B.referencePrice AS Price  FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+    sql.Add(' where  1=2  ');
+    Open;
  end;

-procedure TfrmReceivableInput.F_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+  with ADO_DanWei do
  begin
-  try
-    frmClothInfoSel := TfrmClothInfoSel.Create(Application);
-    with frmClothInfoSel do
-    begin
-      FCTType := 'Í¨ÓÃ';
-      if ShowModal = 1 then
-      begin
-        with frmFinTradePlanSel.CDS_1 do
-        begin
-
-          self.F_Code.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('C_Code').AsString);
-
-          Fieldbyname('F_Name').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Name').AsString);
-          Fieldbyname('F_Pattern').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Pattern').AsString);
-          Fieldbyname('F_ColorNo').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_ColorNo').AsString);
-          Fieldbyname('F_Width').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Width').AsString);
-          Fieldbyname('F_GramWeight').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_GramWeight').AsString);
-          Fieldbyname('F_Color').value := trim(frmFinTradePlanSel.CDS_1.Fieldbyname('F_Color').AsString);
-
-        end;
-
-      end;
-    end;
-  finally
-    frmClothInfoSel.Free;
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT distinct A.C_Code,B.CICUnit  FROM  Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient B on A.BCIID=B.BCIID ');
+    sql.Add(' where 2=1  ');
+    Open;
  end;
 end;

@ -698,6 +709,72 @@ begin
  end;
 end;

+procedure TfrmReceivableInput.Tv1Column1PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+begin
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+  mvalue := TcxTextEdit(Sender).EditingText;
+
+  with CDS_1 do
+  begin
+
+    Edit;
+    FieldByName(FFieldName).Value := Trim(mvalue);
+    Post;
+    ADO_PM.Locate('C_Name', mvalue, []);
+    Edit;
+    FieldByName('F_Code').Value := ADO_PM.FieldByName('C_Code').Value;
+    FieldByName('QtyUnit').Value := ADO_PM.FieldByName('qtyunit').Value;
+
+    Post;
+  end;
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT DISTINCT A.C_Code,B.C_Color,B.C_ColorNo,B.referencePrice AS Price FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+    sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('F_Code').AsString));
+    SQL.ADD(' order by B.C_ColorNo');
+         //ShowMessage(sql.text);
+    Open;
+  end;
+end;
+
+procedure TfrmReceivableInput.Tv1Column2PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+  FIncludeTax: Double;
+begin
+  with ADOQueryTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select isnull(IncludeTax,0)IncludeTax from Bs_Company a    ');
+    sql.Add('where CoCode=' + QuotedStr(OppCoName.Properties.LookupItems.Text));
+    open;
+  end;
+
+  FIncludeTax := ADOQueryTemp.Fieldbyname('IncludeTax').asfloat;
+
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+  mvalue := TcxTextEdit(Sender).EditingText;
+
+  with CDS_1 do
+  begin
+    Edit;
+    FieldByName(FFieldName).Value := Trim(mvalue);
+    Post;
+    ADO_YS.Locate('C_ColorNo', mvalue, []);
+    Edit;
+    FieldByName('F_Color').Value := ADO_YS.FieldByName('C_Color').Value;
+    FieldByName('price').Value := ADO_YS.FieldByName('price').Value * (1 + (FIncludeTax / 100));
+    FieldByName('referencePrice').Value := ADO_YS.FieldByName('Price').Value;
+    Post;
+  end;
+
+end;
+
 procedure TfrmReceivableInput.Tv1CustomDrawIndicatorCell(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxCustomGridIndicatorItemViewInfo; var ADone: Boolean);
 var
  FValue: string;
--- a/A09财务通用管理/U_ReceivableList.dfm
+++ b/A09财务通用管理/U_ReceivableList.dfm
@ -82,6 +82,7 @@ inherited frmReceivableList: TfrmReceivableList
      AutoSize = True
      Caption = #25552#20132
      ImageIndex = 12
+      Visible = False
      OnClick = btnTJClick
    end
    object btnCXTJ: TToolButton
@ -90,6 +91,7 @@ inherited frmReceivableList: TfrmReceivableList
      AutoSize = True
      Caption = #25764#38144#25552#20132
      ImageIndex = 11
+      Visible = False
      OnClick = btnCXTJClick
    end
    object btnChk: TToolButton
@ -517,6 +519,13 @@ inherited frmReceivableList: TfrmReceivableList
        Options.Editing = False
        Width = 66
      end
+      object Tv1Column42: TcxGridDBColumn
+        Caption = #19994#21153#21592
+        DataBinding.FieldName = 'saleser2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
      object Tv1Column31: TcxGridDBColumn
        Caption = #32568#21495
        DataBinding.FieldName = 'F_BatchNO'
@ -722,7 +731,6 @@ inherited frmReceivableList: TfrmReceivableList
    Properties.Style = 9
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
-      #26410#25552#20132
      #24453#23457#26680
      #24050#23457#26680
      #20840#37096)
--- a/A09财务通用管理/U_ReceivableList.pas
+++ b/A09财务通用管理/U_ReceivableList.pas
@ -113,6 +113,7 @@ type
    btnCXTJ: TToolButton;
    Tv1Column40: TcxGridDBColumn;
    Tv1Column41: TcxGridDBColumn;
+    Tv1Column42: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -173,18 +174,19 @@ begin
        begin
          btnEdit.Enabled := true;
          btnDel.Enabled := true;
-          btnTJ.Enabled := true;
+
          btnDJXG.Enabled := true;
+          btnChk.Enabled := true;
        end;
      1:
        begin
-          btnCXTJ.Enabled := true;
-          btnChk.Enabled := true;
+          btnReChk.Enabled := true;
+          btnDJXG.Enabled := true;
+
        end;
      2:
        begin
-          btnReChk.Enabled := true;
-          btnDJXG.Enabled := true;
+
        end;
      3:
        begin
@ -201,7 +203,7 @@ var
  SqlStr: string;
 begin

-  SqlStr := '  select A.*,B.Tallyer,B.CoAbbrName ';
+  SqlStr := '  select A.*,B.Tallyer,B.CoAbbrName,saleser2=Saleser ';
  SqlStr := SqlStr + ',FJFlag=CAST((CASE WHEN (SELECT COUNT(X.FileName) FROM FJ_File X where X.TFType=''²ÆÎñÁ÷Ë®'' and X.WBID=A.FFID)>0 THEN 1 ELSE 0 END) AS BIT)';
  SqlStr := SqlStr + ',ConDate=(select top 1 ConDate from Bs_Contract_Main X where X.ConNo=A.ConNo)';
  SqlStr := SqlStr + ',DlyNote=(select top 1 DlyNote from Bs_Contract_Main X where X.ConNo=A.ConNo)';
@ -223,18 +225,15 @@ begin
        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' ';
      end;
    1:
-      begin
-        SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' ';
-      end;
-    2:
      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');

 end;
@ -704,8 +703,17 @@ begin
    with frmReceivableInput do
    begin
      canshu4 := Self.canshu4;
+      if Trim(SELF.CDS_1.fieldbyname('FromID1').AsString) = '' then
+      begin
+        FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
+      end
+      else
+      begin
        FFFID := Trim(SELF.CDS_1.fieldbyname('FromID1').AsString);
-//      FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
+      end;
+
+//      FFFID := Trim(SELF.CDS_1.fieldbyname('FromID1').AsString);
+
      FAuthority := Self.FAuthority;
      if ShowModal = 1 then
      begin
--- a/A09财务通用管理/U_SingleCustStatement.dfm
+++ b/A09财务通用管理/U_SingleCustStatement.dfm
@ -190,7 +190,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
        end
        item
          Caption = #23545#36134#20449#24687
-          Width = 396
+          Width = 483
        end
        item
          Caption = #24320#31080#20449#24687
@ -599,6 +599,26 @@ object frmSingleCustStatement: TfrmSingleCustStatement
        Position.ColIndex = 3
        Position.RowIndex = 0
      end
+      object TV1Column2: TcxGridDBBandedColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'ADDMONEY'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+        Position.BandIndex = 1
+        Position.ColIndex = 3
+        Position.RowIndex = 0
+      end
+      object TV1Column3: TcxGridDBBandedColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+        Position.BandIndex = 1
+        Position.ColIndex = 4
+        Position.RowIndex = 0
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = TV1
--- a/A09财务通用管理/U_SingleCustStatement.pas
+++ b/A09财务通用管理/U_SingleCustStatement.pas
@ -93,6 +93,8 @@ type
    TV1Column9: TcxGridDBBandedColumn;
    TV1Column10: TcxGridDBBandedColumn;
    TV1Column11: TcxGridDBBandedColumn;
+    TV1Column2: TcxGridDBBandedColumn;
+    TV1Column3: TcxGridDBBandedColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
--- a/A09财务通用管理/U_SingleFtyStatement.dfm
+++ b/A09财务通用管理/U_SingleFtyStatement.dfm
@ -237,15 +237,13 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      OptionsData.Editing = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
-      Styles.Header = DataLink_Financial.Default
-      Styles.BandHeader = DataLink_Financial.Default
      Bands = <
        item
          Width = 473
        end
        item
          Caption = #23545#36134#20449#24687
-          Width = 488
+          Width = 542
        end
        item
          Caption = #24320#31080#20449#24687
@ -578,7 +576,7 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        HeaderAlignmentHorz = taCenter
        Width = 72
        Position.BandIndex = 1
-        Position.ColIndex = 3
+        Position.ColIndex = 5
        Position.RowIndex = 0
      end
      object TV1Column3: TcxGridDBBandedColumn
@ -644,6 +642,26 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Position.ColIndex = 5
        Position.RowIndex = 0
      end
+      object TV1Column9: TcxGridDBBandedColumn
+        Caption = #35843#22686
+        DataBinding.FieldName = 'ADDMONEY'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+        Position.BandIndex = 1
+        Position.ColIndex = 3
+        Position.RowIndex = 0
+      end
+      object TV1Column10: TcxGridDBBandedColumn
+        Caption = #35843#20943
+        DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+        Position.BandIndex = 1
+        Position.ColIndex = 4
+        Position.RowIndex = 0
+      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = TV1
--- a/A09财务通用管理/U_SingleFtyStatement.pas
+++ b/A09财务通用管理/U_SingleFtyStatement.pas
@ -97,6 +97,8 @@ type
    TV1Column6: TcxGridDBBandedColumn;
    TV1Column7: TcxGridDBBandedColumn;
    TV1Column8: TcxGridDBBandedColumn;
+    TV1Column9: TcxGridDBBandedColumn;
+    TV1Column10: TcxGridDBBandedColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
--- a/A09财务通用管理/testDll.res
+++ b/A09财务通用管理/testDll.res
--- a/T02贸易汇总仓库/TradeTotalClothStk.dpr
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dpr
@ -37,7 +37,7 @@ uses
  U_TradeFtyClothOutList in 'U_TradeFtyClothOutList.pas' {frmTradeFtyClothOutList},
  U_TradeFtyClothOutEdit in 'U_TradeFtyClothOutEdit.pas' {frmTradeFtyClothOutEdit},
  U_TradeFtyClothStkList in 'U_TradeFtyClothStkList.pas' {frmTradeFtyClothStkList},
-  U_TradeXinYuStkList in 'U_TradeXinYuStkList.pas' {frmTradeXinYuStkList},
+  U_TradeXinYuTHStkList in 'U_TradeXinYuTHStkList.pas' {frmTradeXinYuthStkList},
  U_TradePackClothInList in 'U_TradePackClothInList.pas' {frmTradePackClothInList},
  U_TradePackClothOutList in 'U_TradePackClothOutList.pas' {frmTradePackClothOutList},
  U_TradePackClothStkList in 'U_TradePackClothStkList.pas' {frmTradePackClothStkList},
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj
@ -80,7 +80,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>E:\rtgit\trade\D10xhGemei\T02贸易汇总仓库\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\T02贸易汇总仓库\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -189,8 +189,8 @@
            <Form>frmTradeFtyClothStkList</Form>
            <FormType>dfm</FormType>
        </DCCReference>
-        <DCCReference Include="U_TradeXinYuStkList.pas">
-            <Form>frmTradeXinYuStkList</Form>
+        <DCCReference Include="U_TradeXinYuTHStkList.pas">
+            <Form>frmTradeXinYuthStkList</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_TradePackClothInList.pas">
--- a/T02贸易汇总仓库/U_GetDllForm.pas
+++ b/T02贸易汇总仓库/U_GetDllForm.pas
@ -23,7 +23,9 @@ uses
  U_TradeSampleClothOutList, U_TradeSampleClothStkList, U_ClothPurchaseEnterList,
  U_ClothScheduleList, U_TradeClothTotalStkList, U_TradeClothTotalInList,
  U_TradeClothTotalOutList, U_TradeDeliveryRequest, U_TradeRRList,
-  U_PlanScanInEdit, U_ItemizedListList, U_TradeXinYuStkList, U_TradeXinYuOutList;
+  U_PlanScanInEdit, U_ItemizedListList, U_TradeXinYuStkList, U_TradeXinYuOutList,
+  U_TradeXinYuTHStkList, U_TradeXinYuOutTHList, U_PlanScanInEdit2,
+  U_PlanScanInEdit3;

       /////////////////////////////////////////////////////////////////
      //         功能说明:取Dll中得窗体                              //
@ -85,9 +87,9 @@ begin

    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
    Parameters1 := '管理';
-//    Parameters2 := '贸易布匹';
-//    Parameters2 := '格美门店';
-//    Parameters2 := '新余';
+    Parameters2 := '贸易布匹';
+    Parameters2 := '格美门店';
+    Parameters2 := '新余';
    DName := 'ADMIN';
    DCode := 'ADMIN';
  end
@ -170,7 +172,17 @@ begin

    921:  //贸易布匹入库
      begin
-        Parameters2 := '新余';
+//        Parameters2 := '新余';
+        with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+          WindowState := mstate;
+          mnewHandle := Handle;
+        end;
+      end;
+    9211:  //贸易布匹入库
+      begin
+        Parameters2 := '新余零售';
        with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
@ -178,7 +190,6 @@ begin
          mnewHandle := Handle;
        end;
      end;
-
    221:  //退货申请
      begin
        with TfrmTradeRRList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
@ -229,6 +240,15 @@ begin
        end;
      end;

+    9241:  //新余零售库存
+      begin
+        with TfrmTradeXinYuthStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+          WindowState := mstate;
+          mnewHandle := Handle;
+        end;
+      end;
    925:  //新余出库
      begin
        with TfrmTradeXinYuOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
@ -238,7 +258,15 @@ begin
          mnewHandle := Handle;
        end;
      end;
-
+    9251:  //新余出库
+      begin
+        with tfrmTradeXinYuOutTHList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+          WindowState := mstate;
+          mnewHandle := Handle;
+        end;
+      end;
    511:  //样布入库
      begin
        with TfrmTradeSampleClothInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
@ -275,6 +303,26 @@ begin
      begin
        with TfrmPlanScanInEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
+//          FSTKName := '贸易样布';
+          fFormID := FormID;
+          WindowState := mstate;
+          mnewHandle := Handle;
+        end;
+      end;
+    667:  //出车扫码
+      begin
+        with TfrmPlanScanInEdit2.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+//          FSTKName := '贸易样布';
+          fFormID := FormID;
+          WindowState := mstate;
+          mnewHandle := Handle;
+        end;
+      end;
+    668:  //回单
+      begin
+        with TfrmPlanScanInEdit3.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
 //          FSTKName := '贸易样布';
          fFormID := FormID;
          WindowState := mstate;
--- a/T02贸易汇总仓库/U_InputReceiptType.dfm
+++ b/T02贸易汇总仓库/U_InputReceiptType.dfm
@ -21,10 +21,8 @@ object frmInputReceiptType: TfrmInputReceiptType
    Height = 159
    Align = alClient
    TabOrder = 0
-    ExplicitWidth = 467
-    ExplicitHeight = 86
    object Button1: TButton
-      Left = 308
+      Left = 309
      Top = 14
      Width = 111
      Height = 59
@ -59,7 +57,7 @@ object frmInputReceiptType: TfrmInputReceiptType
      Left = 24
      Top = 73
      Width = 257
-      Height = 60
+      Height = 21
      TabOrder = 2
      OnKeyPress = FHDBCIONoKeyPress
    end
--- a/T02贸易汇总仓库/U_ItemizedListInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.dfm
@ -134,6 +134,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
        PopupMenu = PopupMenu2
        TabOrder = 0
        object Tv1: TcxGridDBTableView
+          OnKeyDown = Tv1KeyDown
          OnMouseDown = Tv1MouseDown
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
--- a/T02贸易汇总仓库/U_ItemizedListInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.pas
@ -116,6 +116,7 @@ type
    procedure ToolButton1Click(Sender: TObject);
    procedure Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    FSCXDH: string;
    FShowKeyid: integer;
@ -1596,6 +1597,20 @@ begin
  end;
 end;

+procedure TfrmItemizedListInPut.Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+
+      // 判断按下的是 方向下键 ↓
+  if Key = VK_DOWN then
+  begin
+    // 触发按钮的点击事件（把 Button1 换成你的按钮名称）
+    btnAdd.Click;
+
+    // 可选：阻止 TreeView 本身的向下移动（不需要就删掉这行）
+    Key := 0;
+  end;
+end;
+
 procedure TfrmItemizedListInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
  if not ADO_YS.IsEmpty then
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
@ -20,8 +20,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
    Align = alClient
    Caption = 'pnl1'
    TabOrder = 0
-    ExplicitWidth = 552
-    ExplicitHeight = 350
    object cxGrid1: TcxGrid
      Tag = 2
      Left = 1
@ -31,9 +29,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
      Align = alClient
      PopupMenu = PopupMenu1
      TabOrder = 0
-      ExplicitTop = 97
-      ExplicitWidth = 550
-      ExplicitHeight = 252
      object Tv1: TcxGridDBTableView
        OnKeyDown = Tv1KeyDown
        Navigator.Buttons.CustomButtons = <>
@ -135,8 +130,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
-      ExplicitWidth = 550
-      ExplicitHeight = 30
      object TBSave: TToolButton
        Left = 0
        Top = 0
@ -201,8 +194,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
      Height = 66
      Align = alTop
      TabOrder = 2
-      ExplicitTop = 31
-      ExplicitWidth = 550
      object Label9: TLabel
        Left = 33
        Top = 7
--- a/T02贸易汇总仓库/U_PlanScanInEdit.dfm
+++ b/T02贸易汇总仓库/U_PlanScanInEdit.dfm
@ -1,17 +1,18 @@
 inherited frmPlanScanInEdit: TfrmPlanScanInEdit
  Caption = #24211#23384#24211#20301#25195#25551
-  ClientHeight = 473
+  ClientHeight = 565
  ClientWidth = 1172
+  FormStyle = fsMDIChild
  Visible = True
  ExplicitWidth = 1188
-  ExplicitHeight = 512
+  ExplicitHeight = 604
  PixelsPerInch = 96
  TextHeight = 17
  object Panel1: TPanel [0]
    Left = 0
    Top = 0
    Width = 1172
-    Height = 145
+    Height = 178
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -20,9 +21,11 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
      Left = 2
      Top = 2
      Width = 1168
-      Height = 141
+      Height = 174
      Align = alClient
      TabOrder = 0
+      ExplicitLeft = 3
+      ExplicitTop = -1
      object Label6: TLabel
        Left = 13
        Top = 68
@ -51,8 +54,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        Visible = False
      end
      object Label2: TLabel
-        Left = 670
-        Top = 51
+        Left = 224
+        Top = 131
        Width = 66
        Height = 33
        Caption = #36710#36742
@ -64,8 +67,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        ParentFont = False
      end
      object Label5: TLabel
-        Left = 1016
-        Top = 148
+        Left = 34
+        Top = 180
        Width = 48
        Height = 17
        Caption = #20837#24211#21333#21495
@ -88,8 +91,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        Visible = False
      end
      object Label3: TLabel
-        Left = 471
-        Top = 54
+        Left = 25
+        Top = 134
        Width = 66
        Height = 33
        Caption = #21496#26426
@ -181,8 +184,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        OnBtnClick = wlCompanyBtnClick
      end
      object InNo: TEdit
-        Left = 1070
-        Top = 144
+        Left = 88
+        Top = 176
        Width = 100
        Height = 25
        TabOrder = 3
@ -215,16 +218,16 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
      end
      object carPlate: TBtnEditA
        Tag = 1
-        Left = 742
-        Top = 54
+        Left = 296
+        Top = 134
        Width = 121
        Height = 26
        TabOrder = 6
        OnBtnClick = carPlateBtnClick
      end
      object Tqueren: TButton
-        Left = 869
-        Top = 37
+        Left = 499
+        Top = 50
        Width = 153
        Height = 70
        Caption = #30830#23450#32465#23450
@ -239,8 +242,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
      end
      object Driver: TBtnEditA
        Tag = 1
-        Left = 536
-        Top = 56
+        Left = 90
+        Top = 136
        Width = 121
        Height = 26
        TabOrder = 8
@ -255,21 +258,36 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        TabOrder = 9
        Visible = False
      end
+      object Button1: TButton
+        Left = 715
+        Top = 50
+        Width = 153
+        Height = 70
+        Caption = #21024#38500
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 10
+        OnClick = Button1Click
+      end
    end
  end
  object Panel2: TPanel [1]
    Left = 0
-    Top = 145
+    Top = 178
    Width = 1172
-    Height = 328
+    Height = 387
    Align = alClient
    Caption = 'Panel2'
    TabOrder = 3
    object cxGrid3: TcxGrid
      Left = 1
      Top = 1
-      Width = 1170
-      Height = 326
+      Width = 769
+      Height = 385
      Align = alClient
      TabOrder = 0
      object Tv3: TcxGridDBTableView
@ -300,6 +318,8 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        OptionsCustomize.ColumnFiltering = False
        OptionsView.Footer = True
        OptionsView.GroupByBox = False
+        OptionsView.Indicator = True
+        OptionsView.IndicatorWidth = 50
        object cxGridDBColumn4: TcxGridDBColumn
          Caption = #21333#25454#32534#21495
          DataBinding.FieldName = 'TMMNo'
@ -324,14 +344,90 @@ inherited frmPlanScanInEdit: TfrmPlanScanInEdit
        GridView = Tv3
      end
    end
+    object GroupBox1: TGroupBox
+      Left = 770
+      Top = 1
+      Width = 401
+      Height = 385
+      Align = alRight
+      Caption = #35013#36710#21333
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 1
+      Visible = False
+      object cxGrid1: TcxGrid
+        Left = 2
+        Top = 30
+        Width = 397
+        Height = 353
+        Align = alClient
+        TabOrder = 0
+        object TV1: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_1
+          DataController.Filter.AutoDataSetFilter = True
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Format = #21367#25968#37327#65306'#'
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          object cxGridDBColumn1: TcxGridDBColumn
+            Caption = #35013#36710#21333#21495
+            DataBinding.FieldName = 'ZCID'
+            DataBinding.IsNullValueType = True
+            FooterAlignmentHorz = taCenter
+            HeaderAlignmentHorz = taCenter
+            HeaderGlyphAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 232
+          end
+        end
+        object cxGridLevel2: TcxGridLevel
+          GridView = TV1
+        end
+      end
+    end
+  end
+  inherited loadProcess: TPanel
+    Left = 501
+    Top = 231
+    ExplicitLeft = 501
+    ExplicitTop = 231
  end
  inherited cxProgressBar2: TcxProgressBar
+    Left = 454
+    Top = 307
+    ExplicitLeft = 454
+    ExplicitTop = 307
    ExplicitHeight = 25
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 785
-    Top = 200
+    Left = 677
+    Top = 249
  end
  inherited ADOQueryBaseTemp: TADOQuery
    Connection = DataLink_TradeTotalClothStk.ADOLink
--- a/T02贸易汇总仓库/U_PlanScanInEdit.pas
+++ b/T02贸易汇总仓库/U_PlanScanInEdit.pas
@ -73,6 +73,12 @@ type
    Label3: TLabel;
    Driver: TBtnEditA;
    Driverid: TEdit;
+    GroupBox1: TGroupBox;
+    cxGrid1: TcxGrid;
+    TV1: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    Button1: TButton;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -85,12 +91,15 @@ type
    procedure carPlateBtnClick(Sender: TObject);
    procedure TquerenClick(Sender: TObject);
    procedure DriverBtnClick(Sender: TObject);
+    procedure Button1Click(Sender: TObject);
  private
    { Private declarations }
    FScan, FSubIds, FZCID: string;
    procedure PlayWav(MWav: string);
    procedure InitKC();
-    procedure InitStatus();
+
+    procedure InitZCD();
+    procedure InitStatus(ZCID: string);
    procedure ScanKW();
    procedure ScanCIID();
    function SaveData(): Boolean;
@ -115,24 +124,68 @@ begin
    PlaySound(PChar(ExtractFilePath(Application.ExeName) + 'wav\' + MWav + '.wav'), 0, SND_ASYNC);
 end;

+procedure TfrmPlanScanInEdit.InitZCD();
+begin
+
+//  if carPlate.Text = '' then
+//    exit;
+
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_CarTransport A  WHERE STATUS=''0''   ');
+
+    sql.Add('AND   EXISTS  (SELECT  * FROM Trade_Market_CarTransportSUB B WHERE B.ZCID=A.ZCID)  ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
+
+end;
+
 procedure TfrmPlanScanInEdit.InitKC();
 begin

-  if carPlate.Text = '' then
-    exit;
+//  if carPlate.Text = '' then
+//    exit;
+

  with ADOQueryTemp do
  begin
    Close;
    sql.Clear;
    sql.Add('select * from Trade_Market_Main A    ');
-    sql.add('	left join  Trade_Market_CarTransportSub B on A.TmMid=B.TmMid	 ');
+
    sql.Add('where isnull(A.Status,''0'')=''2''  ');
    sql.add('and A.TMMId =' + QuotedStr(TRIm(FScan)));
+    SQL.Add('AND NOT EXISTS(SELECT  * FROM Trade_Market_CarTransportSub B  WHERE   A.TmMid=B.TmMid)');
    Open;
  end;
-  SCreateCDS(ADOQueryTemp, CDS_3);
-  SInitCDSData(ADOQueryTemp, CDS_3);
+  if ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('条码错误或已绑定', '提示信息', 0);
+    Exit;
+  end
+  else
+  begin
+    if CDS_3.Locate('TMMID', ADOQueryTemp.FieldByName('TMMID').AsString, []) then
+    begin
+      Application.MessageBox('该单据已在列表中，无需重复添加', '提示信息', 0);
+      Exit; // 存在则直接退出，不执行 Append
+    end;
+    with CDS_3 do
+    begin
+      Append;
+      FIELDBYNAME('TMMNo').VALUE := ADOQueryTemp.FieldByName('TMMNo').AsString;
+
+      FIELDBYNAME('CUSTNAME').VALUE := ADOQueryTemp.FieldByName('CUSTNAME').AsString;
+      FIELDBYNAME('tmmid').VALUE := ADOQueryTemp.FieldByName('tmmid').AsString;
+      Post;
+    end;
+  end;

 end;

@ -222,8 +275,22 @@ procedure TfrmPlanScanInEdit.FormShow(Sender: TObject);
 begin
  inherited;
  ReadCxGrid(self.caption + 'Tv3', Tv3, '成品仓库');
-  InitKC();
+//  InitKC();
  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_Main A    ');
+
+    sql.Add('where 1<>1 ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3);
+  SInitCDSData(ADOQueryTemp, CDS_3);
+  initzcd();
 end;

 procedure TfrmPlanScanInEdit.edtScanKeyPress(Sender: TObject; var Key: Char);
@ -231,8 +298,15 @@ var
  maxno, SMFlag, KYCKFlag, FMainId, ff: string;
  FFQty: Integer;
 begin
+  if Length(edtScan.Text) = 12 then
+  begin
+    Key := #13; // 强制把当前按键变成回车
+    edtScan.SelectAll; // 可选：选中全部方便下次覆盖扫码
+  end;
  if Key = #13 then
  begin
+    if edtScan.Text = '' then
+      EXIT;
    FScan := TRIM(edtScan.Text);
    edtScan.Text := '';
 //    if Copy(FScan, 1, 2) = 'KW' then
@ -257,7 +331,7 @@ begin
    with frmLabelPrint do
    begin
      FLMType := 'TradeClothIn1';
-      FFiltration1 := Trim(Self.InNo.Text);
+      FFiltration1 := Trim(CDS_1.FieldByName('zcid').AsString);
      if ShowModal = 1 then
      begin

@ -288,6 +362,15 @@ begin
  end;
 end;

+procedure TfrmPlanScanInEdit.Button1Click(Sender: TObject);
+begin
+  with CDS_3 do
+  begin
+    Delete;
+  end;
+
+end;
+
 procedure TfrmPlanScanInEdit.carPlateBtnClick(Sender: TObject);
 begin
  inherited;
@ -355,8 +438,20 @@ begin
  if SaveData() then
  begin
    Application.MessageBox('保存成功!', '提示', 0);
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from Trade_Market_Main A    ');

-    Exit;
+      sql.Add('where 1<>1 ');
+
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_3);
+    SInitCDSData(ADOQueryTemp, CDS_3);
+    initzcd();
+//    Exit;
  end;
 end;
 //procedure TfrmPlanScanInEdit.TquerenClick(Sender: TObject);
@ -413,16 +508,9 @@ begin
    begin
      First;
      while not Eof do
-      begin
-        if Trim(CDS_3.fieldbyname('ZCMXID').AsString) = '' then
      begin
        if GetLSNo(ADOQueryCmd, MaxSid, 'DS', 'Trade_Market_CarTransportSub', 4, 1) = False then
          raise Exception.Create('取子流水号失败！');
-        end
-        else
-        begin
-          MaxSid := Trim(CDS_3.fieldbyname('ZCMXID').AsString);
-        end;

        with ADOQueryCmd do
        begin
@ -447,9 +535,10 @@ begin
          FieldByName('TmMid').Value := CDS_3.fieldbyname('TMMId').Value;
          Post;
        end;
-        InitStatus();
-        CDS_3.Edit;
-        CDS_3.FieldByName('ZCMXID').Value := Trim(MaxSid);
+
+//        CDS_3.Edit;
+//        CDS_3.FieldByName('ZCMXID').Value := Trim(MaxSid);
+        InitStatus(MaxMid);
        Next;
      end;
    end;
@ -457,15 +546,16 @@ begin
   /////////////////              保存子表                /////////////////
    FZCID := Trim(MaxMid);
    ADOQueryCmd.Connection.CommitTrans;
-//    Result := True;
+
+    Result := True;
  except
    ADOQueryCmd.Connection.RollbackTrans;
    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
-//    Result := False;
+    Result := False;
  end;
 end;

-procedure TfrmPlanScanInEdit.InitStatus();
+procedure TfrmPlanScanInEdit.InitStatus(ZCID: string);
 begin

  with ADOQueryCmd do
@ -473,6 +563,10 @@ begin
    close;
    sql.Clear;
    sql.Add('update  Trade_Market_Main SET status=''9'' ');
+    SQL.Add(',zctime=GETDATE()');
+    SQL.Add(',Driver=' + QuotedStr(Driver.Text));
+    SQL.Add(',carPlate= ' + QuotedStr(carPlate.Text));
+    SQL.Add(',zcid= ' + QuotedStr(ZCID));
    sql.Add('where TMMId=' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));

    sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
--- a/T02贸易汇总仓库/U_PlanScanInEdit2.dfm
+++ b/T02贸易汇总仓库/U_PlanScanInEdit2.dfm
@ -0,0 +1,490 @@
+inherited frmPlanScanInEdit2: TfrmPlanScanInEdit2
+  Caption = #24211#23384#24211#20301#25195#25551
+  ClientHeight = 565
+  ClientWidth = 1172
+  FormStyle = fsMDIChild
+  Visible = True
+  ExplicitWidth = 1188
+  ExplicitHeight = 604
+  PixelsPerInch = 96
+  TextHeight = 17
+  object Panel1: TPanel [0]
+    Left = 0
+    Top = 0
+    Width = 1172
+    Height = 178
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    TabOrder = 2
+    object Panel3: TPanel
+      Left = 2
+      Top = 2
+      Width = 1168
+      Height = 174
+      Align = alClient
+      TabOrder = 0
+      object Label6: TLabel
+        Left = 13
+        Top = 68
+        Width = 66
+        Height = 33
+        Caption = #25195#25551
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clBlue
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object Label1: TLabel
+        Left = 1070
+        Top = 78
+        Width = 66
+        Height = 33
+        Caption = #21306#22495
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        Visible = False
+      end
+      object Label2: TLabel
+        Left = 224
+        Top = 131
+        Width = 66
+        Height = 33
+        Caption = #36710#36742
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object Label5: TLabel
+        Left = 34
+        Top = 180
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#21333#21495
+        Visible = False
+      end
+      object Label4: TLabel
+        Left = 1022
+        Top = 179
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#26102#38388
+        Visible = False
+      end
+      object Label11: TLabel
+        Left = 1022
+        Top = 205
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#31867#22411
+        Visible = False
+      end
+      object Label3: TLabel
+        Left = 25
+        Top = 134
+        Width = 66
+        Height = 33
+        Caption = #21496#26426
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object ToolBar3: TToolBar
+        Tag = 1
+        Left = 1
+        Top = 1
+        Width = 1166
+        Height = 30
+        AutoSize = True
+        ButtonHeight = 30
+        ButtonWidth = 83
+        Caption = 'ToolBar1'
+        Color = clWhite
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        Images = DataLink_TradeTotalClothStk.cxImageList_bar
+        List = True
+        ParentColor = False
+        ParentFont = False
+        ShowCaptions = True
+        TabOrder = 0
+        object ToolButton3: TToolButton
+          Left = 0
+          Top = 0
+          AutoSize = True
+          Caption = #30721#21333#25171#21360
+          ImageIndex = 21
+          Visible = False
+          OnClick = ToolButton3Click
+        end
+        object ToolButton8: TToolButton
+          Left = 87
+          Top = 0
+          AutoSize = True
+          Caption = #20445#23384#26684#24335
+          ImageIndex = 16
+          OnClick = ToolButton8Click
+        end
+        object ToolButton7: TToolButton
+          Left = 174
+          Top = 0
+          AutoSize = True
+          Caption = #20851#38381
+          ImageIndex = 7
+          OnClick = ToolButton7Click
+        end
+        object btnGetOutNo: TToolButton
+          Left = 237
+          Top = 0
+          AutoSize = True
+          Caption = #21462#21495
+          ImageIndex = 2
+          Visible = False
+          OnClick = btnGetOutNoClick
+        end
+      end
+      object edtScan: TEdit
+        Left = 85
+        Top = 44
+        Width = 379
+        Height = 72
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -64
+        Font.Name = #23435#20307
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 1
+        OnKeyPress = edtScanKeyPress
+      end
+      object wlCompany: TBtnEditA
+        Tag = 1
+        Left = 1135
+        Top = 80
+        Width = 121
+        Height = 26
+        TabOrder = 2
+        Visible = False
+        OnBtnClick = wlCompanyBtnClick
+      end
+      object InNo: TEdit
+        Left = 88
+        Top = 176
+        Width = 100
+        Height = 25
+        TabOrder = 3
+        Visible = False
+      end
+      object CRTime: TDateTimePicker
+        Left = 1070
+        Top = 175
+        Width = 100
+        Height = 20
+        Date = 41337.000000000000000000
+        Format = 'yyyy-MM-dd'
+        Time = 0.663190821760508700
+        TabOrder = 4
+        Visible = False
+      end
+      object CRType: TComboBox
+        Left = 1070
+        Top = 201
+        Width = 100
+        Height = 25
+        Style = csDropDownList
+        ItemIndex = 0
+        TabOrder = 5
+        Text = #26816#39564#20837#24211
+        Visible = False
+        Items.Strings = (
+          #26816#39564#20837#24211
+          #36864#36135#20837#24211)
+      end
+      object carPlate: TBtnEditA
+        Tag = 1
+        Left = 296
+        Top = 134
+        Width = 121
+        Height = 26
+        TabOrder = 6
+        OnBtnClick = carPlateBtnClick
+      end
+      object Tqueren: TButton
+        Left = 499
+        Top = 50
+        Width = 153
+        Height = 70
+        Caption = #30830#23450#20986#36710
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 7
+        OnClick = TquerenClick
+      end
+      object Driver: TBtnEditA
+        Tag = 1
+        Left = 90
+        Top = 136
+        Width = 121
+        Height = 26
+        TabOrder = 8
+        OnBtnClick = DriverBtnClick
+      end
+      object Driverid: TEdit
+        Tag = 1
+        Left = 1102
+        Top = 26
+        Width = 100
+        Height = 25
+        TabOrder = 9
+        Visible = False
+      end
+    end
+  end
+  object Panel2: TPanel [1]
+    Left = 0
+    Top = 178
+    Width = 1172
+    Height = 387
+    Align = alClient
+    Caption = 'Panel2'
+    TabOrder = 3
+    object cxGrid3: TcxGrid
+      Left = 1
+      Top = 1
+      Width = 769
+      Height = 385
+      Align = alClient
+      TabOrder = 0
+      object Tv3: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DS_3
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Format = #21367#25968#37327#65306'#'
+            Kind = skCount
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skCount
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsCustomize.ColumnFiltering = False
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        OptionsView.Indicator = True
+        OptionsView.IndicatorWidth = 50
+        object cxGridDBColumn4: TcxGridDBColumn
+          Caption = #21333#25454#32534#21495
+          DataBinding.FieldName = 'TMMNo'
+          DataBinding.IsNullValueType = True
+          FooterAlignmentHorz = taCenter
+          HeaderAlignmentHorz = taCenter
+          HeaderGlyphAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 232
+        end
+        object Tv3Column1: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
+          FooterAlignmentHorz = taCenter
+          HeaderAlignmentHorz = taCenter
+          HeaderGlyphAlignmentHorz = taCenter
+          Width = 90
+        end
+      end
+      object cxGridLevel1: TcxGridLevel
+        GridView = Tv3
+      end
+    end
+    object GroupBox1: TGroupBox
+      Left = 770
+      Top = 1
+      Width = 401
+      Height = 385
+      Align = alRight
+      Caption = #35013#36710#21333
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 1
+      Visible = False
+      object cxGrid1: TcxGrid
+        Left = 2
+        Top = 30
+        Width = 397
+        Height = 353
+        Align = alClient
+        TabOrder = 0
+        object TV1: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_1
+          DataController.Filter.AutoDataSetFilter = True
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Format = #21367#25968#37327#65306'#'
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          object cxGridDBColumn1: TcxGridDBColumn
+            Caption = #35013#36710#21333#21495
+            DataBinding.FieldName = 'ZCID'
+            DataBinding.IsNullValueType = True
+            FooterAlignmentHorz = taCenter
+            HeaderAlignmentHorz = taCenter
+            HeaderGlyphAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 232
+          end
+        end
+        object cxGridLevel2: TcxGridLevel
+          GridView = TV1
+        end
+      end
+    end
+  end
+  inherited loadProcess: TPanel
+    Left = 501
+    Top = 231
+    ExplicitLeft = 501
+    ExplicitTop = 231
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 454
+    Top = 307
+    ExplicitLeft = 454
+    ExplicitTop = 307
+    ExplicitHeight = 25
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 677
+    Top = 249
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 697
+    Top = 185
+  end
+  object GPM_1: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 168
+    Top = 400
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 264
+    Top = 400
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 336
+    Top = 408
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 704
+    Top = 248
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Parameters = <>
+    Left = 792
+    Top = 256
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 872
+    Top = 256
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 264
+    Top = 328
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 336
+    Top = 328
+  end
+  object GPM_2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 176
+    Top = 324
+  end
+  object DS_3: TDataSource
+    DataSet = CDS_3
+    Left = 808
+    Top = 408
+  end
+  object CDS_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 760
+    Top = 408
+  end
+  object GPM_3: TcxGridPopupMenu
+    Grid = cxGrid3
+    PopupMenus = <>
+    Left = 712
+    Top = 408
+  end
+end
--- a/T02贸易汇总仓库/U_PlanScanInEdit2.pas
+++ b/T02贸易汇总仓库/U_PlanScanInEdit2.pas
@ -0,0 +1,527 @@
+unit U_PlanScanInEdit2;
+
+interface
+
+uses
+  Windows, Messages, strUtils, SysUtils, Variants, Classes, Graphics, Controls,
+  Forms, Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+  cxDataStorage, cxEdit, DB, cxDBData, StdCtrls, ExtCtrls, ADODB, DBClient,
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, MMSystem,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
+  cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
+  RM_GridReport, RM_Dataset, Vcl.ToolWin, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue, dxScrollbarAnnotations, cxContainer, cxProgressBar,
+  BtnEdit;
+
+type
+  TfrmPlanScanInEdit2 = class(TfrmBaseList)
+    GPM_1: TcxGridPopupMenu;
+    CDS_1: TClientDataSet;
+    DS_1: TDataSource;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    Panel1: TPanel;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    GPM_2: TcxGridPopupMenu;
+    DS_3: TDataSource;
+    CDS_3: TClientDataSet;
+    GPM_3: TcxGridPopupMenu;
+    Panel2: TPanel;
+    cxGrid3: TcxGrid;
+    Tv3: TcxGridDBTableView;
+    cxGridDBColumn4: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    Panel3: TPanel;
+    ToolBar3: TToolBar;
+    ToolButton3: TToolButton;
+    btnGetOutNo: TToolButton;
+    ToolButton7: TToolButton;
+    ToolButton8: TToolButton;
+    edtScan: TEdit;
+    Label6: TLabel;
+    Label1: TLabel;
+    Label2: TLabel;
+    wlCompany: TBtnEditA;
+    Label5: TLabel;
+    InNo: TEdit;
+    Label4: TLabel;
+    CRTime: TDateTimePicker;
+    Label11: TLabel;
+    CRType: TComboBox;
+    carPlate: TBtnEditA;
+    Tv3Column1: TcxGridDBColumn;
+    Tqueren: TButton;
+    Label3: TLabel;
+    Driver: TBtnEditA;
+    Driverid: TEdit;
+    GroupBox1: TGroupBox;
+    cxGrid1: TcxGrid;
+    TV1: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure btnGetOutNoClick(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
+    procedure ToolButton8Click(Sender: TObject);
+    procedure edtScanKeyPress(Sender: TObject; var Key: Char);
+    procedure wlCompanyBtnClick(Sender: TObject);
+    procedure carPlateBtnClick(Sender: TObject);
+    procedure TquerenClick(Sender: TObject);
+    procedure DriverBtnClick(Sender: TObject);
+  private
+    { Private declarations }
+    FScan, FSubIds, FZCID: string;
+    procedure PlayWav(MWav: string);
+    procedure InitKC();
+
+    procedure InitZCD();
+    procedure InitStatus(ZCID: string);
+    procedure ScanKW();
+    procedure ScanCIID();
+    function SaveData(): Boolean;
+  public
+
+    { Public declarations }
+  end;
+
+var
+  frmPlanScanInEdit2: TfrmPlanScanInEdit2;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_LabelPrint, U_ZDYHelp, U_MachineManageSel, U_UserSel;  //U_TradeClothWaitStorage,  U_PositionSel
+
+{$R *.dfm}
+
+procedure TfrmPlanScanInEdit2.PlayWav(MWav: string);
+begin
+  if FileExists(PChar(ExtractFilePath(Application.ExeName) + 'wav\' + MWav + '.wav')) then
+    PlaySound(PChar(ExtractFilePath(Application.ExeName) + 'wav\' + MWav + '.wav'), 0, SND_ASYNC);
+end;
+
+procedure TfrmPlanScanInEdit2.InitZCD();
+begin
+
+//  if carPlate.Text = '' then
+//    exit;
+
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_CarTransport A  WHERE STATUS=''0''   ');
+
+    sql.Add('AND   EXISTS  (SELECT  * FROM Trade_Market_CarTransportSUB B WHERE B.ZCID=A.ZCID)  ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
+
+end;
+
+procedure TfrmPlanScanInEdit2.InitKC();
+begin
+
+//  if carPlate.Text = '' then
+//    exit;
+
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_Main A    ');
+
+    sql.Add('where    ');
+    sql.add('  ZCID =(select zcid from Trade_Market_Main b where b.tmmid=' + QuotedStr(TRIm(FScan)));
+    sql.add(')');
+    SQL.Add('AND cctime IS NULL ');
+    sql.Add('and ISNULL(stATUS,''0'')=''9''');
+
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('条码错误或已出车', '提示信息', 0);
+    Exit;
+  end
+  else
+  begin
+    SCreateCDS(ADOQueryTemp, CDS_3);
+    SInitCDSData(ADOQueryTemp, CDS_3);
+    Driver.Text := ADOQueryTemp.FieldByName('Driver').AsString;
+    carPlate.Text := ADOQueryTemp.FieldByName('carPlate').AsString;
+
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit2.ScanKW();
+var
+  MStkIds: string;
+begin
+  try
+    with ADOQueryTemp do
+    begin
+      close;
+      SQL.Clear;
+      sql.Add('select * from Bs_Position where POSID =''' + trim(FScan) + ''' ');
+      open;
+    end;
+
+    wlCompany.Text := ADOQueryTemp.FieldByName('posno').AsString;
+
+    btnGetOutNo.Click;
+  except
+
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit2.ScanCIID();
+var
+  MStkIds: string;
+begin
+  try
+    if Trim(wlCompany.Text) = '' then
+      raise Exception.Create('库位不能为空!');
+    if Trim(InNo.Text) = '' then
+      raise Exception.Create('入库单号不能为空!');
+
+    MStkIds := FScan;
+
+    try
+      ADOQueryCmd.Connection.BeginTrans;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        Sql.Clear;
+        Sql.Add('exec P_Market_Position_In ');
+        Sql.Add('@StkIds=' + quotedstr(trim(MStkIds)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
+        Sql.Add(',@IONO=' + Quotedstr(InNo.Text));
+        Sql.Add(',@StkPosition=' + Quotedstr(wlCompany.Text));
+        Sql.Add(',@FillId=' + Quotedstr(DCode));
+        Sql.Add(',@Filler=' + Quotedstr(DName));
+//        ShowMessage(sql.Text);
+        Open;
+      end;
+      if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+      begin
+        raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+      end;
+      ADOQueryCmd.Connection.CommitTrans;
+      PlayWav('正确');
+    except
+      ADOQueryCmd.Connection.RollbackTrans;
+      raise Exception.Create(PChar(Exception(ExceptObject).Message));
+    end;
+
+  except
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+//    PlayWav('发货错误');
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit2.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmPlanScanInEdit2.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmPlanScanInEdit2 := nil;
+end;
+
+procedure TfrmPlanScanInEdit2.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(self.caption + 'Tv3', Tv3, '成品仓库');
+//  InitKC();
+  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_Main A    ');
+
+    sql.Add('where 1<>1 ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3);
+  SInitCDSData(ADOQueryTemp, CDS_3);
+  initzcd();
+end;
+
+procedure TfrmPlanScanInEdit2.edtScanKeyPress(Sender: TObject; var Key: Char);
+var
+  maxno, SMFlag, KYCKFlag, FMainId, ff: string;
+  FFQty: Integer;
+begin
+  // 长度 =13 时，自动模拟按回车
+  if Length(edtScan.Text) = 12 then
+  begin
+    Key := #13; // 强制把当前按键变成回车
+    edtScan.SelectAll; // 可选：选中全部方便下次覆盖扫码
+  end;
+  if Key = #13 then
+  begin
+    if edtScan.Text = '' then
+      EXIT;
+    FScan := TRIM(edtScan.Text);
+    edtScan.Text := '';
+//    if Copy(FScan, 1, 2) = 'KW' then
+//    begin
+//      ScanKW();
+//    end
+//    else
+//    begin
+//      ScanCIID();
+//    end;
+    InitKC();
+  end;
+end;
+
+procedure TfrmPlanScanInEdit2.ToolButton3Click(Sender: TObject);
+begin
+  if Trim(InNo.Text) = '' then
+    Exit;
+
+  try
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
+    begin
+      FLMType := 'TradeClothIn1';
+      FFiltration1 := Trim(CDS_1.FieldByName('zcid').AsString);
+      if ShowModal = 1 then
+      begin
+
+      end;
+    end;
+  finally
+    frmLabelPrint.Free;
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit2.wlCompanyBtnClick(Sender: TObject);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      MainType := 'Cust';
+      flag := 'AREA';
+      flagname := '区域';
+      if ShowModal = 1 then
+      begin
+        wlCompany.text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit2.carPlateBtnClick(Sender: TObject);
+begin
+  inherited;
+  try
+    frmMachineManageSel := TfrmMachineManageSel.Create(Application);
+    with frmMachineManageSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        carPlate.text := Trim(CDS_1.fieldbyname('VNO').AsString);
+      end;
+    end;
+  finally
+    frmMachineManageSel.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit2.DriverBtnClick(Sender: TObject);
+begin
+
+  try
+    frmUserSel := TfrmUserSel.Create(Application);
+    with frmUserSel do
+    begin
+      Fdept := '送货组';
+      if ShowModal = 1 then
+      begin
+        self.Driverid.Text := Trim(CDS_1.fieldbyname('EECode').AsString);
+        self.Driver.Text := Trim(CDS_1.fieldbyname('EEName').AsString);
+      end;
+    end;
+  finally
+    frmUserSel.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit2.btnGetOutNoClick(Sender: TObject);
+var
+  maxNo: string;
+begin
+  if GetLSNo(ADOQueryCmd, maxNo, 'RK', 'Trade_Cloth_IO', 3, 1) = False then
+  begin
+    Application.MessageBox('取入库单号失败!', '提示', 0);
+    Exit;
+  end;
+  InNo.Text := Trim(maxNo);
+  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+  InitKC();
+end;
+
+procedure TfrmPlanScanInEdit2.ToolButton7Click(Sender: TObject);
+begin
+  tv3.Controller.EditingController.ShowEdit();
+  Close;
+
+end;
+
+procedure TfrmPlanScanInEdit2.ToolButton8Click(Sender: TObject);
+begin
+  WriteCxGrid(self.caption + 'Tv3', Tv3, '成品仓库');
+end;
+
+procedure TfrmPlanScanInEdit2.TquerenClick(Sender: TObject);
+begin
+  if Driver.Text = '' then
+  begin
+    Application.MessageBox('司机不能为空!', '提示', 0);
+    Exit;
+  end;
+  if carPlate.Text = '' then
+  begin
+    Application.MessageBox('车辆不能为空!', '提示', 0);
+    Exit;
+  end;
+  if SaveData() then
+  begin
+    Application.MessageBox('保存成功!', '提示', 0);
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from Trade_Market_Main A    ');
+
+      sql.Add('where 1<>1 ');
+
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_3);
+    SInitCDSData(ADOQueryTemp, CDS_3);
+    initzcd();
+
+  end;
+end;
+//procedure TfrmPlanScanInEdit.TquerenClick(Sender: TObject);
+
+function TfrmPlanScanInEdit2.SaveData(): Boolean;
+var
+  MaxMid, MaxSid: string;
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  Trade_Market_Main   ');
+      SQL.Add('set  Cctime=GETDATE()');
+      SQL.Add(',Driver=' + QuotedStr(Driver.Text));
+      SQL.Add(',carPlate= ' + QuotedStr(carPlate.Text));
+
+      sql.Add('where ZCID=' + quotedstr(trim(CDS_3.fieldbyname('ZCID').AsString)));
+
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('计划单出车')));
+      sql.Add(',' + quotedstr(trim('出车单号：' + trim(CDS_3.FieldByName('ZCID').AsString))));
+      sql.Add(',' + quotedstr(trim('成功')));
+      sql.Add(')');
+      execsql;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+
+    Result := True;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+    Result := False;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit2.InitStatus(ZCID: string);
+begin
+
+  with ADOQueryCmd do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('update  Trade_Market_Main SET status=''9'' ');
+    SQL.Add(',zctime=GETDATE()');
+    SQL.Add(',Driver=' + QuotedStr(Driver.Text));
+    SQL.Add(',carPlate= ' + QuotedStr(carPlate.Text));
+    SQL.Add(',zcid= ' + QuotedStr(ZCID));
+    sql.Add('where TMMId=' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+
+    sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
+    sql.Add('values(''贸易布坯出库''    ');
+    sql.Add(',' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+    sql.Add(',''完成''   ');
+    sql.Add(',' + quotedstr(DName));
+    sql.Add(',' + quotedstr(trim(self.Caption)));
+    sql.Add(',' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+    sql.Add(')  ');
+
+    sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+    sql.Add(' ' + quotedstr(trim(DName)));
+    sql.Add(',getdate() ');
+    sql.Add(',' + quotedstr(trim(self.Caption)));
+    sql.Add(',' + quotedstr(trim('计划单完成')));
+    sql.Add(',' + quotedstr(trim('计划单号：' + trim(CDS_3.FieldByName('TMMNO').AsString))));
+    sql.Add(',' + quotedstr(trim('成功')));
+    sql.Add(')');
+    execsql;
+  end;
+
+end;
+
+end.
+
--- a/T02贸易汇总仓库/U_PlanScanInEdit3.dfm
+++ b/T02贸易汇总仓库/U_PlanScanInEdit3.dfm
@ -0,0 +1,511 @@
+inherited frmPlanScanInEdit3: TfrmPlanScanInEdit3
+  Caption = #24211#23384#24211#20301#25195#25551
+  ClientHeight = 565
+  ClientWidth = 1172
+  FormStyle = fsMDIChild
+  Visible = True
+  ExplicitWidth = 1188
+  ExplicitHeight = 604
+  PixelsPerInch = 96
+  TextHeight = 17
+  object Panel1: TPanel [0]
+    Left = 0
+    Top = 0
+    Width = 1172
+    Height = 178
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    TabOrder = 2
+    object Panel3: TPanel
+      Left = 2
+      Top = 2
+      Width = 1168
+      Height = 174
+      Align = alClient
+      TabOrder = 0
+      ExplicitLeft = 3
+      ExplicitTop = -1
+      object Label6: TLabel
+        Left = 13
+        Top = 68
+        Width = 66
+        Height = 33
+        Caption = #25195#25551
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clBlue
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
+      object Label1: TLabel
+        Left = 1070
+        Top = 78
+        Width = 66
+        Height = 33
+        Caption = #21306#22495
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        Visible = False
+      end
+      object Label2: TLabel
+        Left = 224
+        Top = 131
+        Width = 66
+        Height = 33
+        Caption = #36710#36742
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        Visible = False
+      end
+      object Label5: TLabel
+        Left = 34
+        Top = 180
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#21333#21495
+        Visible = False
+      end
+      object Label4: TLabel
+        Left = 1022
+        Top = 179
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#26102#38388
+        Visible = False
+      end
+      object Label11: TLabel
+        Left = 1022
+        Top = 205
+        Width = 48
+        Height = 17
+        Caption = #20837#24211#31867#22411
+        Visible = False
+      end
+      object Label3: TLabel
+        Left = 25
+        Top = 134
+        Width = 66
+        Height = 33
+        Caption = #21496#26426
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -32
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+        Visible = False
+      end
+      object ToolBar3: TToolBar
+        Tag = 1
+        Left = 1
+        Top = 1
+        Width = 1166
+        Height = 30
+        AutoSize = True
+        ButtonHeight = 30
+        ButtonWidth = 83
+        Caption = 'ToolBar1'
+        Color = clWhite
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        Images = DataLink_TradeTotalClothStk.cxImageList_bar
+        List = True
+        ParentColor = False
+        ParentFont = False
+        ShowCaptions = True
+        TabOrder = 0
+        object ToolButton3: TToolButton
+          Left = 0
+          Top = 0
+          AutoSize = True
+          Caption = #30721#21333#25171#21360
+          ImageIndex = 21
+          Visible = False
+          OnClick = ToolButton3Click
+        end
+        object ToolButton8: TToolButton
+          Left = 87
+          Top = 0
+          AutoSize = True
+          Caption = #20445#23384#26684#24335
+          ImageIndex = 16
+          OnClick = ToolButton8Click
+        end
+        object ToolButton7: TToolButton
+          Left = 174
+          Top = 0
+          AutoSize = True
+          Caption = #20851#38381
+          ImageIndex = 7
+          OnClick = ToolButton7Click
+        end
+        object btnGetOutNo: TToolButton
+          Left = 237
+          Top = 0
+          AutoSize = True
+          Caption = #21462#21495
+          ImageIndex = 2
+          Visible = False
+          OnClick = btnGetOutNoClick
+        end
+      end
+      object edtScan: TEdit
+        Left = 85
+        Top = 44
+        Width = 379
+        Height = 72
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -64
+        Font.Name = #23435#20307
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 1
+        OnKeyPress = edtScanKeyPress
+      end
+      object wlCompany: TBtnEditA
+        Tag = 1
+        Left = 1135
+        Top = 80
+        Width = 121
+        Height = 26
+        TabOrder = 2
+        Visible = False
+        OnBtnClick = wlCompanyBtnClick
+      end
+      object InNo: TEdit
+        Left = 88
+        Top = 176
+        Width = 100
+        Height = 25
+        TabOrder = 3
+        Visible = False
+      end
+      object CRTime: TDateTimePicker
+        Left = 1070
+        Top = 175
+        Width = 100
+        Height = 20
+        Date = 41337.000000000000000000
+        Format = 'yyyy-MM-dd'
+        Time = 0.663190821760508700
+        TabOrder = 4
+        Visible = False
+      end
+      object CRType: TComboBox
+        Left = 1070
+        Top = 201
+        Width = 100
+        Height = 25
+        Style = csDropDownList
+        ItemIndex = 0
+        TabOrder = 5
+        Text = #26816#39564#20837#24211
+        Visible = False
+        Items.Strings = (
+          #26816#39564#20837#24211
+          #36864#36135#20837#24211)
+      end
+      object carPlate: TBtnEditA
+        Tag = 1
+        Left = 296
+        Top = 134
+        Width = 121
+        Height = 26
+        TabOrder = 6
+        Visible = False
+        OnBtnClick = carPlateBtnClick
+      end
+      object Tqueren: TButton
+        Left = 499
+        Top = 50
+        Width = 153
+        Height = 70
+        Caption = #30830#23450#22238#21333
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 7
+        OnClick = TquerenClick
+      end
+      object Driver: TBtnEditA
+        Tag = 1
+        Left = 90
+        Top = 136
+        Width = 121
+        Height = 26
+        TabOrder = 8
+        Visible = False
+        OnBtnClick = DriverBtnClick
+      end
+      object Driverid: TEdit
+        Tag = 1
+        Left = 1102
+        Top = 26
+        Width = 100
+        Height = 25
+        TabOrder = 9
+        Visible = False
+      end
+      object Button1: TButton
+        Left = 715
+        Top = 50
+        Width = 153
+        Height = 70
+        Caption = #21024#38500
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 10
+        OnClick = Button1Click
+      end
+    end
+  end
+  object Panel2: TPanel [1]
+    Left = 0
+    Top = 178
+    Width = 1172
+    Height = 387
+    Align = alClient
+    Caption = 'Panel2'
+    TabOrder = 3
+    object cxGrid3: TcxGrid
+      Left = 1
+      Top = 1
+      Width = 769
+      Height = 385
+      Align = alClient
+      TabOrder = 0
+      object Tv3: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DS_3
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Format = #21367#25968#37327#65306'#'
+            Kind = skCount
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skCount
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsCustomize.ColumnFiltering = False
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        OptionsView.Indicator = True
+        OptionsView.IndicatorWidth = 50
+        object cxGridDBColumn4: TcxGridDBColumn
+          Caption = #21333#25454#32534#21495
+          DataBinding.FieldName = 'TMMNo'
+          DataBinding.IsNullValueType = True
+          FooterAlignmentHorz = taCenter
+          HeaderAlignmentHorz = taCenter
+          HeaderGlyphAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 232
+        end
+        object Tv3Column1: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
+          FooterAlignmentHorz = taCenter
+          HeaderAlignmentHorz = taCenter
+          HeaderGlyphAlignmentHorz = taCenter
+          Width = 90
+        end
+      end
+      object cxGridLevel1: TcxGridLevel
+        GridView = Tv3
+      end
+    end
+    object GroupBox1: TGroupBox
+      Left = 770
+      Top = 1
+      Width = 401
+      Height = 385
+      Align = alRight
+      Caption = #35013#36710#21333
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 1
+      Visible = False
+      object cxGrid1: TcxGrid
+        Left = 2
+        Top = 30
+        Width = 397
+        Height = 353
+        Align = alClient
+        TabOrder = 0
+        object TV1: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_1
+          DataController.Filter.AutoDataSetFilter = True
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Format = #21367#25968#37327#65306'#'
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          object cxGridDBColumn1: TcxGridDBColumn
+            Caption = #35013#36710#21333#21495
+            DataBinding.FieldName = 'ZCID'
+            DataBinding.IsNullValueType = True
+            FooterAlignmentHorz = taCenter
+            HeaderAlignmentHorz = taCenter
+            HeaderGlyphAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 232
+          end
+        end
+        object cxGridLevel2: TcxGridLevel
+          GridView = TV1
+        end
+      end
+    end
+  end
+  inherited loadProcess: TPanel
+    Left = 501
+    Top = 231
+    ExplicitLeft = 501
+    ExplicitTop = 231
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 454
+    Top = 307
+    ExplicitLeft = 454
+    ExplicitTop = 307
+    ExplicitHeight = 25
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 677
+    Top = 249
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 697
+    Top = 185
+  end
+  object GPM_1: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 168
+    Top = 400
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 264
+    Top = 400
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 336
+    Top = 408
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 704
+    Top = 248
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Parameters = <>
+    Left = 792
+    Top = 256
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 872
+    Top = 256
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 264
+    Top = 328
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 336
+    Top = 328
+  end
+  object GPM_2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 176
+    Top = 324
+  end
+  object DS_3: TDataSource
+    DataSet = CDS_3
+    Left = 808
+    Top = 408
+  end
+  object CDS_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 760
+    Top = 408
+  end
+  object GPM_3: TcxGridPopupMenu
+    Grid = cxGrid3
+    PopupMenus = <>
+    Left = 712
+    Top = 408
+  end
+end
--- a/T02贸易汇总仓库/U_PlanScanInEdit3.pas
+++ b/T02贸易汇总仓库/U_PlanScanInEdit3.pas
@ -0,0 +1,557 @@
+unit U_PlanScanInEdit3;
+
+interface
+
+uses
+  Windows, Messages, strUtils, SysUtils, Variants, Classes, Graphics, Controls,
+  Forms, Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+  cxDataStorage, cxEdit, DB, cxDBData, StdCtrls, ExtCtrls, ADODB, DBClient,
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, MMSystem,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
+  cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
+  RM_GridReport, RM_Dataset, Vcl.ToolWin, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue, dxScrollbarAnnotations, cxContainer, cxProgressBar,
+  BtnEdit;
+
+type
+  TfrmPlanScanInEdit3 = class(TfrmBaseList)
+    GPM_1: TcxGridPopupMenu;
+    CDS_1: TClientDataSet;
+    DS_1: TDataSource;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    Panel1: TPanel;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    GPM_2: TcxGridPopupMenu;
+    DS_3: TDataSource;
+    CDS_3: TClientDataSet;
+    GPM_3: TcxGridPopupMenu;
+    Panel2: TPanel;
+    cxGrid3: TcxGrid;
+    Tv3: TcxGridDBTableView;
+    cxGridDBColumn4: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    Panel3: TPanel;
+    ToolBar3: TToolBar;
+    ToolButton3: TToolButton;
+    btnGetOutNo: TToolButton;
+    ToolButton7: TToolButton;
+    ToolButton8: TToolButton;
+    edtScan: TEdit;
+    Label6: TLabel;
+    Label1: TLabel;
+    Label2: TLabel;
+    wlCompany: TBtnEditA;
+    Label5: TLabel;
+    InNo: TEdit;
+    Label4: TLabel;
+    CRTime: TDateTimePicker;
+    Label11: TLabel;
+    CRType: TComboBox;
+    carPlate: TBtnEditA;
+    Tv3Column1: TcxGridDBColumn;
+    Tqueren: TButton;
+    Label3: TLabel;
+    Driver: TBtnEditA;
+    Driverid: TEdit;
+    GroupBox1: TGroupBox;
+    cxGrid1: TcxGrid;
+    TV1: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    Button1: TButton;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure btnGetOutNoClick(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
+    procedure ToolButton8Click(Sender: TObject);
+    procedure edtScanKeyPress(Sender: TObject; var Key: Char);
+    procedure wlCompanyBtnClick(Sender: TObject);
+    procedure carPlateBtnClick(Sender: TObject);
+    procedure TquerenClick(Sender: TObject);
+    procedure DriverBtnClick(Sender: TObject);
+    procedure Button1Click(Sender: TObject);
+  private
+    { Private declarations }
+    FScan, FSubIds, FZCID: string;
+    procedure PlayWav(MWav: string);
+    procedure InitKC();
+
+    procedure InitZCD();
+    procedure InitStatus(ZCID: string);
+    procedure ScanKW();
+    procedure ScanCIID();
+    function SaveData(): Boolean;
+  public
+
+    { Public declarations }
+  end;
+
+var
+  frmPlanScanInEdit3: TfrmPlanScanInEdit3;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_LabelPrint, U_ZDYHelp, U_MachineManageSel, U_UserSel;  //U_TradeClothWaitStorage,  U_PositionSel
+
+{$R *.dfm}
+
+procedure TfrmPlanScanInEdit3.PlayWav(MWav: string);
+begin
+  if FileExists(PChar(ExtractFilePath(Application.ExeName) + 'wav\' + MWav + '.wav')) then
+    PlaySound(PChar(ExtractFilePath(Application.ExeName) + 'wav\' + MWav + '.wav'), 0, SND_ASYNC);
+end;
+
+procedure TfrmPlanScanInEdit3.InitZCD();
+begin
+
+//  if carPlate.Text = '' then
+//    exit;
+
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_CarTransport A  WHERE STATUS=''0''   ');
+
+    sql.Add('AND   EXISTS  (SELECT  * FROM Trade_Market_CarTransportSUB B WHERE B.ZCID=A.ZCID)  ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
+
+end;
+
+procedure TfrmPlanScanInEdit3.InitKC();
+begin
+
+//  if carPlate.Text = '' then
+//    exit;
+
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_Main A    ');
+
+    sql.Add('where    ');    // ZCID =(select zcid from Trade_Market_Main b where
+    sql.add('  a.tmmid=' + QuotedStr(TRIm(FScan)));
+
+    SQL.Add('AND HDtime IS NULL ');
+    sql.Add('and ISNULL(stATUS,''0'')=''9''');
+
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('条码错误或已回单', '提示信息', 0);
+    Exit;
+  end
+  else
+  begin
+
+    if CDS_3.Locate('TMMID', ADOQueryTemp.FieldByName('TMMID').AsString, []) then
+    begin
+      Application.MessageBox('该单据已在列表中，无需重复添加', '提示信息', 0);
+      Exit; // 存在则直接退出，不执行 Append
+    end;
+    with CDS_3 do
+    begin
+      Append;
+      FieldByName('TMMNo').VALUE := ADOQueryTemp.FieldByName('TMMNo').AsString;
+      FieldByName('TMMID').VALUE := ADOQueryTemp.FieldByName('TMMID').AsString;
+      FieldByName('CUSTNAME').VALUE := ADOQueryTemp.FieldByName('CUSTNAME').AsString;
+      POST;
+    end;
+//
+//    SCreateCDS(ADOQueryTemp, CDS_3);
+//    SInitCDSData(ADOQueryTemp, CDS_3);
+//    Driver.Text := ADOQueryTemp.FieldByName('Driver').AsString;
+//    carPlate.Text := ADOQueryTemp.FieldByName('carPlate').AsString;
+
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit3.ScanKW();
+var
+  MStkIds: string;
+begin
+  try
+    with ADOQueryTemp do
+    begin
+      close;
+      SQL.Clear;
+      sql.Add('select * from Bs_Position where POSID =''' + trim(FScan) + ''' ');
+      open;
+    end;
+
+    wlCompany.Text := ADOQueryTemp.FieldByName('posno').AsString;
+
+    btnGetOutNo.Click;
+  except
+
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit3.ScanCIID();
+var
+  MStkIds: string;
+begin
+  try
+    if Trim(wlCompany.Text) = '' then
+      raise Exception.Create('库位不能为空!');
+    if Trim(InNo.Text) = '' then
+      raise Exception.Create('入库单号不能为空!');
+
+    MStkIds := FScan;
+
+    try
+      ADOQueryCmd.Connection.BeginTrans;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        Sql.Clear;
+        Sql.Add('exec P_Market_Position_In ');
+        Sql.Add('@StkIds=' + quotedstr(trim(MStkIds)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
+        Sql.Add(',@IONO=' + Quotedstr(InNo.Text));
+        Sql.Add(',@StkPosition=' + Quotedstr(wlCompany.Text));
+        Sql.Add(',@FillId=' + Quotedstr(DCode));
+        Sql.Add(',@Filler=' + Quotedstr(DName));
+//        ShowMessage(sql.Text);
+        Open;
+      end;
+      if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+      begin
+        raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+      end;
+      ADOQueryCmd.Connection.CommitTrans;
+      PlayWav('正确');
+    except
+      ADOQueryCmd.Connection.RollbackTrans;
+      raise Exception.Create(PChar(Exception(ExceptObject).Message));
+    end;
+
+  except
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+//    PlayWav('发货错误');
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit3.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmPlanScanInEdit3.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmPlanScanInEdit3 := nil;
+end;
+
+procedure TfrmPlanScanInEdit3.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(self.caption + 'Tv3', Tv3, '成品仓库');
+//  InitKC();
+  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Trade_Market_Main A    ');
+
+    sql.Add('where 1<>1 ');
+
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3);
+  SInitCDSData(ADOQueryTemp, CDS_3);
+  initzcd();
+end;
+
+procedure TfrmPlanScanInEdit3.edtScanKeyPress(Sender: TObject; var Key: Char);
+var
+  maxno, SMFlag, KYCKFlag, FMainId, ff: string;
+  FFQty: Integer;
+begin
+  // 长度 =13 时，自动模拟按回车
+  if Length(edtScan.Text) = 12 then
+  begin
+    Key := #13; // 强制把当前按键变成回车
+    edtScan.SelectAll; // 可选：选中全部方便下次覆盖扫码
+  end;
+
+  // 原来的回车逻辑
+  if Key = #13 then
+  begin
+    if edtScan.Text = '' then
+      EXIT;
+
+    FScan := Trim(edtScan.Text);
+    edtScan.Text := '';
+
+    InitKC();
+  end;
+end;
+
+procedure TfrmPlanScanInEdit3.ToolButton3Click(Sender: TObject);
+begin
+  if Trim(InNo.Text) = '' then
+    Exit;
+
+  try
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
+    begin
+      FLMType := 'TradeClothIn1';
+      FFiltration1 := Trim(CDS_1.FieldByName('zcid').AsString);
+      if ShowModal = 1 then
+      begin
+
+      end;
+    end;
+  finally
+    frmLabelPrint.Free;
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit3.wlCompanyBtnClick(Sender: TObject);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      MainType := 'Cust';
+      flag := 'AREA';
+      flagname := '区域';
+      if ShowModal = 1 then
+      begin
+        wlCompany.text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit3.Button1Click(Sender: TObject);
+begin
+  with CDS_3 do
+  begin
+    Delete;
+  end;
+
+end;
+
+procedure TfrmPlanScanInEdit3.carPlateBtnClick(Sender: TObject);
+begin
+  inherited;
+  try
+    frmMachineManageSel := TfrmMachineManageSel.Create(Application);
+    with frmMachineManageSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        carPlate.text := Trim(CDS_1.fieldbyname('VNO').AsString);
+      end;
+    end;
+  finally
+    frmMachineManageSel.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit3.DriverBtnClick(Sender: TObject);
+begin
+
+  try
+    frmUserSel := TfrmUserSel.Create(Application);
+    with frmUserSel do
+    begin
+      Fdept := '送货组';
+      if ShowModal = 1 then
+      begin
+        self.Driverid.Text := Trim(CDS_1.fieldbyname('EECode').AsString);
+        self.Driver.Text := Trim(CDS_1.fieldbyname('EEName').AsString);
+      end;
+    end;
+  finally
+    frmUserSel.Free;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit3.btnGetOutNoClick(Sender: TObject);
+var
+  maxNo: string;
+begin
+  if GetLSNo(ADOQueryCmd, maxNo, 'RK', 'Trade_Cloth_IO', 3, 1) = False then
+  begin
+    Application.MessageBox('取入库单号失败!', '提示', 0);
+    Exit;
+  end;
+  InNo.Text := Trim(maxNo);
+  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+  InitKC();
+end;
+
+procedure TfrmPlanScanInEdit3.ToolButton7Click(Sender: TObject);
+begin
+  tv3.Controller.EditingController.ShowEdit();
+  Close;
+
+end;
+
+procedure TfrmPlanScanInEdit3.ToolButton8Click(Sender: TObject);
+begin
+  WriteCxGrid(self.caption + 'Tv3', Tv3, '成品仓库');
+end;
+
+procedure TfrmPlanScanInEdit3.TquerenClick(Sender: TObject);
+begin
+//  if Driver.Text = '' then
+//  begin
+//    Application.MessageBox('司机不能为空!', '提示', 0);
+//    Exit;
+//  end;
+//  if carPlate.Text = '' then
+//  begin
+//    Application.MessageBox('车辆不能为空!', '提示', 0);
+//    Exit;
+//  end;
+  if SaveData() then
+  begin
+    Application.MessageBox('保存成功!', '提示', 0);
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from Trade_Market_Main A    ');
+
+      sql.Add('where 1<>1 ');
+
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_3);
+    SInitCDSData(ADOQueryTemp, CDS_3);
+    initzcd();
+
+  end;
+end;
+//procedure TfrmPlanScanInEdit.TquerenClick(Sender: TObject);
+
+function TfrmPlanScanInEdit3.SaveData(): Boolean;
+var
+  MaxMid, MaxSid: string;
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+
+    with CDS_3 do
+    begin
+      First;
+      while not Eof do
+      begin
+        with ADOQueryCmd do
+        begin
+          close;
+          sql.Clear;
+          sql.Add('update  Trade_Market_Main   ');
+          SQL.Add('set status=''10'', hdtime=GETDATE()');
+
+          sql.Add('where TMMID=' + quotedstr(trim(CDS_3.fieldbyname('TMMID').AsString)));
+
+          sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+          sql.Add(' ' + quotedstr(trim(DName)));
+          sql.Add(',getdate() ');
+          sql.Add(',' + quotedstr(trim(self.Caption)));
+          sql.Add(',' + quotedstr(trim('计划单回单')));
+          sql.Add(',' + quotedstr(trim('出车单号：' + trim(CDS_3.FieldByName('ZCID').AsString))));
+          sql.Add(',' + quotedstr(trim('成功')));
+          sql.Add(')');
+          execsql;
+        end;
+        Next;
+      end;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+
+    Result := True;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+    Result := False;
+  end;
+end;
+
+procedure TfrmPlanScanInEdit3.InitStatus(ZCID: string);
+begin
+
+  with ADOQueryCmd do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('update  Trade_Market_Main SET status=''9'' ');
+    SQL.Add(',zctime=GETDATE()');
+    SQL.Add(',Driver=' + QuotedStr(Driver.Text));
+    SQL.Add(',carPlate= ' + QuotedStr(carPlate.Text));
+    SQL.Add(',zcid= ' + QuotedStr(ZCID));
+    sql.Add('where TMMId=' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+
+    sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
+    sql.Add('values(''贸易布坯出库''    ');
+    sql.Add(',' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+    sql.Add(',''完成''   ');
+    sql.Add(',' + quotedstr(DName));
+    sql.Add(',' + quotedstr(trim(self.Caption)));
+    sql.Add(',' + quotedstr(trim(CDS_3.fieldbyname('TMMId').AsString)));
+    sql.Add(')  ');
+
+    sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+    sql.Add(' ' + quotedstr(trim(DName)));
+    sql.Add(',getdate() ');
+    sql.Add(',' + quotedstr(trim(self.Caption)));
+    sql.Add(',' + quotedstr(trim('计划单完成')));
+    sql.Add(',' + quotedstr(trim('计划单号：' + trim(CDS_3.FieldByName('TMMNO').AsString))));
+    sql.Add(',' + quotedstr(trim('成功')));
+    sql.Add(')');
+    execsql;
+  end;
+
+end;
+
+end.
+
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm
@ -21,6 +21,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
    Height = 518
    Align = alClient
    TabOrder = 0
+    ExplicitTop = 36
    object Tv1: TcxGridDBTableView
      OnMouseDown = Tv1MouseDown
      Navigator.Buttons.CustomButtons = <>
@ -210,6 +211,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
          item
            FieldName = 'C_ColorNo'
          end>
+        Properties.ListOptions.ShowHeader = False
        Properties.ListSource = DS_YS
        Properties.OnEditValueChanged = Tv1Column6PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -278,12 +280,15 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsEditFixedList
-        Properties.Items.Strings = (
-          'M'
-          'Y'
-          'Kg')
+        PropertiesClassName = 'TcxLookupComboBoxProperties'
+        Properties.KeyFieldNames = 'CICUnit'
+        Properties.ListColumns = <
+          item
+            FieldName = 'cicunit'
+          end>
+        Properties.ListOptions.ShowHeader = False
+        Properties.ListSource = DS_DW
+        Properties.OnEditValueChanged = v1QtyUnitPropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
        Width = 77
      end
@ -512,10 +517,18 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
      Top = 0
      AutoSize = True
      Caption = #26684#32654#20986#24211#25968#25454
-      ImageIndex = 17
+      ImageIndex = 22
      Visible = False
      OnClick = GeMeiOutputSelClick
    end
+    object ToolButton4: TToolButton
+      Left = 648
+      Top = 0
+      AutoSize = True
+      Caption = #26684#32654#37197#36135#21333
+      ImageIndex = 22
+      OnClick = ToolButton4Click
+    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_TradeTotalClothStk.ADOLink
@ -597,4 +610,16 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput
    Left = 764
    Top = 443
  end
+  object ADO_DW: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 862
+    Top = 440
+  end
+  object DS_DW: TDataSource
+    DataSet = ADO_DW
+    Left = 922
+    Top = 442
+  end
 end
--- a/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.pas
@ -73,6 +73,9 @@ type
    DS_PM: TDataSource;
    ADO_YS: TADOQuery;
    DS_YS: TDataSource;
+    ADO_DW: TADOQuery;
+    DS_DW: TDataSource;
+    ToolButton4: TToolButton;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBAddClick(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
@ -94,6 +97,8 @@ type
    procedure v1SPNamePropertiesEditValueChanged(Sender: TObject);
    procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
    procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
+    procedure v1QtyUnitPropertiesEditValueChanged(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
  private
    { Private declarations }
    function SaveData(MSaveType: string): Boolean;
@ -111,7 +116,8 @@ implementation

 uses
  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_TradePlanSel, U_ClothInfoSel,
-  U_PurchaseContractSel, U_TradeSalesContractSel, U_GeMeiOutputSel;
+  U_PurchaseContractSel, U_TradeSalesContractSel, U_GeMeiOutputSel,
+  U_TradeMarketListSEL;

 {$R *.dfm}

@ -139,6 +145,17 @@ begin
    if CDS_Sub.Locate('Piece', null, []) = True then
      raise Exception.Create('匹数不能为空！');

+    if CDS_Sub.Locate('C_ColorNo', null, []) = True then
+      raise Exception.Create('色号不能为空！');
+
+    if CDS_Sub.Locate('C_ColorNo', '', []) = True then
+      raise Exception.Create('色号不能为空！');
+
+    if CDS_Sub.Locate('C_Color', null, []) = True then
+      raise Exception.Create('颜色不能为空！');
+
+    if CDS_Sub.Locate('C_Color', '', []) = True then
+      raise Exception.Create('颜色不能为空！');
    if CDS_Sub.Locate('Qty', null, []) = True then
      raise Exception.Create('数量不能为空！');

@ -183,7 +200,7 @@ begin
      FieldByName('StkCoName').Value := '本厂仓库';
      FieldByName('FromCoNo').Value := 'G0001';
      FieldByName('FromCoName').Value := '染厂供应商';
-      FieldByName('QtyUnit').Value := 'Kg';
+//      FieldByName('QtyUnit').Value := 'Kg';
      FieldByName('C_Degree').AsString := Trim('坯布');
      FieldByName('IOType').Value := '采购入库';
      Post;
@ -264,6 +281,10 @@ begin

          FieldByName('FromTPNID').Value := CDS_Sub.fieldbyname('FromTPNID').Value;

+          FieldByName('TMMID').Value := CDS_Sub.fieldbyname('TMMID').Value;
+          FieldByName('TMSID').Value := CDS_Sub.fieldbyname('TMSID').Value;
+//          FieldByName('TMMNO').Value := CDS_Sub.fieldbyname('TMMNO').Value;
+
          FieldByName('STKName').Value := FSTKName;
          FieldByName('IOFlag').Value := '入库';
          FieldByName('IOQtyFlag').Value := 1;
@ -385,6 +406,15 @@ begin
    Close;
    sql.Clear;
    sql.add(' SELECT distinct B.C_Color,B.C_ColorNo  FROM   BS_Cloth_Info_Sub B ');
+ //    showmessage(sql.text);
+    Open;
+  end;
+  with ADO_DW do
+  begin
+    Close;
+    sql.Clear;
+    sql.add(' SELECT distinct CICUNIT  FROM   Bs_Cloth_Info_Coefficient B ');
+
 //    showmessage(sql.text);
    Open;
  end;
@ -556,6 +586,57 @@ begin
  end;
 end;

+procedure TfrmTradeClothTotalInInput.ToolButton4Click(Sender: TObject);
+begin
+  try
+    frmTradeMarketListSEL := TfrmTradeMarketListSEL.Create(Application);
+    with frmTradeMarketListSEL do
+    begin
+
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_Sub do
+        begin
+          Append;
+
+          FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now));
+          FieldByName('StkCoNo').Value := '本厂仓库';
+          FieldByName('StkCoName').Value := '本厂仓库';
+          FieldByName('FromCoNo').Value := 'G0001';
+          FieldByName('FromCoName').Value := '染厂供应商';
+          FieldByName('C_Degree').AsString := Trim('坯布');
+
+//          FBCIOID := frmGeMeiOutputSel.CDS_1.FieldByName('BCIOID').AsString;
+          FieldByName('BCIONO').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('tmmno').AsString;
+//          FieldByName('FromCoName').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('FromCoName').AsString;
+          FieldByName('C_Code').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_Code').AsString;
+          FieldByName('C_Name').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_Name').AsString;
+
+          FieldByName('C_Spec').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_Spec').AsString;
+          FieldByName('C_Width').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_Width').AsString;
+          FieldByName('C_GramWeight').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_GramWeight').AsString;
+//          FieldByName('FtyPCId').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('FtyPCId').AsString;
+          FieldByName('Piece').AsString := '0';
+          FieldByName('Qty').AsString := '0';
+          FieldByName('QtyUnit').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('OrderUnit').AsString;
+
+          FieldByName('C_Color').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_Color').AsString;
+          FieldByName('C_ColorNO').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('C_ColorNO').AsString;
+
+          FieldByName('tmmid').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('tmmid').AsString;
+          FieldByName('tmsid').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('tmsid').AsString;
+//          FieldByName('TMMNO').AsString := frmTradeMarketListSEL.CDS_1.FieldByName('TMMNO').AsString;
+
+          Post;
+
+        end;
+      end;
+    end;
+  finally
+    frmTradeMarketListSEL.Free;
+  end;
+end;
+
 procedure TfrmTradeClothTotalInInput.Tv1Column14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
  try
@ -852,6 +933,39 @@ begin
  end;
 end;

+procedure TfrmTradeClothTotalInInput.v1QtyUnitPropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+begin
+//  if Trim(CDS_Sub.FieldByName('C_Name').AsString) = '' then
+//  begin
+//    Application.MessageBox('请先输入品名!', '提示', 0);
+//    //ModalResult:=1;
+//    with CDS_Sub do
+//    begin
+//      Edit;
+//      FieldByName('QtyUnit').AsString := '';
+//      Post;
+//    end;
+//    Exit;
+//  end;
+//
+//  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+//  mvalue := TcxTextEdit(Sender).EditingText;
+//
+//  with CDS_Sub do
+//  begin
+//    Edit;
+//    FieldByName(FFieldName).Value := Trim(mvalue);
+//    Post;
+//    ADO_dw.Locate('CICUnit', mvalue, []);
+//    Edit;
+//    FieldByName('QtyUnit').Value := ADO_YS.FieldByName('CICUnit').Value;
+////    FieldByName('C_Code').Value := ADO_pm.FieldByName('C_Code').Value;
+//    Post;
+//  end;
+end;
+
 procedure TfrmTradeClothTotalInInput.v1SPNamePropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -879,6 +993,26 @@ begin
    SQL.ADD(' order by B.C_ColorNo');
    Open;
  end;
+  with ADO_DW do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT  * FROM V_QTYUNIT A ');
+    sql.Add(' where A.C_Code= ' + QuotedStr(CDS_Sub.FieldByName('C_Code').AsString));
+
+    Open;
+  end;
+  if ADO_DW.RecordCount = 1 then
+  begin
+    with CDS_Sub do
+    begin
+      Edit;
+      FieldByName('qtyunit').Value := Trim(ADO_DW.FieldByName('CICUnit').Value);
+      Post;
+
+    end;
+  end;
+
 end;

 end.
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@ -138,7 +138,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Caption = #21697#21517
    end
    object Label4: TLabel
-      Left = 636
+      Left = 674
      Top = 47
      Width = 64
      Height = 21
@ -156,7 +156,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Top = 84
      Width = 32
      Height = 21
-      Caption = #35268#26684
+      Caption = #33394#21495
    end
    object Label12: TLabel
      Left = 18
@ -165,37 +165,30 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Height = 21
      Caption = #20837#24211#31867#22411
    end
-    object Label10: TLabel
-      Left = 445
-      Top = 84
-      Width = 32
-      Height = 21
-      Caption = #25209#21495
-    end
    object Label6: TLabel
-      Left = 858
+      Left = 896
      Top = 47
      Width = 64
      Height = 21
      Caption = #35745#21010#21333#21495
    end
    object Label7: TLabel
-      Left = 446
+      Left = 484
      Top = 47
      Width = 32
      Height = 21
      Caption = #32568#21495
    end
    object Label9: TLabel
-      Left = 635
-      Top = 84
+      Left = 452
+      Top = 82
      Width = 64
      Height = 21
      Caption = #23384#25918#20179#20301
    end
    object Label11: TLabel
-      Left = 857
-      Top = 84
+      Left = 674
+      Top = 82
      Width = 64
      Height = 21
      Caption = #20837#24211#26465#30721
@ -211,7 +204,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    end
    object FromCoName: TcxTextEdit
      Tag = 2
-      Left = 704
+      Left = 742
      Top = 43
      Properties.OnChange = BCIOIDPropertiesChange
      TabOrder = 1
@ -227,7 +220,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
-    object C_spec: TcxTextEdit
+    object C_ColorNo: TcxTextEdit
      Tag = 2
      Left = 289
      Top = 80
@ -236,21 +229,12 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
-    object BatchNo: TcxTextEdit
-      Tag = 2
-      Left = 481
-      Top = 80
-      Properties.OnChange = BCIOIDPropertiesChange
-      TabOrder = 4
-      OnKeyPress = BCIONoKeyPress
-      Width = 150
-    end
    object FromOrdNo: TcxTextEdit
      Tag = 2
-      Left = 926
+      Left = 964
      Top = 43
      Properties.OnChange = BCIOIDPropertiesChange
-      TabOrder = 5
+      TabOrder = 4
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
@ -263,7 +247,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Color = clWhite
      ParentBackground = False
      ParentColor = False
-      TabOrder = 6
+      TabOrder = 5
      ExplicitLeft = 2
      ExplicitTop = 2
      ExplicitWidth = 1230
@ -294,33 +278,33 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Left = 86
      Top = 80
      Properties.OnChange = IOTypePropertiesChange
-      TabOrder = 7
+      TabOrder = 6
      Width = 149
    end
    object FtyPCId: TcxTextEdit
      Tag = 2
-      Left = 482
+      Left = 520
      Top = 43
      Properties.OnChange = BCIOIDPropertiesChange
-      TabOrder = 8
+      TabOrder = 7
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
    object StkCoName: TcxTextEdit
      Tag = 2
-      Left = 703
-      Top = 80
+      Left = 520
+      Top = 78
      Properties.OnChange = BCIOIDPropertiesChange
-      TabOrder = 9
+      TabOrder = 8
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
    object BCIOID: TcxTextEdit
      Tag = 2
-      Left = 925
-      Top = 80
+      Left = 742
+      Top = 78
      Properties.OnChange = BCIOIDPropertiesChange
-      TabOrder = 10
+      TabOrder = 9
      OnKeyPress = BCIONoKeyPress
      Width = 150
    end
@ -340,16 +324,16 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
  end
  object cxPageControl1: TcxPageControl [4]
    Left = 0
-    Top = 190
+    Top = 186
    Width = 1234
-    Height = 476
+    Height = 480
    Align = alClient
    TabOrder = 4
    Properties.ActivePage = cxTabSheet1
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 5
    OnChange = cxPageControl1Change
-    ClientRectBottom = 476
+    ClientRectBottom = 480
    ClientRectRight = 1234
    ClientRectTop = 32
    object cxTabSheet1: TcxTabSheet
@ -359,7 +343,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
        Left = 0
        Top = 0
        Width = 1234
-        Height = 444
+        Height = 448
        Align = alClient
        PopupMenu = PopupMenu1
        TabOrder = 0
@ -507,14 +491,11 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    object cxTabSheet2: TcxTabSheet
      Caption = #20135#21697#26126#32454
      ImageIndex = 1
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
        Width = 1234
-        Height = 444
+        Height = 448
        Align = alClient
        PopupMenu = PopupMenu1
        TabOrder = 0
@ -1016,7 +997,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    Left = 0
    Top = 149
    Width = 1234
-    Height = 41
+    Height = 37
    Align = alTop
    AutoSize = True
    BevelInner = bvLowered
@ -1024,10 +1005,10 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    TabOrder = 5
    DesignSize = (
      1230
-      37)
+      33)
    object Label31: TLabel
      Left = 14
-      Top = 9
+      Top = 7
      Width = 96
      Height = 21
      Alignment = taCenter
@ -1038,7 +1019,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
    end
    object LBCPAP: TLabel
      Left = 478
-      Top = 8
+      Top = 7
      Width = 100
      Height = 20
      Alignment = taCenter
@ -1046,27 +1027,24 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      AutoSize = False
      Caption = #24403#21069#39029'/'#24635#39029#25968
      Layout = tlCenter
-      ExplicitTop = 7
    end
    object BTLP: TButton
      Left = 391
-      Top = 6
+      Top = 4
      Width = 78
      Height = 27
      Anchors = [akLeft]
      Caption = #19978#19968#39029
      TabOrder = 0
-      ExplicitTop = 5
    end
    object BTNP: TButton
      Left = 585
-      Top = 5
+      Top = 3
      Width = 78
      Height = 28
      Anchors = [akLeft]
      Caption = #19979#19968#39029
      TabOrder = 1
-      ExplicitTop = 4
    end
    object TCBNOR: TcxComboBox
      Tag = 2
@ -1132,7 +1110,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
  end
  object PopupMenu1: TPopupMenu
    Left = 633
-    Top = 385
+    Top = 386
    object N1: TMenuItem
      Caption = #20840#36873
      OnClick = N1Click
@ -1141,6 +1119,10 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
      Caption = #20840#24323
      OnClick = N2Click
    end
+    object N3: TMenuItem
+      Caption = #22797#21046
+      OnClick = N3Click
+    end
  end
  object GPM_2: TcxGridPopupMenu
    Grid = cxGrid2
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
@ -14,7 +14,7 @@ uses
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
  dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, FrameDateSel,
  cxContainer, cxMaskEdit, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters,
-  System.Math;
+  System.Math, Vcl.Clipbrd;

 type
  TfrmTradeClothTotalInList = class(TfrmBaseList)
@ -44,9 +44,7 @@ type
    C_name: TcxTextEdit;
    FromCoName: TcxTextEdit;
    BCIONo: TcxTextEdit;
-    C_spec: TcxTextEdit;
-    Label10: TLabel;
-    BatchNo: TcxTextEdit;
+    C_ColorNo: TcxTextEdit;
    ToolButton1: TToolButton;
    ToolButton2: TToolButton;
    ToolButton3: TToolButton;
@ -137,6 +135,7 @@ type
    BTLP: TButton;
    BTNP: TButton;
    TCBNOR: TcxComboBox;
+    N3: TMenuItem;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -168,6 +167,7 @@ type
    procedure btn1Click(Sender: TObject);
    procedure TV2DblClick(Sender: TObject);
    procedure cxPageControl1Change(Sender: TObject);
+    procedure N3Click(Sender: TObject);
  private
    CurrentPage, RecordsNumber: Integer;
    canshu1, FSTKName, canshu3, canshu4: string;
@ -320,6 +320,7 @@ begin
        SqlStr := SqlStr + ' where 1=1 ' + (WSql);
        SqlStr := SqlStr + ' and IOFlag=''Èë¿â''  ';
        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;

@ -513,6 +514,21 @@ begin
  SelOKNo(CDS_1, False);
 end;

+procedure TfrmTradeClothTotalInList.N3Click(Sender: TObject);
+begin
+  if cxPageControl1.ActivePageIndex = 0 then
+  begin
+    Clipboard.SetTextBuf(PChar(Trim(CDS_2.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+  end
+  else
+  begin
+    Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+  end;
+
+end;
+
 procedure TfrmTradeClothTotalInList.TBDelClick(Sender: TObject);
 var
  MBCIOID, MBCIONO: string;
--- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm
@ -1186,7 +1186,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList
  end
  object PopupMenu1: TPopupMenu
    Left = 687
-    Top = 292
+    Top = 293
    object N1: TMenuItem
      Caption = #20840#36873
      OnClick = N1Click
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
@ -88,6 +88,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
    ParentBackground = False
    ParentColor = True
    TabOrder = 3
+    ExplicitTop = 32
    object Label3: TLabel
      Left = 28
      Top = 18
@ -123,6 +124,13 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
      Height = 21
      Caption = #24211#20301
    end
+    object Label5: TLabel
+      Left = 1017
+      Top = 17
+      Width = 32
+      Height = 21
+      Caption = #32568#21495
+    end
    object C_name: TcxTextEdit
      Tag = 2
      Left = 64
@ -168,6 +176,15 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
      OnKeyPress = FromCoNameKeyPress
      Width = 150
    end
+    object ftypcid: TcxTextEdit
+      Tag = 2
+      Left = 1053
+      Top = 13
+      Properties.OnChange = FromCoNamePropertiesChange
+      TabOrder = 5
+      OnKeyPress = FromCoNameKeyPress
+      Width = 150
+    end
  end
  inherited cxProgressBar2: TcxProgressBar
    Left = 461
@ -904,8 +921,8 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
    PopupMenus = <>
-    Left = 770
-    Top = 243
+    Left = 771
+    Top = 244
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
@ -915,7 +932,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
  end
  object PopupMenu1: TPopupMenu
    Left = 688
-    Top = 305
+    Top = 306
    object N1: TMenuItem
      Caption = #20840#36873
      OnClick = N1Click
@ -924,6 +941,10 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
      Caption = #20840#24323
      OnClick = N2Click
    end
+    object N3: TMenuItem
+      Caption = #22797#21046
+      OnClick = N3Click
+    end
  end
  object GPM_2: TcxGridPopupMenu
    Grid = cxGrid2
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas
@ -14,7 +14,7 @@ uses
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
  dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer,
  cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters,
-  cxPC, System.Math;
+  cxPC, System.Math, Clipbrd;

 type
  TfrmTradeClothTotalStkList = class(TfrmBaseList)
@ -116,6 +116,9 @@ type
    BTLP: TButton;
    BTNP: TButton;
    TCBNOR: TcxComboBox;
+    N3: TMenuItem;
+    Label5: TLabel;
+    ftypcid: TcxTextEdit;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBRafreshClick(Sender: TObject);
@ -133,6 +136,7 @@ type
    procedure ToolButton3Click(Sender: TObject);
    procedure TV2DblClick(Sender: TObject);
    procedure cxPageControl1Change(Sender: TObject);
+    procedure N3Click(Sender: TObject);
  private
    CurrentPage, RecordsNumber: Integer;
    canshu1, FSTKName, canshu3, canshu4: string;
@ -164,9 +168,18 @@ end;

 procedure TfrmTradeClothTotalStkList.cxPageControl1Change(Sender: TObject);
 begin
+  if cxPageControl1.ActivePageIndex = 1 then
+  begin
+    ftypcid.tag := 2;
+  end
+  else
+  begin
+    ftypcid.tag := 0;
+  end;
  case cxPageControl1.ActivePageIndex of
    1:
      begin
+
        InitGrid1();
      end;
  end;
@ -258,7 +271,7 @@ begin
        SqlStr := SqlStr + ' @pageIndex=' + inttostr(CurrentPage);
        SqlStr := SqlStr + ' ,@pageSize=' + inttostr(RecordsNumber);
        SqlStr := SqlStr + ' ,@criteria= ' + quotedstr(WSql);
-//        showmessage(SqlStr);
+
        InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
        LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
      end;
@ -295,10 +308,14 @@ begin
  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 ftypcid.Text <> '' then
+  begin
+    SqlStr := SqlStr + ' and isnull(ftypcid,'''')=''' + Trim(ftypcid.Text) + '''';
+  end;
  if Trim(canshu4) <> '' then
    SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
  WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"C_Code|C_Name|C_Color|C_ColorNo|C_Pattern|C_Degree|QtyUnit"}');
+
  if TRIM(WSqlStr) <> '' then
    SqlStr := SqlStr + ' and ' + WSqlStr;
  SqlStr := SqlStr + ' order by IOTime desc';
@ -375,6 +392,12 @@ begin
  SelOKNo(CDS_1, False);
 end;

+procedure TfrmTradeClothTotalStkList.N3Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+end;
+
 procedure TfrmTradeClothTotalStkList.ToolButton2Click(Sender: TObject);
 begin
  WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'Ã³Ò×»ã×Ü²Ö¿â');
--- a/T02贸易汇总仓库/U_TradeMarketListSEL.dfm
+++ b/T02贸易汇总仓库/U_TradeMarketListSEL.dfm
--- a/T02贸易汇总仓库/U_TradeMarketListSEL.pas
+++ b/T02贸易汇总仓库/U_TradeMarketListSEL.pas
@ -0,0 +1,206 @@
+unit U_TradeMarketListSEL;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
+  System.ImageList, U_BaseInput, cxContainer, cxImageList,
+  dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, cxCheckBox,
+  cxCalendar, FrameDateSel;
+
+type
+  TfrmTradeMarketListSEL = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    cxImageList_bar: TcxImageList;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1Column16: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    v1OrdDate: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column23: TcxGridDBColumn;
+    Tv1Column24: TcxGridDBColumn;
+    v1DeliveryDate: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    Tv1Column25: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    Panel1: TPanel;
+    Label3: TLabel;
+    Label1: TLabel;
+    Label2: TLabel;
+    Label4: TLabel;
+    TMMNo: TcxTextEdit;
+    CustName: TcxTextEdit;
+    C_Name: TcxTextEdit;
+    ConNo: TcxTextEdit;
+    frmFrameDateSel1: TfrmFrameDateSel;
+    ToolButton2: TToolButton;
+    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+  private
+    procedure InitGrid();
+    //function SaveData(): Boolean;
+    { Private declarations }
+  public
+    FCoType, FAuthority, FStores, FSTKName: string;
+    { Public declarations }
+  end;
+
+var
+  frmTradeMarketListSEL: TfrmTradeMarketListSEL;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmTradeMarketListSEL.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmTradeMarketListSEL.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmTradeMarketListSEL.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' select * ');
+      sql.Add(' from Trade_Market_Main A inner join Trade_Market_sub b on a.tmmid=b.tmmid  ');
+      sql.Add(' where   	CustNo= ''DQ0001''');
+      sql.Add('    and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)));
+      sql.Add('    and    A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)));
+      SQL.ADD('AND STATUS IN (''9'',''10'')');
+      Open;
+    end;
+
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmTradeMarketListSEL.FormShow(Sender: TObject);
+begin
+  inherited;
+  frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180;
+  frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  InitGrid();
+
+  ReadCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmTradeMarketListSEL.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmTradeMarketListSEL.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmTradeMarketListSEL.ToolButton1Click(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmTradeMarketListSEL.ToolButton2Click(Sender: TObject);
+begin
+  initgrid();
+end;
+
+procedure TfrmTradeMarketListSEL.TV1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmTradeMarketListSEL.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmTradeMarketListSEL := nil;
+end;
+
+end.
+
--- a/T02贸易汇总仓库/U_TradeXinYuOutTHList.dfm
+++ b/T02贸易汇总仓库/U_TradeXinYuOutTHList.dfm
@ -0,0 +1,568 @@
+inherited frmTradeXinYuOutTHList: TfrmTradeXinYuOutTHList
+  Left = 165
+  Top = 13
+  Caption = #22823#36135#21333
+  ClientHeight = 594
+  ClientWidth = 1540
+  Color = clBtnFace
+  Font.Height = -16
+  FormStyle = fsMDIChild
+  Position = poScreenCenter
+  Visible = True
+  ExplicitWidth = 1556
+  ExplicitHeight = 633
+  PixelsPerInch = 96
+  TextHeight = 21
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1540
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 99
+    Caption = 'ToolBar1'
+    Images = DataLink_TradeTotalClothStk.cxImageList_bar
+    List = True
+    ShowCaptions = True
+    TabOrder = 4
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      OnClick = TBFindClick
+    end
+    object ToolButton3: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #25171#21360
+      ImageIndex = 21
+      OnClick = ToolButton3Click
+    end
+    object TWC: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #23436#25104
+      ImageIndex = 12
+      Visible = False
+      OnClick = TWCClick
+    end
+    object TNowc: TToolButton
+      Left = 284
+      Top = 0
+      AutoSize = True
+      Caption = #25764#38144#23436#25104
+      ImageIndex = 11
+      Visible = False
+      OnClick = TNowcClick
+    end
+    object ToolButton2: TToolButton
+      Left = 387
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton2Click
+    end
+    object ToolButton1: TToolButton
+      Left = 490
+      Top = 0
+      AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 28
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 561
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel [1]
+    Left = 0
+    Top = 30
+    Width = 1540
+    Height = 91
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    ParentBackground = False
+    TabOrder = 5
+    object Label3: TLabel
+      Left = 24
+      Top = 51
+      Width = 64
+      Height = 21
+      Caption = #21333#25454#32534#21495
+    end
+    object Label1: TLabel
+      Left = 408
+      Top = 51
+      Width = 32
+      Height = 21
+      Caption = #23458#25143
+    end
+    object Label2: TLabel
+      Left = 216
+      Top = 51
+      Width = 64
+      Height = 21
+      Caption = #33394#24067#21517#31216
+    end
+    object Label4: TLabel
+      Left = 568
+      Top = 51
+      Width = 48
+      Height = 21
+      Caption = #21512#21516#21495
+    end
+    object TMMNo: TcxTextEdit
+      Tag = 2
+      Left = 92
+      Top = 47
+      TabOrder = 0
+      OnKeyPress = TMMNoKeyPress
+      Width = 120
+    end
+    object CustName: TcxTextEdit
+      Tag = 2
+      Left = 444
+      Top = 47
+      TabOrder = 1
+      OnKeyPress = TMMNoKeyPress
+      Width = 120
+    end
+    object C_Name: TcxTextEdit
+      Tag = 2
+      Left = 284
+      Top = 47
+      TabOrder = 2
+      OnKeyPress = TMMNoKeyPress
+      Width = 120
+    end
+    object ConNo: TcxTextEdit
+      Tag = 2
+      Left = 620
+      Top = 47
+      TabOrder = 3
+      OnKeyPress = TMMNoKeyPress
+      Width = 120
+    end
+    inline frmFrameDateSel1: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 1536
+      Height = 37
+      Align = alTop
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
+      TabOrder = 4
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 1536
+      ExplicitHeight = 37
+      inherited lbl2: TLabel
+        Width = 16
+        Height = 21
+        ExplicitWidth = 16
+        ExplicitHeight = 21
+      end
+    end
+  end
+  object cxGrid1: TcxGrid [2]
+    Left = 0
+    Top = 152
+    Width = 1540
+    Height = 442
+    Align = alClient
+    PopupMenu = PM_1
+    TabOrder = 3
+    object Tv1: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      OnCellDblClick = Tv1CellDblClick
+      DataController.DataSource = DataSource1
+      DataController.Filter.AutoDataSetFilter = True
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        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
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      OptionsView.IndicatorWidth = 30
+      object v1Column16: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #21333#25454#32534#21495
+        DataBinding.FieldName = 'TMMNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
+      object v1OrdDate: TcxGridDBColumn
+        Caption = #21046#21333#26085#26399
+        DataBinding.FieldName = 'TMMDate'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.ShowTime = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #32463#33829#21333#20301
+        DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object v1DeliveryDate: TcxGridDBColumn
+        Caption = #20132#36135#26085#26399
+        DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.ShowTime = False
+        OnCustomDrawCell = v1DeliveryDateCustomDrawCell
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #21046#21333#20154
+        DataBinding.FieldName = 'FILLER'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'OrdNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #21457#36135#22320#22336
+        DataBinding.FieldName = 'ShippingAddress'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #32852#31995#26041#24335
+        DataBinding.FieldName = 'CONTACT'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #33394#24067#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column17: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 58
+      end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #25253#21333#25968#37327
+        DataBinding.FieldName = 'OrderQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 104
+      end
+      object Tv1Column13: TcxGridDBColumn
+        Caption = #25253#21333#21333#20301
+        DataBinding.FieldName = 'OrderUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 91
+      end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #27004#23618
+        DataBinding.FieldName = 'StkPosition'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 95
+      end
+      object Tv1Column16: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column20: TcxGridDBColumn
+        Caption = #32039#24613#31243#24230
+        DataBinding.FieldName = 'Urgent'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        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
+    end
+  end
+  object cxTabControl1: TcxTabControl [3]
+    Left = 0
+    Top = 121
+    Width = 1540
+    Height = 31
+    Align = alTop
+    TabOrder = 2
+    Visible = False
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 9
+    Properties.TabIndex = 0
+    Properties.Tabs.Strings = (
+      '      '#24453#21457#36135'      '
+      '      '#24050#23436#25104'      '
+      '      '#20840#37096'      ')
+    OnChange = cxTabControl1Change
+    ExplicitTop = 127
+    ClientRectBottom = 31
+    ClientRectRight = 1540
+    ClientRectTop = 28
+  end
+  inherited loadProcess: TPanel
+    Left = 272
+    Top = 346
+    ExplicitLeft = 272
+    ExplicitTop = 346
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 264
+    Top = 256
+    ExplicitLeft = 264
+    ExplicitTop = 256
+    ExplicitHeight = 29
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 814
+    Top = 190
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 896
+    Top = 190
+  end
+  object cxgrdpmn1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 814
+    Top = 314
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Parameters = <>
+    Left = 978
+    Top = 190
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 1142
+    Top = 190
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 896
+    Top = 252
+  end
+  object DataSource1: TDataSource
+    DataSet = Order_Main
+    Left = 1060
+    Top = 314
+  end
+  object Order_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1060
+    Top = 252
+  end
+  object ADOQuerySub: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Parameters = <>
+    Left = 814
+    Top = 252
+  end
+  object DataSource2: TDataSource
+    DataSet = ORDER_SUB
+    Left = 1142
+    Top = 314
+  end
+  object ADOQueryImage: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    EnableBCD = False
+    Parameters = <>
+    Left = 1060
+    Top = 190
+  end
+  object DSImage: TDataSource
+    DataSet = ADOQueryImage
+    Left = 814
+    Top = 376
+  end
+  object IdFTP1: TIdFTP
+    ConnectTimeout = 0
+    NATKeepAlive.UseKeepAlive = False
+    NATKeepAlive.IdleTimeMS = 0
+    NATKeepAlive.IntervalMS = 0
+    ProxySettings.ProxyType = fpcmNone
+    ProxySettings.Port = 0
+    ReadTimeout = 0
+    Left = 896
+    Top = 376
+  end
+  object ORDER_SUB: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1142
+    Top = 252
+  end
+  object PopupMenu2: TPopupMenu
+    Left = 1060
+    Top = 376
+    object N3: TMenuItem
+      Caption = #20840#36873
+      OnClick = N3Click
+    end
+    object N4: TMenuItem
+      Caption = #20840#24323
+      OnClick = N4Click
+    end
+    object N2: TMenuItem
+      Caption = #22797#21046
+    end
+  end
+  object cxgrdpmn2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 896
+    Top = 314
+  end
+  object CDS_WXTS: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 978
+    Top = 252
+  end
+  object PM_1: TPopupMenu
+    Left = 978
+    Top = 376
+    object N1: TMenuItem
+      Caption = #22797#21046
+      OnClick = N1Click
+    end
+    object xxx1: TMenuItem
+      Caption = 'xxx'
+    end
+  end
+  object GPM_3: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 978
+    Top = 314
+  end
+end
--- a/T02贸易汇总仓库/U_TradeXinYuOutTHList.pas
+++ b/T02贸易汇总仓库/U_TradeXinYuOutTHList.pas
@ -0,0 +1,501 @@
+unit U_TradeXinYuOutTHList;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
+  cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxMemo,
+  cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit,
+  StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
+  cxCurrencyEdit, cxImage, cxDBEdit, Menus, RM_Common, RM_Class, RM_e_Xls,
+  RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu,
+  cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
+  IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
+  dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
+  dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
+  dxSkinsDefaultPainters, Vcl.DBCtrls;
+
+type
+  TfrmTradeXinYuOutTHList = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    Tv1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    cxgrdpmn1: TcxGridPopupMenu;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    Label3: TLabel;
+    TMMNo: TcxTextEdit;
+    v1OrdDate: TcxGridDBColumn;
+    v1DeliveryDate: TcxGridDBColumn;
+    Order_Main: TClientDataSet;
+    ADOQuerySub: TADOQuery;
+    DataSource2: TDataSource;
+    cxTabControl1: TcxTabControl;
+    TWC: TToolButton;
+    TNowc: TToolButton;
+    ADOQueryImage: TADOQuery;
+    DSImage: TDataSource;
+    IdFTP1: TIdFTP;
+    v1Column16: TcxGridDBColumn;
+    ORDER_SUB: TClientDataSet;
+    PopupMenu2: TPopupMenu;
+    N3: TMenuItem;
+    N4: TMenuItem;
+    Label1: TLabel;
+    CustName: TcxTextEdit;
+    Tv1Column6: TcxGridDBColumn;
+    cxgrdpmn2: TcxGridPopupMenu;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Label2: TLabel;
+    C_Name: TcxTextEdit;
+    CDS_WXTS: TClientDataSet;
+    Label4: TLabel;
+    ConNo: TcxTextEdit;
+    ToolButton2: TToolButton;
+    PM_1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    GPM_3: TcxGridPopupMenu;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    frmFrameDateSel1: TfrmFrameDateSel;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    TBFind: TToolButton;
+    xxx1: TMenuItem;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    ToolButton3: TToolButton;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure OrderNoMChange(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBTPClick(Sender: TObject);
+    procedure CheckBox1Click(Sender: TObject);
+    procedure CheckBox2Click(Sender: TObject);
+    procedure Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+    procedure v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure TMMNoKeyPress(Sender: TObject; var Key: Char);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure TWCClick(Sender: TObject);
+    procedure TNowcClick(Sender: TObject);
+    procedure N3Click(Sender: TObject);
+    procedure N4Click(Sender: TObject);
+    procedure ComboBox1Change(Sender: TObject);
+    procedure CustomerNoNameKeyPress(Sender: TObject; var Key: Char);
+    procedure ToolButton10Click(Sender: TObject);
+    procedure JGTypeChange(Sender: TObject);
+    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+  private
+    DQdate: TDateTime;
+    procedure InitGrid();
+    procedure InitForm();
+    procedure SetStatus();
+    { Private declarations }
+  public
+    FFInt, FCloth: Integer;
+    canshu1, canshu2, canshu4: string;
+    fFlileFlag: string;
+    FNOTE: string;
+    FOrdType: string;
+    { Public declarations }
+  end;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_RPFun, U_ZDYHelp, U_LabelPrint;
+
+{$R *.dfm}
+
+procedure TfrmTradeXinYuOutTHList.SetStatus();
+begin
+
+  case cxTabControl1.TabIndex of
+    0:
+      begin
+
+      end;
+
+  end;
+
+end;
+
+procedure TfrmTradeXinYuOutTHList.JGTypeChange(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.FormDestroy(Sender: TObject);
+begin
+  inherited;
+//  frmProductOrderList:=nil;
+end;
+
+procedure TfrmTradeXinYuOutTHList.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmTradeXinYuOutTHList.FormCreate(Sender: TObject);
+begin
+  inherited;
+  cxgrid1.Align := alClient;
+  DQdate := SGetServerDate(ADOQueryTemp);
+
+end;
+
+procedure TfrmTradeXinYuOutTHList.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+
+end;
+
+procedure TfrmTradeXinYuOutTHList.InitGrid();
+var
+  SqlStr, FilterStr: string;
+begin
+  FilterStr := SGetFilters(Panel1, 1, 2);
+
+  SqlStr := ' exec  P_BS_Cloth_Xinyu_Out_TH  ';
+  SqlStr := SqlStr + '  @BegDate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)));
+  SqlStr := SqlStr + ' ,@EndDate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)));
+
+  //  case cxTabControl1.TabIndex of
+  //    0:
+  //      begin
+  //        SqlStr := SqlStr + ' , @Status=''9'' ';
+  //      end;
+  //    1:
+  //      begin
+  //        SqlStr := SqlStr + ' , @Status=''10'' ';
+  //      end;
+  //
+  //  end;
+
+  InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId');
+end;
+
+procedure TfrmTradeXinYuOutTHList.InitForm();
+begin
+  ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, '贸易汇总仓库');
+  frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180;
+  frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
+
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.OrderNoMChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active = False then
+    Exit;
+  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  SCreateCDS(ADOQueryMain, Order_Main);
+  SInitCDSData(ADOQueryMain, Order_Main);
+end;
+
+procedure TfrmTradeXinYuOutTHList.FormShow(Sender: TObject);
+begin
+  inherited;
+  canshu1 := trim(self.fParameters1);
+  canshu2 := trim(self.fParameters2);
+  canshu4 := trim(self.fParameters4);
+  fFlileFlag := UserDataFlag + 'HX';
+  cxTabControl1.TabIndex := 0;
+  InitForm();
+end;
+
+procedure TfrmTradeXinYuOutTHList.TBTPClick(Sender: TObject);
+var
+  FQty, FQty1, FMxQty, FPQty, FMxQtyS, FPQtyS: string;
+begin
+end;
+
+procedure TfrmTradeXinYuOutTHList.CheckBox1Click(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.CheckBox2Click(Sender: TObject);
+begin
+  TBRafresh.Click;
+end;
+
+procedure TfrmTradeXinYuOutTHList.Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+var
+  id, id10: Integer;
+begin
+  {try
+    if Tv1.GroupedItemCount=0 then
+    begin
+      Id:=Tv1.GetColumnByFieldName('DeliveryDate').Index-tv1.GroupedItemCount;
+      Id10:=Tv1.GetColumnByFieldName('SubStatus').Index-tv1.GroupedItemCount;
+      if Trim(VarToStr(ARecord.Values[id]))='' then Exit;
+      if Id<0 then Exit;
+      if ARecord.Values[id10]='完成' then exit;
+      if (ARecord.Values[id]-DQdate)>=4 then Exit;
+      if ((ARecord.Values[id]-DQdate)>=0) and ((ARecord.Values[id]-DQdate)<4) then
+        AStyle:=DataLink_.QHuangSe
+      else
+      if ARecord.Values[id]-DQdate<0 then
+      begin
+        AStyle:=DataLink_OrderManage.FenHongS;
+      end;
+    end else
+    begin
+
+    end;
+  except
+  end; }
+end;
+
+procedure TfrmTradeXinYuOutTHList.v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+begin
+ { Id:=TV1.GetColumnByFieldName('DeliveryDate').Index;//;-TV1.GroupedItemCount;
+  Id10:=TV1.GetColumnByFieldName('SubStatus').Index;
+  if Id<0 then Exit;
+  if AViewInfo.GridRecord.Values[Id10]='完成' then Exit;
+  if AViewInfo.GridRecord.Values[Id]-SGetServerDate(ADOQueryTemp)>=4 then Exit;
+  if ((AViewInfo.GridRecord.Values[id]-SGetServerDate(ADOQueryTemp))>=0) and ((AViewInfo.GridRecord.Values[id]-SGetServerDate(ADOQueryTemp))<4) then
+    ACanvas.Brush.Color:=clYellow
+  else
+  if (AViewInfo.GridRecord.Values[id])-(SGetServerDate(ADOQueryTemp)<0) then
+  begin
+    ACanvas.Brush.Color:=clRed;
+  end;
+  begin
+    ACanvas.Brush.Color:=clRed;
+  end else
+  if AViewInfo.GridRecord.Values[Id]='Purple' then
+  begin
+    ACanvas.Brush.Color:=clPurple;
+  end else
+  if AViewInfo.GridRecord.Values[Id]='Olive' then
+  begin
+    ACanvas.Brush.Color:=clOlive;
+  end else
+  if AViewInfo.GridRecord.Values[Id]='Teal' then
+  begin
+    ACanvas.Brush.Color:=clTeal;
+  end else
+  if AViewInfo.GridRecord.Values[Id]='Background' then
+  begin
+    ACanvas.Brush.Color:=clBackground;
+  end;   }
+end;
+
+procedure TfrmTradeXinYuOutTHList.TMMNoKeyPress(Sender: TObject; var Key: Char);
+begin
+
+  if Key = #13 then
+  begin
+    initgrid();
+  end;
+end;
+
+procedure TfrmTradeXinYuOutTHList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
+procedure TfrmTradeXinYuOutTHList.cxTabControl1Change(Sender: TObject);
+begin
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.TWCClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+
+  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  Trade_Market_Main SET status=''10'' ');
+      sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+
+      sql.Add(' update  Trade_Market_Sub SET OutQty=(select sum(qty) from Trade_Market_Sub_Qty x where x.TMSId = Trade_Market_Sub.TMSID) ');
+      sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+
+      sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
+      sql.Add('values(''贸易布坯出库''    ');
+      sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+      sql.Add(',''完成''   ');
+      sql.Add(',' + quotedstr(DName));
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+      sql.Add(')  ');
+
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('计划单完成')));
+      sql.Add(',' + quotedstr(trim('计划单号：' + trim(Order_Main.FieldByName('TMMNO').AsString))));
+      sql.Add(',' + quotedstr(trim('成功')));
+      sql.Add(')');
+      execsql;
+    end;
+
+    application.MessageBox('计划单完成成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    application.MessageBox('计划单完成失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmTradeXinYuOutTHList.TNowcClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+
+  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  Trade_Market_Main SET status=''9'' ');
+      sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+
+      sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
+      sql.Add('values(''贸易布坯出库''    ');
+      sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+      sql.Add(',''完成''   ');
+      sql.Add(',' + quotedstr(DName));
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+      sql.Add(')  ');
+
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('计划单撤销完成')));
+      sql.Add(',' + quotedstr(trim('计划单号：' + trim(Order_Main.FieldByName('TMMNO').AsString))));
+      sql.Add(',' + quotedstr(trim('成功')));
+      sql.Add(')');
+      execsql;
+    end;
+    application.MessageBox('计划单撤销完成成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    application.MessageBox('计划单撤销完成失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmTradeXinYuOutTHList.N1Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
+procedure TfrmTradeXinYuOutTHList.N3Click(Sender: TObject);
+begin
+  SelOKNoFiler(Tv1, True); //全选
+end;
+
+procedure TfrmTradeXinYuOutTHList.N4Click(Sender: TObject);
+begin
+  SelOKNoFiler(Tv1, False); //全弃
+end;
+
+procedure TfrmTradeXinYuOutTHList.ComboBox1Change(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmTradeXinYuOutTHList.CustomerNoNameKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #13 then
+  begin
+    InitGrid();
+  end;
+end;
+
+procedure TfrmTradeXinYuOutTHList.ToolButton10Click(Sender: TObject);
+begin
+
+  application.MessageBox('保存成功！', '提示信息', 0);
+end;
+
+procedure TfrmTradeXinYuOutTHList.ToolButton1Click(Sender: TObject);
+begin
+  TcxGridToExcel(Trim(Self.Caption), cxGrid1);
+end;
+
+procedure TfrmTradeXinYuOutTHList.ToolButton2Click(Sender: TObject);
+begin
+  WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, '贸易汇总仓库');
+end;
+
+procedure TfrmTradeXinYuOutTHList.ToolButton3Click(Sender: TObject);
+var
+  MFiltration: string;
+  MPrintJson: string;
+begin
+
+  if Order_Main.IsEmpty then
+    Exit;
+
+  MFiltration := Trim(Order_Main.FieldByName('TMMNo').AsString);
+  MPrintJson := '              {"LMType": "TradeXinYuOut1"    ';
+  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 TfrmTradeXinYuOutTHList.TBFindClick(Sender: TObject);
+begin
+
+  CDSDataFilter(ADOQueryMain, Order_Main, Tv1, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, '  {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + '"  }');
+
+end;
+
+end.
+
--- a/T02贸易汇总仓库/U_TradeXinYuTHStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeXinYuTHStkList.dfm
@ -0,0 +1,365 @@
+inherited frmTradeXinYuthStkList: TfrmTradeXinYuthStkList
+  Left = 105
+  Top = 131
+  Caption = #26032#20313#38646#21806#24211#23384
+  ClientHeight = 515
+  ClientWidth = 1404
+  Color = clBtnFace
+  Font.Height = -16
+  FormStyle = fsMDIChild
+  Position = poDefault
+  Visible = True
+  ExplicitWidth = 1420
+  ExplicitHeight = 554
+  PixelsPerInch = 96
+  TextHeight = 21
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1404
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 83
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    Images = DataLink_TradeTotalClothStk.cxImageList_bar
+    List = True
+    ParentColor = False
+    ParentFont = False
+    ShowCaptions = True
+    TabOrder = 2
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      Visible = False
+      OnClick = TBFindClick
+    end
+    object ToolButton3: TToolButton
+      Left = 126
+      Top = 0
+      AutoSize = True
+      Caption = #26631#31614#25171#21360
+      ImageIndex = 21
+    end
+    object ToolButton2: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton2Click
+    end
+    object TBClose: TToolButton
+      Left = 300
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel [1]
+    Left = 0
+    Top = 30
+    Width = 1404
+    Height = 59
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    ParentBackground = False
+    ParentColor = True
+    TabOrder = 3
+    object Label3: TLabel
+      Left = 28
+      Top = 18
+      Width = 32
+      Height = 21
+      Caption = #21697#21517
+    end
+    object Label4: TLabel
+      Left = 598
+      Top = 18
+      Width = 32
+      Height = 21
+      Caption = #32534#21495
+    end
+    object Label2: TLabel
+      Left = 408
+      Top = 18
+      Width = 32
+      Height = 21
+      Caption = #39068#33394
+    end
+    object Label6: TLabel
+      Left = 218
+      Top = 18
+      Width = 32
+      Height = 21
+      Caption = #33394#21495
+    end
+    object C_name: TcxTextEdit
+      Tag = 2
+      Left = 64
+      Top = 14
+      Properties.OnChange = FromCoNamePropertiesChange
+      TabOrder = 0
+      OnKeyPress = C_CodeKeyPress
+      Width = 150
+    end
+    object C_Code: TcxTextEdit
+      Tag = 2
+      Left = 634
+      Top = 14
+      Properties.OnChange = FromCoNamePropertiesChange
+      TabOrder = 1
+      OnKeyPress = C_CodeKeyPress
+      Width = 150
+    end
+    object C_Color: TcxTextEdit
+      Tag = 2
+      Left = 444
+      Top = 14
+      Properties.OnChange = FromCoNamePropertiesChange
+      TabOrder = 2
+      OnKeyPress = C_CodeKeyPress
+      Width = 150
+    end
+    object C_ColorNo: TcxTextEdit
+      Tag = 2
+      Left = 254
+      Top = 14
+      Properties.OnChange = FromCoNamePropertiesChange
+      TabOrder = 3
+      OnKeyPress = C_CodeKeyPress
+      Width = 150
+    end
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 461
+    Top = 353
+    ExplicitLeft = 461
+    ExplicitTop = 353
+    ExplicitHeight = 29
+  end
+  object cxGrid2: TcxGrid [4]
+    Left = 0
+    Top = 89
+    Width = 1404
+    Height = 426
+    Align = alClient
+    PopupMenu = PopupMenu1
+    TabOrder = 4
+    object TV2: TcxGridDBTableView
+      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 = 77
+      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 = 77
+      end
+      object cxGridDBColumn24: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object cxGridDBColumn26: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object cxGridDBColumn29: TcxGridDBColumn
+        Caption = #33457#22411
+        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      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 = 77
+      end
+      object cxGridDBColumn28: TcxGridDBColumn
+        Caption = #31867#22411
+        DataBinding.FieldName = 'C_Degree'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object cxGridDBColumn15: TcxGridDBColumn
+        Caption = #21305#25968
+        DataBinding.FieldName = 'StkPieceint'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object cxGridDBColumn16: TcxGridDBColumn
+        Tag = 2
+        Caption = #25968#37327
+        DataBinding.FieldName = 'StkQty'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = TV2
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 524
+    Top = 181
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Left = 606
+    Top = 181
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    Parameters = <>
+    Left = 688
+    Top = 181
+  end
+  object ADO_2: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 524
+    Top = 243
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 770
+    Top = 181
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 688
+    Top = 305
+    object N1: TMenuItem
+      Caption = #20840#36873
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+    end
+  end
+  object GPM_2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 852
+    Top = 243
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 688
+    Top = 243
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 606
+    Top = 305
+  end
+end
--- a/T02贸易汇总仓库/U_TradeXinYuTHStkList.pas
+++ b/T02贸易汇总仓库/U_TradeXinYuTHStkList.pas
@ -0,0 +1,177 @@
+unit U_TradeXinYuTHStkList;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Vcl.Printers, Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+  cxDataStorage, cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+  cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
+  cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
+  ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
+  cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
+  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
+  dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer,
+  cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters,
+  cxPC;
+
+type
+  TfrmTradeXinYuthStkList = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    ADOQueryCmd: TADOQuery;
+    ADO_2: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    PopupMenu1: TPopupMenu;
+    Label3: TLabel;
+    Label4: TLabel;
+    Label2: TLabel;
+    C_name: TcxTextEdit;
+    C_Code: TcxTextEdit;
+    C_Color: TcxTextEdit;
+    ToolButton2: TToolButton;
+    Label6: TLabel;
+    C_ColorNo: TcxTextEdit;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    ToolButton3: TToolButton;
+    GPM_2: TcxGridPopupMenu;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridDBColumn29: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
+    procedure MPRTCodeNameChange(Sender: TObject);
+    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure FromCoNamePropertiesChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure C_CodeKeyPress(Sender: TObject; var Key: Char);
+  private
+    canshu1, FSTKName, canshu3, canshu4: string;
+    procedure InitGrid2();
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  frmTradeXinYuthStkList: TfrmTradeXinYuthStkList;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_PrintLabFun, U_dynamicsDll, U_printPdf,
+  U_TradeClothSplit, U_LabelPrint;
+
+{$R *.dfm}
+
+procedure TfrmTradeXinYuthStkList.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmTradeXinYuTHStkList := nil;
+end;
+
+procedure TfrmTradeXinYuthStkList.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmTradeXinYuthStkList.FormCreate(Sender: TObject);
+begin
+  inherited;
+  canshu1 := Trim(self.fParameters1);
+  FSTKName := Trim(self.fParameters2);
+  canshu3 := Trim(self.fParameters3);
+  canshu4 := Trim(self.fParameters4);
+end;
+
+procedure TfrmTradeXinYuthStkList.InitGrid2();
+var
+  SqlStr: string;
+begin
+
+  SqlStr := ' EXEC P_BS_Cloth_Xinyu_Stk_TH';
+
+//  ShowMessage(SqlStr);
+  InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
+
+end;
+
+procedure TfrmTradeXinYuthStkList.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid2();
+end;
+
+procedure TfrmTradeXinYuthStkList.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+end;
+
+procedure TfrmTradeXinYuthStkList.FormShow(Sender: TObject);
+begin
+  inherited;
+
+  ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'Ã³Ò×»ã×Ü²Ö¿â');
+  canshu4 := Trim(self.fParameters4);
+  InitGrid2();
+end;
+
+procedure TfrmTradeXinYuthStkList.C_CodeKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #13 then
+    TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuthStkList.FromCoNamePropertiesChange(Sender: TObject);
+begin
+  if Length(Trim(TcxTextEdit(Sender).Text)) < 4 then
+    Exit;
+  TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuthStkList.TBFindClick(Sender: TObject);
+begin
+
+  CDSDataFilter(ADO_2, CDS_2, Tv2, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, '  {"EquTag": 1,"LikeTag": 2,"Fields": "C_name|C_Color|C_ColorNo"}') + '"  }');
+
+end;
+
+procedure TfrmTradeXinYuthStkList.MPRTCodeNameChange(Sender: TObject);
+begin
+  TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuthStkList.ToolButton2Click(Sender: TObject);
+begin
+  WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'Ã³Ò×»ã×Ü²Ö¿â');
+end;
+
+procedure TfrmTradeXinYuthStkList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+  ModalResult := 1;
+end;
+
+end.
+
--- a/T02贸易汇总仓库/testDll.res
+++ b/T02贸易汇总仓库/testDll.res
--- a/T03贸易布匹检验/DjdMachineInsp.dproj
+++ b/T03贸易布匹检验/DjdMachineInsp.dproj
@ -90,7 +90,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>E:\rtgit\trade\D10xhGemei\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/T03贸易布匹检验/DjdMachineInsp.skincfg
+++ b/T03贸易布匹检验/DjdMachineInsp.skincfg
@ -1,6 +1,6 @@
 [ExpressSkins]
 Default=1
-ShowNotifications=0
+ShowNotifications=1
 Enabled=1
 dxSkinBasic=0
 dxSkinBlack=0
@ -51,7 +51,7 @@ dxSkinStardust=0
 dxSkinSummer2008=0
 dxSkinTheAsphaltWorld=0
 dxSkinTheBezier=0
-dxSkinsDefaultPainters=0
+dxSkinsDefaultPainters=1
 dxSkinValentine=0
 dxSkinVisualStudio2013Blue=0
 dxSkinVisualStudio2013Dark=0
--- a/T03贸易布匹检验/U_DataLink.pas
+++ b/T03贸易布匹检验/U_DataLink.pas
@ -7,7 +7,7 @@ uses
  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
    System.ImageList,U_BaseDataLink, 
  dxCore, cxLocalization, dxLayoutLookAndFeels, cxImageList, cxGraphics, cxEdit,
-  cxContainer, dxSkinsForm, dxSkinsCore, dxSkinWXI;
+  cxContainer, dxSkinsForm, dxSkinsCore, dxSkinWXI, dxSkinsDefaultPainters;

 type
  TMyThread = class(TThread)
--- a/T03贸易布匹检验/U_DeviceJkTest.pas
+++ b/T03贸易布匹检验/U_DeviceJkTest.pas
@ -12,7 +12,7 @@ uses
  cxClasses, cxGridCustomView, cxGridCustomTableView, cxGridTableView,
  cxGridDBTableView, cxGrid, cxDropDownEdit, Vcl.ComCtrls, Vcl.ToolWin,
  Datasnap.DBClient, cxMaskEdit, Vcl.Buttons, U_BaseList, cxProgressBar,
-  dxSkinsCore, Vcl.ExtCtrls;
+  dxSkinsCore, Vcl.ExtCtrls, dxSkinsDefaultPainters;

 type
  TfrmDeviceJkTest = class(TfrmBaseList)
--- a/T03贸易布匹检验/U_KeyBoard.dfm
+++ b/T03贸易布匹检验/U_KeyBoard.dfm
@ -12,27 +12,44 @@ object FrameKeyBoard: TFrameKeyBoard
    Align = alClient
    Frame.Visible = False
    TabOrder = 0
-    ExplicitHeight = 192
    object SpeedButton1: TSpeedButton
      Left = 1
      Top = 2
      Width = 60
      Height = 60
      Caption = '1'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton4: TSpeedButton
      Left = 1
-      Top = 63
+      Top = 64
      Width = 60
      Height = 60
      Caption = '4'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton7: TSpeedButton
      Left = 1
-      Top = 125
+      Top = 126
      Width = 60
      Height = 60
      Caption = '7'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton2: TSpeedButton
      Left = 62
@ -40,13 +57,25 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '2'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton5: TSpeedButton
      Left = 62
-      Top = 63
+      Top = 64
      Width = 60
      Height = 60
      Caption = '5'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton8: TSpeedButton
      Left = 62
@ -54,6 +83,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '8'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton3: TSpeedButton
      Left = 124
@ -61,6 +96,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '3'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton6: TSpeedButton
      Left = 124
@ -68,6 +109,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '6'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton9: TSpeedButton
      Tag = 9
@ -76,6 +123,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '9'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton_back: TSpeedButton
      Left = 186
@ -83,6 +136,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = #8592
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton0: TSpeedButton
      Left = 186
@ -90,6 +149,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '0'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton_dot: TSpeedButton
      Left = 186
@ -97,6 +162,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = '.'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton_yc: TSpeedButton
      Tag = 9
@ -105,6 +176,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = #38544#34255
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton_zdykey2: TSpeedButton
      Tag = 9
@ -113,6 +190,12 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = 'C'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton_zdykey1: TSpeedButton
      Tag = 9
@ -121,13 +204,51 @@ object FrameKeyBoard: TFrameKeyBoard
      Width = 60
      Height = 60
      Caption = 'A'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
    object SpeedButton10: TSpeedButton
-      Left = 2
-      Top = 187
+      Left = 248
+      Top = 188
      Width = 60
      Height = 44
      Caption = '-'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object SpeedButton11: TSpeedButton
+      Left = 1
+      Top = 188
+      Width = 60
+      Height = 44
+      Caption = #8593
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object SpeedButton12: TSpeedButton
+      Left = 62
+      Top = 188
+      Width = 60
+      Height = 44
+      Caption = #8595
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
    end
  end
 end
--- a/T03贸易布匹检验/U_KeyBoard.pas
+++ b/T03贸易布匹检验/U_KeyBoard.pas
@ -7,7 +7,7 @@ uses
  Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls,
  cxLookAndFeels, cxLookAndFeelPainters,  
  dxLayoutContainer, cxClasses, Vcl.Buttons, dxLayoutControl, cxGeometry,
-  dxFramedControl, dxPanel, dxSkinsCore, dxSkinWXI;
+  dxFramedControl, dxPanel, dxSkinsCore, dxSkinWXI, dxSkinsDefaultPainters;

 type
  TFrameKeyBoard = class(TFrame)
@ -28,6 +28,8 @@ type
    SpeedButton_zdykey2: TSpeedButton;
    SpeedButton_zdykey1: TSpeedButton;
    SpeedButton10: TSpeedButton;
+    SpeedButton11: TSpeedButton;
+    SpeedButton12: TSpeedButton;
  private
    { Private declarations }
  public
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
--- a/T03贸易布匹检验/U_ParamSet.dfm
+++ b/T03贸易布匹检验/U_ParamSet.dfm
@ -21,15 +21,9 @@ object frmParamSet: TfrmParamSet
  object Label33: TLabel
    Left = 13
    Top = 69
-    Width = 60
-    Height = 20
+    Width = 64
+    Height = 21
    Caption = #37325#37327#20445#30041
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clBlack
-    Font.Height = -15
-    Font.Name = #24494#36719#38597#40657
-    Font.Style = []
-    ParentFont = True
  end
  inline FrameParam1: TFrameParam
    Left = 0
@ -37,57 +31,127 @@ object frmParamSet: TfrmParamSet
    Width = 775
    Height = 519
    Align = alTop
-    Font.Charset = ANSI_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -19
-    Font.Name = #24494#36719#38597#40657
-    Font.Style = []
-    ParentFont = True
    TabOrder = 0
    ExplicitTop = 50
    ExplicitWidth = 775
    ExplicitHeight = 519
+    inherited Label4: TLabel
+      Width = 64
+      Height = 21
+      ExplicitWidth = 64
+      ExplicitHeight = 21
+    end
    inherited pnlSet: TPanel
      Width = 775
      Height = 519
      ExplicitWidth = 775
      ExplicitHeight = 519
      inherited cxGroupBox1: TcxGroupBox
-        Style.Font.Charset = GB2312_CHARSET
-        Style.IsFontAssigned = True
        ExplicitTop = 2
        ExplicitWidth = 771
        Width = 771
+        inherited Label16: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label7: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label35: TLabel
+          Width = 16
+          Height = 21
+          ExplicitWidth = 16
+          ExplicitHeight = 21
+        end
        inherited Label34: TLabel
+          Width = 32
+          Height = 21
          Visible = True
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label26: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label6: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label8: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label10: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
        end
        inherited edtMaBiao: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 29
        end
        inherited edtMBDW: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 29
        end
        inherited edtChen: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 29
        end
        inherited outPage: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 29
+        end
+        inherited labNumber: TComboBox
+          Height = 29
+          ExplicitHeight = 29
        end
        inherited AddwetPresent: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited AddLenPresent: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited presentNumFlag: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
      end
      inherited cxGroupBox2: TcxGroupBox
-        Style.Font.Charset = GB2312_CHARSET
-        Style.IsFontAssigned = True
        ExplicitWidth = 771
        Width = 771
+        inherited Label9: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label15: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label1: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label2: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
        inherited MinLen: TcxTextEdit
          Left = 53
          Top = 27
@ -95,39 +159,75 @@ object frmParamSet: TfrmParamSet
          Touch.TabletOptions = []
          ExplicitLeft = 53
          ExplicitTop = 27
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited MaxLen: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited MinWeight: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited MaxWeight: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited BeginPieceNo: TcxTextEdit
          Top = 64
          Properties.OnChange = FrameParam1BeginPieceNoPropertiesChange
          ExplicitTop = 64
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited EndPieceNo: TcxTextEdit
          Properties.OnChange = FrameParam1EndPieceNoPropertiesChange
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
      end
      inherited cxGroupBox3: TcxGroupBox
        ExplicitWidth = 771
        Width = 771
+        inherited Label19: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label20: TLabel
+          Width = 16
+          Height = 21
+          ExplicitWidth = 16
+          ExplicitHeight = 21
+        end
+        inherited Label21: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label3: TLabel
+          Width = 16
+          Height = 21
+          ExplicitWidth = 16
+          ExplicitHeight = 21
+        end
+        inherited Label30: TLabel
+          Width = 16
+          Height = 21
+          ExplicitWidth = 16
+          ExplicitHeight = 21
+        end
+        inherited Label33: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
        inherited MPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited YPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited KgPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
      end
      inherited cxGroupBox4: TcxGroupBox
@ -135,22 +235,48 @@ object frmParamSet: TfrmParamSet
        ExplicitHeight = 133
        Height = 133
        Width = 771
+        inherited Label31: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label41: TLabel
+          Width = 32
+          Height = 21
+          ExplicitWidth = 32
+          ExplicitHeight = 21
+        end
+        inherited Label5: TLabel
+          Width = 64
+          Height = 21
+          ExplicitWidth = 64
+          ExplicitHeight = 21
+        end
+        inherited Label11: TLabel
+          Width = 80
+          Height = 21
+          ExplicitWidth = 80
+          ExplicitHeight = 21
+        end
+        inherited Label12: TLabel
+          Width = 80
+          Height = 21
+          ExplicitWidth = 80
+          ExplicitHeight = 21
+        end
        inherited edtdabao: TcxTextEdit
-          Style.Font.Height = -16
-          Style.IsFontAssigned = True
-          ExplicitHeight = 34
+          ExplicitHeight = 29
        end
        inherited packRolls: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited rollnoMake: TcxComboBox
          Properties.DropDownListStyle = lsEditFixedList
-          Style.Font.Charset = GB2312_CHARSET
-          Style.IsFontAssigned = True
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited packNoMake: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
        inherited packPrintPreview: TCheckBox
          Top = 74
@ -159,17 +285,15 @@ object frmParamSet: TfrmParamSet
          ExplicitWidth = 128
        end
        inherited packlabNumber: TcxComboBox
-          Style.Font.Charset = GB2312_CHARSET
-          Style.IsFontAssigned = True
-          ExplicitHeight = 25
+          ExplicitHeight = 29
        end
        inherited packPrintAction: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 29
        end
      end
    end
    inherited weightRule: TcxComboBox
-      ExplicitHeight = 34
+      ExplicitHeight = 29
    end
  end
  object dxPanel1: TdxPanel
@ -186,12 +310,6 @@ object frmParamSet: TfrmParamSet
      Height = 38
      Caption = #30830#23450
      TabOrder = 0
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = [fsBold]
-      ParentFont = True
      OnClick = cxButton1Click
    end
    object cxButton2: TcxButton
@ -201,12 +319,6 @@ object frmParamSet: TfrmParamSet
      Height = 38
      Caption = #20851#38381
      TabOrder = 1
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = [fsBold]
-      ParentFont = True
      OnClick = cxButton2Click
    end
  end
@ -215,12 +327,10 @@ object frmParamSet: TfrmParamSet
    Top = 135
    Width = 200
    Height = 218
-    Color = clBtnFace
    DrawingStyle = dsGradient
    GradientEnd = clSilver
    GradientStart = clGray
    Layout = 'NumPad'
-    ParentColor = True
  end
  object cds_params: TClientDataSet
    Aggregates = <>
--- a/T03贸易布匹检验/U_ParamSet.pas
+++ b/T03贸易布匹检验/U_ParamSet.pas
@ -8,7 +8,8 @@ uses
  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, U_frameParam, cxGraphics, cxControls,
  cxLookAndFeels, cxLookAndFeelPainters,   cxGeometry,
  dxFramedControl, Vcl.Menus, Vcl.StdCtrls, cxButtons, dxPanel,
-  Vcl.Touch.Keyboard, Vcl.ExtCtrls, Data.DB, Datasnap.DBClient;
+  Vcl.Touch.Keyboard, Vcl.ExtCtrls, Data.DB, Datasnap.DBClient, dxSkinsCore,
+  dxSkinsDefaultPainters;

 type
  TfrmParamSet = class(TForm)
--- a/T03贸易布匹检验/U_frameParam.dfm
+++ b/T03贸易布匹检验/U_frameParam.dfm
@ -3,25 +3,13 @@ object FrameParam: TFrameParam
  Top = 0
  Width = 666
  Height = 509
-  Font.Charset = ANSI_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -13
-  Font.Name = #24494#36719#38597#40657
-  Font.Style = []
-  ParentFont = True
  TabOrder = 0
  object Label4: TLabel
    Left = 192
    Top = 57
-    Width = 76
-    Height = 25
+    Width = 48
+    Height = 13
    Caption = #21367#21495#29983#25104
-    Font.Charset = ANSI_CHARSET
-    Font.Color = clBlack
-    Font.Height = -19
-    Font.Name = #24494#36719#38597#40657
-    Font.Style = []
-    ParentFont = True
  end
  object pnlSet: TPanel
    Left = 0
@ -31,14 +19,7 @@ object FrameParam: TFrameParam
    Align = alClient
    BevelInner = bvRaised
    BevelOuter = bvLowered
-    Color = clBtnFace
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -16
-    Font.Name = #24494#36719#38597#40657
-    Font.Style = []
    ParentBackground = False
-    ParentFont = True
    TabOrder = 0
    ExplicitWidth = 605
    object cxGroupBox1: TcxGroupBox
@ -46,133 +27,70 @@ object FrameParam: TFrameParam
      Top = 2
      Align = alTop
      Caption = #35774#22791#35774#32622
-      ParentFont = True
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -13
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = [fsBold]
-      Style.IsFontAssigned = True
      TabOrder = 0
      ExplicitTop = -4
-      ExplicitWidth = 601
      Height = 122
      Width = 662
      object Label16: TLabel
        Left = 10
        Top = 28
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #30721#34920
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label7: TLabel
        Left = 106
        Top = 29
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #21333#20301
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label35: TLabel
        Left = 32
        Top = 71
-        Width = 15
-        Height = 20
+        Width = 12
+        Height = 13
        Caption = #31204
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label34: TLabel
        Left = 106
        Top = 71
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #31216#37325
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
        Visible = False
      end
      object Label26: TLabel
        Left = 262
        Top = 68
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #20986#32440
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label6: TLabel
        Left = 350
        Top = 65
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #20221#25968
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label8: TLabel
        Left = 260
        Top = 28
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #36192#36865#37325#37327
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label10: TLabel
        Left = 420
        Top = 26
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #36192#36865#38271#24230
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object edtMaBiao: TcxTextEdit
        Left = 59
        Top = 24
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -19
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 0
        Text = #8730
        OnClick = edtMaBiaoClick
@ -181,13 +99,6 @@ object FrameParam: TFrameParam
      object edtMBDW: TcxTextEdit
        Left = 154
        Top = 24
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -19
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 1
        Text = #8730
        OnClick = edtMaBiaoClick
@ -196,13 +107,6 @@ object FrameParam: TFrameParam
      object edtChen: TcxTextEdit
        Left = 59
        Top = 65
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -19
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 2
        Text = #8730
        OnClick = edtMaBiaoClick
@ -211,14 +115,7 @@ object FrameParam: TFrameParam
      object outPage: TcxTextEdit
        Left = 310
        Top = 59
-        ParentFont = True
        Properties.ReadOnly = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -19
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 3
        Text = #8730
        OnClick = edtMaBiaoClick
@ -228,15 +125,9 @@ object FrameParam: TFrameParam
        Left = 398
        Top = 63
        Width = 51
-        Height = 28
+        Height = 21
        Style = csDropDownList
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -20
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
        ItemIndex = 1
-        ParentFont = True
        TabOrder = 4
        Text = '2'
        Items.Strings = (
@ -248,26 +139,12 @@ object FrameParam: TFrameParam
      object AddwetPresent: TcxTextEdit
        Left = 330
        Top = 22
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 5
        Width = 74
      end
      object AddLenPresent: TcxTextEdit
        Left = 486
        Top = 24
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 6
        Width = 74
      end
@ -289,79 +166,40 @@ object FrameParam: TFrameParam
      Top = 124
      Align = alTop
      Caption = #21367#25968#25454#36755#20837#33539#22260#35774#32622
-      ParentFont = True
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -13
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = [fsBold]
-      Style.IsFontAssigned = True
      TabOrder = 1
-      ExplicitWidth = 601
      Height = 123
      Width = 662
      object Label9: TLabel
        Left = 10
        Top = 28
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #38271#24230
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label15: TLabel
        Left = 260
        Top = 29
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #37325#37327
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label1: TLabel
        Left = 10
        Top = 70
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #24320#22987#21367#21495
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label2: TLabel
        Left = 260
        Top = 72
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #25130#33267#21367#21495
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object MinLen: TcxTextEdit
        Left = 54
        Top = 26
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 0
        Text = '0'
        Width = 63
@ -369,13 +207,6 @@ object FrameParam: TFrameParam
      object MaxLen: TcxTextEdit
        Left = 123
        Top = 26
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 1
        Text = '100'
        Width = 63
@ -383,13 +214,6 @@ object FrameParam: TFrameParam
      object MinWeight: TcxTextEdit
        Left = 306
        Top = 26
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 2
        Text = '0'
        Width = 63
@ -397,13 +221,6 @@ object FrameParam: TFrameParam
      object MaxWeight: TcxTextEdit
        Left = 375
        Top = 26
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 3
        Text = '100'
        Width = 74
@ -411,26 +228,12 @@ object FrameParam: TFrameParam
      object BeginPieceNo: TcxTextEdit
        Left = 92
        Top = 63
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 4
        Width = 94
      end
      object EndPieceNo: TcxTextEdit
        Left = 375
        Top = 63
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 5
        Width = 74
      end
@ -440,105 +243,54 @@ object FrameParam: TFrameParam
      Top = 247
      Align = alTop
      Caption = #23567#25968#20301#25968#35774#32622
-      ParentFont = True
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -13
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = [fsBold]
-      Style.IsFontAssigned = True
      TabOrder = 2
-      ExplicitWidth = 601
      Height = 132
      Width = 662
      object Label19: TLabel
        Left = 12
        Top = 27
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #31859#25968#20445#30041
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label20: TLabel
        Left = 198
        Top = 29
-        Width = 15
-        Height = 19
+        Width = 12
+        Height = 13
        Caption = #20301
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = [fsBold]
-        ParentFont = True
      end
      object Label21: TLabel
        Left = 250
        Top = 26
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #30721#25968#20445#30041
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label3: TLabel
        Left = 198
        Top = 71
-        Width = 15
-        Height = 19
+        Width = 12
+        Height = 13
        Caption = #20301
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = [fsBold]
-        ParentFont = True
      end
      object Label30: TLabel
        Left = 428
        Top = 27
-        Width = 15
-        Height = 19
+        Width = 12
+        Height = 13
        Caption = #20301
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = [fsBold]
-        ParentFont = True
      end
      object Label33: TLabel
        Left = 12
        Top = 69
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #37325#37327#20445#30041
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clBlack
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object MPlace: TcxTextEdit
        Left = 95
        Top = 23
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 0
        Text = '1'
        Width = 82
@ -546,13 +298,6 @@ object FrameParam: TFrameParam
      object YPlace: TcxTextEdit
        Left = 340
        Top = 24
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 1
        Text = '1'
        Width = 82
@ -560,13 +305,6 @@ object FrameParam: TFrameParam
      object KgPlace: TcxTextEdit
        Left = 95
        Top = 67
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 2
        Text = '1'
        Width = 82
@ -577,93 +315,48 @@ object FrameParam: TFrameParam
      Top = 379
      Align = alTop
      Caption = #20854#23427#20449#24687#35774#32622
-      ParentFont = True
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = [fsBold]
-      Style.IsFontAssigned = True
      TabOrder = 3
-      ExplicitWidth = 601
      Height = 122
      Width = 662
      object Label31: TLabel
        Left = 379
        Top = 36
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #21367#21495#35268#21017
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label41: TLabel
        Left = 5
        Top = 36
-        Width = 30
-        Height = 20
+        Width = 24
+        Height = 13
        Caption = #25171#21253
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label5: TLabel
        Left = 180
        Top = 36
-        Width = 60
-        Height = 20
+        Width = 48
+        Height = 13
        Caption = #21253#21495#35268#21017
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label11: TLabel
        Left = 182
        Top = 73
-        Width = 75
-        Height = 20
+        Width = 60
+        Height = 13
        Caption = #21253#20986#32440#20221#25968
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object Label12: TLabel
        Left = 383
        Top = 73
-        Width = 75
-        Height = 20
+        Width = 60
+        Height = 13
        Caption = #25552#20132#21253#35268#21017
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -15
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
      end
      object edtdabao: TcxTextEdit
        Left = 43
        Top = 30
-        ParentFont = True
        Properties.ReadOnly = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 0
        OnClick = edtMaBiaoClick
        Width = 35
@ -671,13 +364,6 @@ object FrameParam: TFrameParam
      object packRolls: TcxTextEdit
        Left = 82
        Top = 30
-        ParentFont = True
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 1
        TextHint = #36755#20837#21253#21367#25968
        Width = 91
@ -685,17 +371,10 @@ object FrameParam: TFrameParam
      object rollnoMake: TcxComboBox
        Left = 461
        Top = 31
-        ParentFont = True
        Properties.DropDownListStyle = lsFixedList
        Properties.Items.Strings = (
          #33258#21160
          #25163#21160)
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 2
        Text = #33258#21160
        Width = 99
@ -703,17 +382,10 @@ object FrameParam: TFrameParam
      object packNoMake: TcxComboBox
        Left = 264
        Top = 31
-        ParentFont = True
        Properties.DropDownListStyle = lsFixedList
        Properties.Items.Strings = (
          #33258#21160
          #25163#21160)
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 3
        Text = #33258#21160
        Width = 99
@ -724,18 +396,11 @@ object FrameParam: TFrameParam
        Width = 97
        Height = 17
        Caption = #21253#26631#31614#39044#35272
-        Font.Charset = ANSI_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -16
-        Font.Name = #24494#36719#38597#40657
-        Font.Style = []
-        ParentFont = True
        TabOrder = 4
      end
      object packlabNumber: TcxComboBox
        Left = 263
        Top = 66
-        ParentFont = True
        Properties.DropDownListStyle = lsFixedList
        Properties.ImmediatePost = True
        Properties.Items.Strings = (
@ -749,17 +414,10 @@ object FrameParam: TFrameParam
      object packPrintAction: TcxComboBox
        Left = 461
        Top = 68
-        ParentFont = True
        Properties.DropDownListStyle = lsFixedList
        Properties.Items.Strings = (
          #33258#21160
          #25163#21160)
-        Style.Font.Charset = ANSI_CHARSET
-        Style.Font.Color = clWindowText
-        Style.Font.Height = -15
-        Style.Font.Name = #24494#36719#38597#40657
-        Style.Font.Style = [fsBold]
-        Style.IsFontAssigned = True
        TabOrder = 6
        Text = #33258#21160
        Width = 99
@ -769,17 +427,10 @@ object FrameParam: TFrameParam
  object weightRule: TcxComboBox
    Left = 156
    Top = 82
-    ParentFont = True
    Properties.DropDownListStyle = lsFixedList
    Properties.Items.Strings = (
      #27611#37325
      #20928#37325)
-    Style.Font.Charset = ANSI_CHARSET
-    Style.Font.Color = clWindowText
-    Style.Font.Height = -16
-    Style.Font.Name = #24494#36719#38597#40657
-    Style.Font.Style = [fsBold]
-    Style.IsFontAssigned = True
    TabOrder = 1
    Text = #27611#37325
    Width = 76
--- a/T03贸易布匹检验/U_frameParam.pas
+++ b/T03贸易布匹检验/U_frameParam.pas
@ -7,7 +7,7 @@ uses
  Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls,
  cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit, 
   cxGroupBox, Vcl.StdCtrls, cxTextEdit, Vcl.ExtCtrls, cxMaskEdit,
-  cxDropDownEdit;
+  cxDropDownEdit, dxSkinsCore, dxSkinsDefaultPainters;

 type
  TFrameParam = class(TFrame)
--- a/T03贸易布匹检验/testDll.res
+++ b/T03贸易布匹检验/testDll.res
--- a/T05贸易门市管理/TradeMarket.dpr
+++ b/T05贸易门市管理/TradeMarket.dpr
@ -37,13 +37,13 @@ uses
  U_FormDesign in '..\..\..\public10\design\U_FormDesign.pas',
  U_FormLayOutDesign in '..\..\..\public10\design\U_FormLayOutDesign.pas',
  U_printPdf in '..\..\..\public10\ThreeFun\Fun\U_printPdf.pas',
-  U_TradeMarketList_XY in 'U_TradeMarketList_XY.pas' {frmTradeMarketList_XY},
+  U_TradeMarketList_XYTH in 'U_TradeMarketList_XYTH.pas' {frmTradeMarketList_XYth},
  U_TradeDispatchedList in 'U_TradeDispatchedList.pas' {frmTradeDispatchedList},
  U_TradeMarketDisSel in 'U_TradeMarketDisSel.pas' {frmTradeMarketDisSel},
  U_ComContactSel in '..\A00通用窗体\U_ComContactSel.pas' {frmComContactSel},
  U_ProgressUpdate in '..\A00通用方法\U_ProgressUpdate.pas',
  U_RPFun in '..\..\..\public10\ThreeFun\Fun\U_RPFun.pas',
-  U_TradeMarketQtyInPut in 'U_TradeMarketQtyInPut.pas',
+  U_TradeMarketQtyTHInPut in 'U_TradeMarketQtyTHInPut.pas' {frmTradeMarketQtyTHnPut},
  U_ItemizedListQtyInPut in '..\T02贸易汇总仓库\U_ItemizedListQtyInPut.pas' {frmItemizedListQtyInPut},
  U_UserSel in '..\A00通用窗体\U_UserSel.pas' {frmUserSel},
  U_LabelPrint2 in 'U_LabelPrint2.pas' {frmLabelPrint2};
--- a/T05贸易门市管理/TradeMarket.dproj
+++ b/T05贸易门市管理/TradeMarket.dproj
@ -80,7 +80,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>E:\rtgit\trade\D10xhGemei\T05贸易门市管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10V1W\项目代码\D10xhGemei\T05贸易门市管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -172,8 +172,8 @@
        <DCCReference Include="..\..\..\public10\design\U_FormDesign.pas"/>
        <DCCReference Include="..\..\..\public10\design\U_FormLayOutDesign.pas"/>
        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_printPdf.pas"/>
-        <DCCReference Include="U_TradeMarketList_XY.pas">
-            <Form>frmTradeMarketList_XY</Form>
+        <DCCReference Include="U_TradeMarketList_XYTH.pas">
+            <Form>frmTradeMarketList_XYth</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_TradeDispatchedList.pas">
@ -190,7 +190,9 @@
        </DCCReference>
        <DCCReference Include="..\A00通用方法\U_ProgressUpdate.pas"/>
        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_RPFun.pas"/>
-        <DCCReference Include="U_TradeMarketQtyInPut.pas"/>
+        <DCCReference Include="U_TradeMarketQtyTHInPut.pas">
+            <Form>frmTradeMarketQtyTHnPut</Form>
+        </DCCReference>
        <DCCReference Include="..\T02贸易汇总仓库\U_ItemizedListQtyInPut.pas">
            <Form>frmItemizedListQtyInPut</Form>
        </DCCReference>
--- a/T05贸易门市管理/U_GetDllForm.pas
+++ b/T05贸易门市管理/U_GetDllForm.pas
@ -15,8 +15,9 @@ function GetsysParam(muserId: pchar; fparam1: pchar): Boolean;
 implementation

 uses
-  U_DataLink, U_iniParam, U_TradeMarketList, U_TradeDispatchedList,U_TradeSampletList,
-  U_TradeMarketList_JD, U_TradeMarketList_XY,U_TradeMarketList_JDT;
+  U_DataLink, U_iniParam, U_TradeMarketList, U_TradeDispatchedList,
+  U_TradeSampletList, U_TradeMarketList_JD, U_TradeMarketList_XY,
+  U_TradeMarketList_JDT, U_TradeJYXD, U_TradeMarketList_XYTH, U_TradeQDList;

       /////////////////////////////////////////////////////////////////
      //         功能说明:取Dll中得窗体                              //
@ -75,11 +76,12 @@ begin
    user := 'rtsa';
    pswd := 'rightsoft@5740';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//   DParameters1:='高权限';
    Parameters1 := '管理';
+    DParameters2 := '';
 //    Parameters1 := '查询';
-//    Parameters2 := '梭织';
-    Parameters4 := '新余';
+//    Parameters1 := '꿴璂';
+//    Parameters2 := '劤岱';
+//    Parameters4 := '劤岱';
    DCode := 'ADMIN';
    DName := 'ADMIN';
  end
@ -129,7 +131,30 @@ begin
  /////////////////////
  //调用子模块窗口
  case FormID of
-
+    1:  //숏湳苟데죗깊
+      begin
+        with TfrmTradeJYXD.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+          FOrdType := '攣끽데';
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
+    2:  //퓐데죗깊
+      begin
+        with tfrmTradeQDStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+//          FOrdType := '퓐데';
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
    111:  //大货单
      begin
        with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
@ -154,6 +179,19 @@ begin
          mnewHandle := Handle;
        end;
      end;
+    212:  //劤岱藁새데
+      begin
+        with TfrmTradeMarketList_XYth.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
+        begin
+          fFormID := FormID;
+          FOrdType := '藁새데';
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
+
    112:  //大货单
      begin
        with TfrmTradeMarketList_JD.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
@ -180,7 +218,7 @@ begin
      end;
    121:  //剪样单
      begin
-        with TfrmTradeSampleList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do       //
+        with TfrmTradeSampleList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do       //
        begin
          fFormID := FormID;
          FOrdType := '门店剪样';
--- a/T05贸易门市管理/U_TradeJYXD.dfm
+++ b/T05贸易门市管理/U_TradeJYXD.dfm
@ -0,0 +1,456 @@
+inherited frmTradeJYXD: TfrmTradeJYXD
+  Left = 165
+  Top = 13
+  Caption = #38376#24215#21098#26679#19979#21333#21015#34920
+  ClientHeight = 634
+  ClientWidth = 1423
+  Color = clBtnFace
+  Font.Height = -16
+  FormStyle = fsMDIChild
+  Position = poScreenCenter
+  Visible = True
+  ExplicitWidth = 1439
+  ExplicitHeight = 673
+  PixelsPerInch = 96
+  TextHeight = 21
+  inherited loadProcess: TPanel
+    Left = 720
+    Top = 354
+    ExplicitLeft = 720
+    ExplicitTop = 354
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 720
+    Top = 296
+    ExplicitLeft = 720
+    ExplicitTop = 296
+    ExplicitHeight = 29
+  end
+  object Panel2: TPanel [2]
+    Left = 784
+    Top = 0
+    Width = 639
+    Height = 634
+    Align = alClient
+    TabOrder = 2
+    object ToolBar2: TToolBar
+      Tag = 1
+      Left = 1
+      Top = 1
+      Width = 637
+      Height = 30
+      AutoSize = True
+      ButtonHeight = 30
+      ButtonWidth = 67
+      Caption = 'ToolBar1'
+      Images = DataLink_TradeMarket.cxImageList_bar
+      List = True
+      ShowCaptions = True
+      TabOrder = 0
+      object Label3: TLabel
+        Left = 0
+        Top = 0
+        Width = 57
+        Height = 30
+        Caption = #24050#25171#21360
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+      end
+      object Label2: TLabel
+        Left = 57
+        Top = 0
+        Width = 6
+        Height = 30
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+      end
+    end
+    object cxGrid3: TcxGrid
+      Left = 1
+      Top = 31
+      Width = 637
+      Height = 602
+      Align = alClient
+      PopupMenu = PM_1
+      TabOrder = 1
+      ExplicitLeft = 5
+      ExplicitTop = 37
+      object Tv3: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DataSource2
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsBehavior.CellHints = True
+        OptionsCustomize.ColumnFiltering = False
+        OptionsData.Editing = False
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        OptionsView.IndicatorWidth = 30
+        object Tv3Column2: TcxGridDBColumn
+          Caption = #21333#25454#32534#21495
+          DataBinding.FieldName = 'TMMNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object Tv3Column3: TcxGridDBColumn
+          Caption = #21046#21333#26085#26399
+          DataBinding.FieldName = 'TMMDate'
+          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxDateEditProperties'
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object Tv3Column4: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object Tv3Column5: TcxGridDBColumn
+          Caption = #37197#36135#20154
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object Tv3Column6: TcxGridDBColumn
+          Caption = #21046#21333#20154
+          DataBinding.FieldName = 'FILLER'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object Tv3Column7: TcxGridDBColumn
+          Caption = #22791#27880
+          DataBinding.FieldName = 'OrdNote'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+      end
+      object cxGridLevel2: TcxGridLevel
+        GridView = Tv3
+      end
+    end
+  end
+  object Panel1: TPanel [3]
+    Left = 0
+    Top = 0
+    Width = 784
+    Height = 634
+    Align = alLeft
+    TabOrder = 3
+    object ToolBar1: TToolBar
+      Tag = 1
+      Left = 1
+      Top = 1
+      Width = 782
+      Height = 30
+      AutoSize = True
+      ButtonHeight = 30
+      ButtonWidth = 67
+      Caption = 'ToolBar1'
+      Images = DataLink_TradeMarket.cxImageList_bar
+      List = True
+      ShowCaptions = True
+      TabOrder = 0
+      object Label1: TLabel
+        Left = 0
+        Top = 0
+        Width = 57
+        Height = 30
+        Caption = #24453#25171#21360
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clRed
+        Font.Height = -19
+        Font.Name = #24494#36719#38597#40657
+        Font.Style = []
+        ParentFont = False
+      end
+    end
+    object cxGrid1: TcxGrid
+      Left = 1
+      Top = 31
+      Width = 782
+      Height = 602
+      Align = alClient
+      TabOrder = 1
+      ExplicitLeft = -3
+      ExplicitTop = 37
+      object Tv1: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DataSource1
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsBehavior.CellHints = True
+        OptionsCustomize.ColumnFiltering = False
+        OptionsData.Editing = False
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        OptionsView.IndicatorWidth = 30
+        object Tv1Column7: TcxGridDBColumn
+          Caption = #21333#25454#32534#21495
+          DataBinding.FieldName = 'TMMNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 77
+        end
+        object v1OrdDate: TcxGridDBColumn
+          Caption = #21046#21333#26085#26399
+          DataBinding.FieldName = 'TMMDate'
+          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxDateEditProperties'
+          Properties.ShowTime = False
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 77
+        end
+        object Tv1Column4: TcxGridDBColumn
+          Caption = #23458#25143
+          DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 77
+        end
+        object Tv1Column8: TcxGridDBColumn
+          Caption = #37197#36135#20154
+          DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 77
+        end
+        object Tv1Column6: TcxGridDBColumn
+          Caption = #21046#21333#20154
+          DataBinding.FieldName = 'FILLER'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 77
+        end
+        object Tv1Column1: TcxGridDBColumn
+          Caption = #22791#27880
+          DataBinding.FieldName = 'OrdNote'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 77
+        end
+      end
+      object cxGrid1Level1: TcxGridLevel
+        GridView = Tv1
+      end
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    Left = 255
+    Top = 314
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    Left = 37
+    Top = 280
+  end
+  object cxgrdpmn1: TcxGridPopupMenu
+    Grid = cxGrid3
+    PopupMenus = <>
+    Left = 220
+    Top = 284
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    Parameters = <>
+    Left = 568
+    Top = 240
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 292
+    Top = 128
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 320
+    Top = 224
+  end
+  object DataSource1: TDataSource
+    DataSet = CDS_1
+    Left = 468
+    Top = 112
+  end
+  object Order_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 156
+    Top = 144
+  end
+  object DataSource2: TDataSource
+    DataSet = CDS_2
+    Left = 152
+    Top = 476
+  end
+  object ADOQueryImage: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    EnableBCD = False
+    Parameters = <>
+    Left = 316
+    Top = 283
+  end
+  object DSImage: TDataSource
+    DataSet = ADOQueryImage
+    Left = 256
+    Top = 192
+  end
+  object IdFTP1: TIdFTP
+    ConnectTimeout = 0
+    NATKeepAlive.UseKeepAlive = False
+    NATKeepAlive.IdleTimeMS = 0
+    NATKeepAlive.IntervalMS = 0
+    ProxySettings.ProxyType = fpcmNone
+    ProxySettings.Port = 0
+    ReadTimeout = 0
+    Left = 36
+    Top = 170
+  end
+  object PopupMenu2: TPopupMenu
+    Left = 532
+    Top = 636
+    object N3: TMenuItem
+      Caption = #20840#36873
+    end
+    object N4: TMenuItem
+      Caption = #20840#24323
+    end
+    object N2: TMenuItem
+      Caption = #22797#21046
+    end
+  end
+  object cxgrdpmn2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 660
+    Top = 636
+  end
+  object CDS_WXTS: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 252
+    Top = 240
+  end
+  object GPM_3: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 188
+    Top = 237
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 524
+    Top = 96
+  end
+  object DataSource3: TDataSource
+    DataSet = CDS_3
+    Left = 932
+    Top = 176
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 228
+    Top = 464
+  end
+  object DataSource4: TDataSource
+    DataSet = CDS_4
+    Left = 940
+    Top = 472
+  end
+  object CDS_4: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 996
+    Top = 464
+  end
+  object CDS_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1012
+    Top = 216
+  end
+  object ADO_1: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 452
+    Top = 176
+  end
+  object ADO_2: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 308
+    Top = 464
+  end
+  object ADO_3: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 884
+    Top = 120
+  end
+  object ADO_4: TADOQuery
+    Connection = DataLink_TradeMarket.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 860
+    Top = 464
+  end
+  object Timer1: TTimer
+    Interval = 3000
+    OnTimer = Timer1Timer
+    Left = 649
+    Top = 198
+  end
+  object PM_1: TPopupMenu
+    Left = 893
+    Top = 302
+    object N1: TMenuItem
+      Caption = #37325#25171
+      OnClick = N1Click
+    end
+  end
+end
--- a/T05贸易门市管理/U_TradeJYXD.pas
+++ b/T05贸易门市管理/U_TradeJYXD.pas
@ -0,0 +1,232 @@
+unit U_TradeJYXD;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
+  cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxMemo,
+  cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit,
+  StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
+  cxCurrencyEdit, cxImage, cxDBEdit, Menus, RM_Common, RM_Class, RM_e_Xls,
+  RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu,
+  cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
+  IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
+  dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
+  dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
+  dxSkinsDefaultPainters;
+
+type
+  TfrmTradeJYXD = class(TfrmBaseList)
+    cxgrdpmn1: TcxGridPopupMenu;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    Order_Main: TClientDataSet;
+    DataSource2: TDataSource;
+    ADOQueryImage: TADOQuery;
+    DSImage: TDataSource;
+    IdFTP1: TIdFTP;
+    PopupMenu2: TPopupMenu;
+    N3: TMenuItem;
+    N4: TMenuItem;
+    cxgrdpmn2: TcxGridPopupMenu;
+    CDS_WXTS: TClientDataSet;
+    N2: TMenuItem;
+    GPM_3: TcxGridPopupMenu;
+    Panel2: TPanel;
+    ToolBar2: TToolBar;
+    cxGrid3: TcxGrid;
+    Tv3: TcxGridDBTableView;
+    cxGridLevel2: TcxGridLevel;
+    CDS_1: TClientDataSet;
+    DataSource3: TDataSource;
+    CDS_2: TClientDataSet;
+    DataSource4: TDataSource;
+    CDS_4: TClientDataSet;
+    CDS_3: TClientDataSet;
+    Tv3Column2: TcxGridDBColumn;
+    Tv3Column3: TcxGridDBColumn;
+    Tv3Column4: TcxGridDBColumn;
+    Tv3Column5: TcxGridDBColumn;
+    Tv3Column6: TcxGridDBColumn;
+    Tv3Column7: TcxGridDBColumn;
+    ADO_1: TADOQuery;
+    ADO_2: TADOQuery;
+    ADO_3: TADOQuery;
+    ADO_4: TADOQuery;
+    Label2: TLabel;
+    Label3: TLabel;
+    Timer1: TTimer;
+    Panel1: TPanel;
+    ToolBar1: TToolBar;
+    Label1: TLabel;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    Tv1Column7: TcxGridDBColumn;
+    v1OrdDate: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    PM_1: TPopupMenu;
+    N1: TMenuItem;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure Timer1Timer(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+  private
+    DQdate: TDateTime;
+    procedure InitGrid();
+    procedure InitGrid1();
+    procedure InitGrid2();
+    procedure InitGrid3();
+    procedure InitGrid4();
+//    procedure InitForm();
+
+    { Private declarations }
+  public
+    canshu1, canshu2, canshu4, FOrdType: string;
+
+    { Public declarations }
+  end;
+
+var
+  frmTradeJYXD: TfrmTradeJYXD;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_AttachmentUpload, U_RPFun,
+  U_TradeMarketInPut;
+
+{$R *.dfm}
+
+procedure TfrmTradeJYXD.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmTradeJYXD.FormShow(Sender: TObject);
+begin
+  inherited;
+  InitGrid1();
+  InitGrid2();
+
+  Timer1.Enabled := true;
+//  InitForm();
+end;
+
+procedure TfrmTradeJYXD.InitGrid();
+begin
+  InitGrid1();
+  InitGrid2();
+  InitGrid3();
+  InitGrid4();
+
+end;
+
+procedure TfrmTradeJYXD.InitGrid1();
+begin
+  with ADO_1 do
+  begin
+    Close;
+    sql.clear;
+    sql.add('select   * from Trade_Market_MAIN  A   WHERE ISNULL(PrintStatus,0)=0 AND ORDTYPE=''ÃÅµê¼ôÑù''');
+
+    Open;
+  end;
+  SCreateCDS(ADO_1, CDS_1);
+  SInitCDSData(ADO_1, CDS_1);
+end;
+
+procedure TfrmTradeJYXD.InitGrid2();
+begin
+  with ADO_2 do
+  begin
+    Close;
+    sql.clear;
+    sql.add('select   TOP 100 * from Trade_Market_MAIN  A   WHERE ISNULL(PrintStatus,0)=1 AND ORDTYPE=''ÃÅµê¼ôÑù''');
+    SQL.Add('ORDER BY FILLTIME DESC');
+    Open;
+  end;
+  SCreateCDS(ADO_2, CDS_2);
+  SInitCDSData(ADO_2, CDS_2);
+end;
+
+procedure TfrmTradeJYXD.InitGrid3();
+begin
+
+end;
+
+procedure TfrmTradeJYXD.InitGrid4();
+begin
+
+end;
+
+procedure TfrmTradeJYXD.N1Click(Sender: TObject);
+var
+  i: integer;
+  MPCID: string;
+  MPrintJson: string;
+begin
+  Timer1.Enabled := false;
+
+  if CDS_2.IsEmpty = FALSE then
+  begin
+
+    MPCID := trim(CDS_2.fieldbyname('tmmid').AsString);
+//        PrintCar(trim(CDS_2.fieldbyname('PCID').AsString));
+    MPrintJson := '{ "LBName": "¼ôÑùÐ¡Æ±","IsPreview": false, "PrtArgs": [ {"SqlStr": "EXEC P_Market_prt @Filtration=' + QuotedStr(MPCID) + ' " }, {"SqlStr": "EXEC P_Market_prt @Filtration=' + QuotedStr(MPCID) + '" } ] }';
+//        ShowMessage(MPrintJson);
+    FunPrintFR3(Application, PChar(DConString), PChar(MPrintJson));
+
+//    CDS_1.Delete;
+    Sleep(100);
+  end;
+  InitGrid2();
+  Timer1.Enabled := true;
+
+end;
+
+procedure TfrmTradeJYXD.Timer1Timer(Sender: TObject);
+var
+  i: integer;
+  MPCID: string;
+  MPrintJson: string;
+begin
+  Timer1.Enabled := false;
+  InitGrid1();
+  if CDS_1.IsEmpty = FALSE then
+  begin
+
+    with CDS_1 do
+    begin
+      DisableControls;
+      First;
+      while not Eof do
+      begin
+        MPCID := trim(CDS_1.fieldbyname('tmmid').AsString);
+//        PrintCar(trim(CDS_2.fieldbyname('PCID').AsString));
+        MPrintJson := '{ "LBName": "¼ôÑùÐ¡Æ±","IsPreview": false, "PrtArgs": [ {"SqlStr": "EXEC P_Market_prt @Filtration=' + QuotedStr(MPCID) + ' " }, {"SqlStr": "EXEC P_Market_prt @Filtration=' + QuotedStr(MPCID) + '" } ] }';
+//        ShowMessage(MPrintJson);
+        FunPrintFR3(Application, PChar(DConString), PChar(MPrintJson));
+
+        CDS_1.Delete;
+        Sleep(100);
+      end;
+      EnableControls;
+    end;
+  end;
+  InitGrid2();
+  Timer1.Enabled := true;
+end;
+
+end.
+
--- a/T05贸易门市管理/U_TradeMarketInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut.dfm
@ -2,15 +2,17 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
  Left = 143
  Top = 4
  Caption = #35746#21333#24405#20837
-  ClientHeight = 736
+  ClientHeight = 737
  ClientWidth = 1540
  Font.Charset = GB2312_CHARSET
  Font.Height = -16
  Position = poMainFormCenter
  WindowState = wsMaximized
  OnClose = FormClose
+  ExplicitLeft = -161
+  ExplicitTop = -52
  ExplicitWidth = 1556
-  ExplicitHeight = 775
+  ExplicitHeight = 776
  PixelsPerInch = 96
  TextHeight = 21
  object ToolBar1: TToolBar [0]
@ -121,7 +123,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
    Left = 0
    Top = 223
    Width = 1540
-    Height = 513
+    Height = 514
    Align = alClient
    Caption = 'Panel2'
    TabOrder = 2
@ -129,7 +131,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
      Left = 1
      Top = 1
      Width = 1252
-      Height = 511
+      Height = 512
      Align = alClient
      Caption = 'Panel2'
      TabOrder = 0
@ -137,11 +139,12 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
        Left = 1
        Top = 1
        Width = 1250
-        Height = 509
+        Height = 510
        Align = alClient
        TabOrder = 0
        object Tv1: TcxGridDBTableView
          OnDblClick = Tv1DblClick
+          OnKeyDown = Tv1KeyDown
          OnMouseDown = Tv1MouseDown
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
@ -222,6 +225,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
            DataBinding.FieldName = 'C_Name'
            DataBinding.IsNullValueType = True
            PropertiesClassName = 'TcxLookupComboBoxProperties'
+            Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
            Properties.KeyFieldNames = 'C_Name'
            Properties.ListColumns = <
              item
@ -255,6 +259,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
            DataBinding.FieldName = 'C_ColorNo'
            DataBinding.IsNullValueType = True
            PropertiesClassName = 'TcxLookupComboBoxProperties'
+            Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
            Properties.KeyFieldNames = 'C_ColorNo'
            Properties.ListColumns = <
              item
@ -268,6 +273,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
                FieldName = 'C_Color'
              end>
            Properties.ListSource = DS_YS
+            Properties.OnChange = Tv1Column12PropertiesChange
            Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged
            HeaderAlignmentHorz = taCenter
            Width = 168
@ -334,6 +340,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
            DataBinding.FieldName = 'referencePrice'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
            Width = 98
          end
          object Tv1Column22: TcxGridDBColumn
@ -380,20 +387,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
            HeaderAlignmentHorz = taCenter
            Width = 77
          end
-          object Tv1Column17: TcxGridDBColumn
-            Caption = #32039#24613#31243#24230
-            DataBinding.FieldName = 'Urgent'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxComboBoxProperties'
-            Properties.DropDownListStyle = lsEditFixedList
-            Properties.Items.Strings = (
-              #27491#24120
-              #32039#24613)
-            HeaderAlignmentHorz = taCenter
-            Width = 77
-          end
          object Tv1Column2: TcxGridDBColumn
-            Caption = #22791#27880
+            Caption = #26126#32454#22791#27880
            DataBinding.FieldName = 'OrdSNote'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
@ -433,7 +428,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
      Left = 1253
      Top = 1
      Width = 286
-      Height = 511
+      Height = 512
      Align = alRight
      Caption = 'Panel4'
      TabOrder = 1
@ -471,7 +466,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
        Left = 1
        Top = 42
        Width = 284
-        Height = 468
+        Height = 469
        Align = alClient
        Caption = #21452#20987#21024#38500#26126#32454#20449#24687
        TabOrder = 1
@ -479,7 +474,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
          Left = 2
          Top = 23
          Width = 280
-          Height = 443
+          Height = 444
          Align = alClient
          TabOrder = 0
          object TvMX: TcxGridDBTableView
@ -572,12 +567,12 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
    object Label1: TLabel
      Left = 656
      Top = 64
-      Width = 77
+      Width = 64
      Height = 21
-      Caption = #22791'         '#27880
+      Caption = #35746#21333#22791#27880
    end
    object Label2: TLabel
-      Left = 670
+      Left = 656
      Top = 21
      Width = 64
      Height = 21
@ -613,7 +608,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
      Caption = #21457#36135#22320#22336
    end
    object Label4: TLabel
-      Left = 352
+      Left = 338
      Top = 21
      Width = 48
      Height = 21
@ -633,6 +628,20 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
      Height = 21
      Caption = #19994' '#21153' '#21592':'
    end
+    object Label5: TLabel
+      Left = 338
+      Top = 116
+      Width = 32
+      Height = 21
+      Caption = #21306#22495
+    end
+    object Label6: TLabel
+      Left = 1077
+      Top = 103
+      Width = 64
+      Height = 21
+      Caption = #32039#24613#31243#24230
+    end
    object TMMNo: TcxTextEdit
      Tag = 2
      Left = 754
@ -789,6 +798,29 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
      Visible = False
      Width = 125
    end
+    object AddressArea: TcxTextEdit
+      Tag = 2
+      Left = 416
+      Top = 110
+      TabOrder = 12
+      Width = 200
+    end
+    object isUrgent: TComboBox
+      Tag = 2
+      Left = 1164
+      Top = 99
+      Width = 200
+      Height = 29
+      Style = csDropDownList
+      Ctl3D = False
+      ItemIndex = 0
+      ParentCtl3D = False
+      TabOrder = 13
+      Text = #27491#24120
+      Items.Strings = (
+        #27491#24120
+        #32039#24613)
+    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_TradeMarket.ADOLink
@ -895,7 +927,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
    LockType = ltReadOnly
    Parameters = <>
    Left = 942
-    Top = 281
+    Top = 282
  end
  object DS_YS: TDataSource
    DataSet = ADO_YS
@ -912,7 +944,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
    LockType = ltReadOnly
    Parameters = <>
    Left = 778
-    Top = 281
+    Top = 282
  end
  object ADO_RCPM: TADOQuery
    Connection = DataLink_TradeMarket.ADOLink
@ -962,7 +994,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
    LockType = ltReadOnly
    Parameters = <>
    Left = 860
-    Top = 219
+    Top = 220
  end
  object PopupMenu1: TPopupMenu
    Left = 49
--- a/T05贸易门市管理/U_TradeMarketInPut.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut.pas
@ -117,7 +117,6 @@ type
    ADO_KH: TADOQuery;
    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
-    Tv1Column17: TcxGridDBColumn;
    Tv1Column18: TcxGridDBColumn;
    GPM_2: TcxGridPopupMenu;
    DS_DanWei: TDataSource;
@ -141,6 +140,10 @@ type
    lbl2: TLabel;
    Saleser: TcxButtonEdit;
    SalesId: TcxTextEdit;
+    Label5: TLabel;
+    AddressArea: TcxTextEdit;
+    Label6: TLabel;
+    isUrgent: TComboBox;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -189,6 +192,8 @@ type
    procedure TBEditClick(Sender: TObject);
    procedure SaleserPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure SaleserDblClick(Sender: TObject);
+    procedure Tv1Column12PropertiesChange(Sender: TObject);
+    procedure Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    FSCXDH: string;
    procedure InitData();
@ -309,6 +314,13 @@ begin
  PState := 0;
  FTMMId := '';
  FormShow(Self);
+  BuyOrdNo.Text := '';
+  CONTACT.Text := '';
+  Saleser.Text := '';
+  ShippingAddress.Text := '';
+  OrdNote.Text := '';
+  AddressArea.Text := '';
+
 end;

 procedure TfrmTradeMarketInPut.TBCloseClick(Sender: TObject);
@ -356,9 +368,10 @@ begin
  SCSHData(ADOTemp, ScrollBox1, 9);
  SCSHData(ADOTemp, ScrollBox1, 7);
  OurCoName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('OurCoNo').AsString);
+  CustName.Properties.OnChange := nil;
  CustName.Hint := Trim(ADOTemp.FieldByName('CustNo').AsString);
  CustName.Text := Trim(ADOTemp.FieldByName('CustName').AsString);
-
+  CustName.Properties.OnChange := CustNamePropertiesChange;
  with ADO_1 do
  begin
    Close;
@ -410,6 +423,10 @@ begin
        FieldByName('TMSId').Value := '';
        FieldByName('TMSPiece').Value := 0;
        FieldByName('TMSQty').Value := 0;
+        FieldByName('OrderQty').Value := 0;
+        FieldByName('OrderUnit').Value := NULL;
+
+
 //        FieldByName('GangFee').Value := 0;
 //        FieldByName('Transfee').Value := 0;
 //        FieldByName('Otherfee').Value := 0;
@ -494,11 +511,11 @@ begin
  begin
    Close;
    sql.Clear;
-    sql.Add(' SELECT distinct A.C_Code,A.C_Name,A.qtyunit,A.HotQty,StkQty = SUM(B.StkQty) ');
-    SQL.ADD(' FROM Bs_Cloth_Info A  LEFT JOIN Bs_Cloth_Io B on A.C_Code=B.C_Code');
-    sql.add(' where B.ioflag=''入库'' ');
-    if Trim(canshu4) = '新余' then
-      sql.Add(' and isnull(STKNAME,'''')=''新余'' ');
+    sql.Add(' SELECT distinct A.C_Code,A.C_Name,A.qtyunit,A.HotQty,StkQty =(select sum(stkqty) from Bs_Cloth_Io B where  A.C_Code=B.C_Code )  ');
+    SQL.ADD(' FROM Bs_Cloth_Info A ');
+    sql.add(' where 1=1 ');
+//    if Trim(canshu4) = '新余' then
+//      sql.Add(' and isnull(STKNAME,'''')=''新余'' ');
    SQL.add('group by A.C_Code,A.C_Name,A.qtyunit,A.HotQty');
    SQL.ADD('order by  A.C_Code ');
 //    showmessage(SQL.text);
@ -561,6 +578,7 @@ end;
 function TfrmTradeMarketInPut.SaveData(): Boolean;
 var
  maxno, Smaxno, maxTMMNo, MaxFNo, MQZ, MTMMNo: string;
+  RetryCount: Integer;
 begin
  try
    ADOCmd.Connection.BeginTrans;
@ -575,8 +593,48 @@ begin
 //  大货单编号G50313001<-- G50313 001
 //(“G”+ 25年的“5”(每过五年辉清一下以前的数据 所以0-9循环)+0313(月日)+“001”(单号,不会超过999单))

-      MQZ := 'G' + RightStr(Trim(FormatDateTime('yyMMdd', SGetServerDate(ADOTemp))), 5);
-      if GetLSNo(ADOCmd, MTMMNo, MQZ, 'Trade_Market_Main', 3, 0) = False then
+//      RetryCount := 0;
+//
+//  // 循环取号，直到不重复为止
+//      while True do
+//      begin
+//    // 1. 取流水号
+//        MQZ := 'G' + RightStr(Trim(FormatDateTime('yyMMdd', SGetServerDate(ADOTemp))), 6);
+//        if not GetLSNo(ADOCmd, MTMMNo, MQZ, 'Trade_Market_Main', 3, 0) then
+//          raise Exception.Create('取最大号失败!');
+//
+//    // 2. 查询是否已存在
+//        with ADOCmd do
+//        begin
+//          Close;
+//          SQL.Clear;
+//          SQL.Add('select count(*) from Trade_Market_Main where TMMNo=:TMMNo');
+//          Parameters.ParamByName('TMMNo').Value := Trim(MTMMNo);
+//          Open;
+//
+//      // 如果数量 > 0 表示已存在
+//          if Fields[0].AsInteger > 0 then
+//          begin
+//            Close;
+//
+//        // 防死循环：最多重试10次
+//            Inc(RetryCount);
+//            if RetryCount > 10 then
+//              raise Exception.Create('自动重试取号10次均重复，请检查流水号规则！');
+//
+//            Continue; // 重复了 → 重新回到循环开头再取一次
+//          end;
+//
+//          Close;
+//        end;
+//
+//    // 3. 不重复 → 退出循环
+//        Break;
+//      end;
+
+  // 4. 最终把不重复的单号赋值给界面
+
+      if not GetLSNo(ADOCmd, MTMMNo, 'G', 'Trade_Market_Main', 3, 1) then
        raise Exception.Create('取最大号失败!');
      TMMNo.Text := MTMMNo;

@ -670,21 +728,22 @@ begin
      Close;
      sql.Clear;
      sql.Add('select * from Trade_Market_Main where TMMNo=''' + Trim(TMMNo.Text) + '''');
+
      Open;
    end;
    if ADOCmd.RecordCount > 1 then
      raise Exception.Create('订单号重复!');

-    with ADOCmd do
-    begin
-      Close;
-      sql.Clear;
-      sql.Add('select C_Code,C_Color,C_ColorNo,CF=count(TMSID) from Trade_Market_sub where TMMID=''' + Trim(maxno) + '''');
-      sql.Add('group by C_Code,C_Color,C_ColorNo HAVING count(TMSID)>1  ');
-      Open;
-    end;
-    if not ADOCmd.IsEmpty then
-      raise Exception.Create('颜色重复!');
+//    with ADOCmd do
+//    begin
+//      Close;
+//      sql.Clear;
+//      sql.Add('select C_Code,C_Color,C_ColorNo,CF=count(TMSID) from Trade_Market_sub where TMMID=''' + Trim(maxno) + '''');
+//      sql.Add('group by C_Code,C_Color,C_ColorNo HAVING count(TMSID)>1  ');
+//      Open;
+//    end;
+//    if not ADOCmd.IsEmpty then
+//      raise Exception.Create('颜色重复!');

    FTMMID := Trim(maxno);
    ADOCmd.Connection.CommitTrans;
@ -767,13 +826,16 @@ begin
    Application.MessageBox('明细不能为空!', '提示', 0);
    Exit;
  end;
-
+  if fordtype <> '门店剪样' then
+  begin
    if CDS_1.Locate('TMSUnit', null, []) then
    begin
-    Application.MessageBox('单位不能为空!', '提示', 0);
+      Application.MessageBox('备货单位不能为空!', '提示', 0);
      Exit;
    end;

+  end;
+
  if CDS_1.Locate('TMSQty', null, []) then
  begin
    Application.MessageBox('数量不能为空!', '提示', 0);
@ -814,7 +876,7 @@ begin
  begin

    Application.MessageBox('保存成功！', '提示', 0);
-    if btnFlag = 4 then  //保存后打印并退出
+//    if btnFlag = 4 then  //保存后打印并退出
    ModalResult := 1;
  end;
 end;
@ -1089,6 +1151,8 @@ begin
 //  begin
 //    self.CustName.Hint := Trim(CDS_KH.fieldbyname('CoCode').AsString);
 //  end;
+  if CustName.Text <> '' then
+  begin
    with ADO_KH do
    begin
      close;
@ -1114,6 +1178,8 @@ begin
    end;
  end;

+end;
+
 procedure TfrmTradeMarketInPut.CustNamePropertiesCloseUp(Sender: TObject);
 begin
  inherited;
@ -1139,7 +1205,9 @@ begin
  end;
  self.ShippingAddress.Text := Trim(adotemp.fieldbyname('mxaddress').AsString);
  self.CONTACT.Text := Trim(adotemp.fieldbyname('Telephone').AsString);
-
+  self.AddressArea.Text := Trim(adotemp.fieldbyname('MXAREA').AsString);
+  Saleser.Text := Trim(adotemp.fieldbyname('Saleser').AsString);
+  CustName.HINT := Trim(adotemp.fieldbyname('cocode').AsString);
 end;

 procedure TfrmTradeMarketInPut.cxDBImage1DblClick(Sender: TObject);
@ -1387,6 +1455,9 @@ begin
      begin
        self.ShippingAddress.Text := Trim(frmComContactSel.CDS_1.fieldbyname('mxaddress').AsString);
        self.CONTACT.Text := Trim(frmComContactSel.CDS_1.fieldbyname('PhoneNumber').AsString);
+
+        self.AddressArea.Text := Trim(frmComContactSel.CDS_1.fieldbyname('MXAREA').AsString);
+
      end;
    end;
  finally
@ -1408,7 +1479,8 @@ begin
        self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoName').AsString);
        self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString);
        self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Telephone').AsString);
-
+        self.AddressArea.Text := Trim(frmCompanySel.CDS_1.fieldbyname('MXAREA').AsString);
+        Saleser.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Saleser').AsString);
      end;
    end;

@ -1561,6 +1633,40 @@ begin
  end;
 end;

+procedure TfrmTradeMarketInPut.Tv1Column12PropertiesChange(Sender: TObject);
+var
+  sInput: string;
+  ACombo: TcxLookupComboBox;
+begin
+  inherited;
+  ACombo := TcxLookupComboBox(Sender);
+  sInput := Trim(ACombo.Text); // 获取你输入的文字
+  if CDS_1.FieldByName('C_CODE').AsString = '' then
+    EXIT;
+
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT * ');
+    sql.Add(' FROM V_COLOR_VIEW A WHERE 1=1 and C_CODE= ' + QuotedStr(CDS_1.FieldByName('C_CODE').AsString));
+
+    if sInput <> '' then
+    begin
+      sql.Add(Format(' AND  A.C_ColorNo LIKE ''%%%s%%'' ', [sInput]));
+    // ? 关键：DISTINCT 下绝对不报错的排序（只排查询里出现的字段）
+      sql.Add(Format(' ORDER BY CASE WHEN A.C_ColorNo = ''%s'' THEN 0 ELSE 1 END, A.C_ColorNo ', [sInput]));
+
+    end
+    else
+    begin
+//      sql.Add(' AND  C_CODE= ' + QuotedStr(CDS_1.FieldByName('C_CODE').AsString));
+    end;
+//    ShowMessage(SQL.Text);
+    Open;
+  end;
+end;
+
 procedure TfrmTradeMarketInPut.Tv1Column12PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -1699,7 +1805,16 @@ begin

    Post;
  end;
-
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT DISTINCT A.C_Code,B.C_Color,B.C_ColorNo,B.referencePrice AS Price FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+    sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString));
+    SQL.ADD(' order by B.C_ColorNo');
+         //ShowMessage(sql.text);
+    Open;
+  end;
 //  with ADOTemp do
 //  begin
 //    close;
@ -1753,6 +1868,15 @@ begin
  InitMXGrid(MTMSId);
 end;

+procedure TfrmTradeMarketInPut.Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_DOWN then
+  begin
+    ToolButton1.Click();
+
+  end;
+end;
+
 procedure TfrmTradeMarketInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin

--- a/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
@ -9,6 +9,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
  Position = poMainFormCenter
  WindowState = wsMaximized
  OnClose = FormClose
+  ExplicitLeft = -359
  ExplicitWidth = 1556
  ExplicitHeight = 775
  PixelsPerInch = 96
@ -140,6 +141,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
        Height = 509
        Align = alClient
        TabOrder = 0
+        ExplicitLeft = -1
+        ExplicitTop = 5
        object Tv1: TcxGridDBTableView
          OnDblClick = Tv1DblClick
          OnMouseDown = Tv1MouseDown
@ -255,6 +258,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
            DataBinding.FieldName = 'C_ColorNo'
            DataBinding.IsNullValueType = True
            PropertiesClassName = 'TcxLookupComboBoxProperties'
+            Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
            Properties.KeyFieldNames = 'C_ColorNo'
            Properties.ListColumns = <
              item
@ -268,6 +272,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
                FieldName = 'C_Color'
              end>
            Properties.ListSource = DS_YS
+            Properties.OnChange = Tv1Column12PropertiesChange
            Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged
            HeaderAlignmentHorz = taCenter
            Width = 168
@ -628,10 +633,17 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    end
    object Label19: TLabel
      Left = 1077
-      Top = 68
-      Width = 80
+      Top = 74
+      Width = 64
      Height = 21
-      Caption = #32852#31995#26041#24335#65306
+      Caption = #32852#31995#26041#24335
+    end
+    object Label5: TLabel
+      Left = 1109
+      Top = 126
+      Width = 32
+      Height = 21
+      Caption = #21306#22495
    end
    object TMMNo: TcxTextEdit
      Tag = 2
@ -644,7 +656,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    object TMMDate: TDateTimePicker
      Tag = 2
      Left = 814
-      Top = 66
+      Top = 65
      Width = 200
      Height = 29
      BevelInner = bvNone
@ -752,7 +764,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    object CONTACT: TcxButtonEdit
      Tag = 2
      Left = 1164
-      Top = 63
+      Top = 68
      Hint = 'CONTACT/'#32852#31995#26041#24335
      Properties.Buttons = <
        item
@ -765,6 +777,13 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
      OnDblClick = OurCoNameDblClick
      Width = 200
    end
+    object AddressArea: TcxTextEdit
+      Tag = 2
+      Left = 1164
+      Top = 120
+      TabOrder = 10
+      Width = 200
+    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Left = 860
@ -788,8 +807,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    Connection = DataLink_TradeMarket.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 1106
-    Top = 157
+    Left = 1177
+    Top = 263
  end
  object ADOCmd: TADOQuery
    Connection = DataLink_TradeMarket.ADOLink
@ -823,8 +842,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
  object ADO_I1: TADOQuery
    Connection = DataLink_TradeMarket.ADOLink
    Parameters = <>
-    Left = 942
-    Top = 219
+    Left = 949
+    Top = 497
  end
  object DS_I1: TDataSource
    DataSet = ADO_I1
@ -845,8 +864,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
  object ADO_I2: TADOQuery
    Connection = DataLink_TradeMarket.ADOLink
    Parameters = <>
-    Left = 1024
-    Top = 219
+    Left = 1029
+    Top = 518
  end
  object DS_I2: TDataSource
    DataSet = ADO_I2
@ -904,8 +923,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    Connection = DataLink_TradeMarket.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 778
-    Top = 219
+    Left = 777
+    Top = 496
  end
  object CDS_KH: TClientDataSet
    Aggregates = <>
@ -935,8 +954,8 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
    Connection = DataLink_TradeMarket.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 860
-    Top = 219
+    Left = 862
+    Top = 519
  end
  object PopupMenu1: TPopupMenu
    Left = 49
--- a/T05贸易门市管理/U_TradeMarketInPut_XY.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut_XY.pas
@ -1,4 +1,4 @@
-unit U_TradeMarketInPut_XY;
+unit U_TradeMarketInPut_XY;

 interface

@ -140,6 +140,8 @@ type
    TBEdit: TToolButton;
    Tv1Column23: TcxGridDBColumn;
    ADOConnection1: TADOConnection;
+    Label5: TLabel;
+    AddressArea: TcxTextEdit;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -186,6 +188,7 @@ type
    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
    procedure TBAddClick(Sender: TObject);
    procedure TBEditClick(Sender: TObject);
+    procedure Tv1Column12PropertiesChange(Sender: TObject);
  private
    FSCXDH: string;
    procedure InitData();
@ -237,7 +240,7 @@ begin

  if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then
  begin
-    Application.MessageBox('取子流水号失败！', '提示', 0);
+    Application.MessageBox('取子流水号失败！', '提示', 0);
    Exit;
  end;
  with cds_1 do
@ -297,7 +300,7 @@ procedure TfrmTradeMarketInPut_XY.TBAddClick(Sender: TObject);
 begin
 { CDS_1.Close;
  InitData();
-  SClearData(ScrollBox1, 2); //清空容器中控件的内容
+  SClearData(ScrollBox1, 2); //清空容器中控件的内容
  CustName.Text := '';
  if CDS_1.IsEmpty then
  begin
@ -360,8 +363,9 @@ begin
  begin
    Close;
    SQL.Clear;
-    sql.Add('select A.*,StkQty =(select sum(isnull(X.StkQty,0)) from Bs_Cloth_IO X where X.C_Code=A.C_Code and X.C_Color=A.C_Color)   ');
-    sql.Add(',SubOutQty =(select sum(isnull(X.Qty,0)) from Trade_Market_Sub_Qty X where X.TMSID=A.TMSID  )   ');
+    sql.Add('select A.*,StkQty =(select sum(isnull(X.StkQty,0)) from Bs_Cloth_IO X where X.C_Code=A.C_Code and X.C_Color=A.C_Color AND STKNAME=''新余'')   ');
+    SQL.Add(' -ISNULL((select  sum(isnull(X.Qty,0)) from Trade_Market_Sub_Qty X INNER JOIN  Trade_Market_Sub F ON X.TMSID=F.TMSID  INNER JOIN Trade_Market_Main E ON E.TMMID=F.TMMID     ');
+    sql.Add('where Store=''新余'' and  E.Status =''10''  AND F.C_Code=A.C_Code and F.C_Color=A.C_Color),0),SubOutQty =(select sum(isnull(X.Qty,0)) from Trade_Market_Sub_Qty X where X.TMSID=A.TMSID  )   ');
    sql.Add(',SubOutPS =(select count(isnull(X.TMSQID,0)) from Trade_Market_Sub_Qty X where X.TMSID=A.TMSID  )   ');
    sql.Add('from Trade_Market_Sub   A  ');
    SQL.adD('where 1=1 ');
@ -436,7 +440,7 @@ procedure TfrmTradeMarketInPut_XY.FormCreate(Sender: TObject);
 begin
  inherited;
  OurCoName.Properties.LookupItems.Text := 'W0001';
-  OurCoName.Text := '格美';
+  OurCoName.Text := '格美';
  try
    with ADOConnection1 do
    begin
@ -447,7 +451,7 @@ begin
    ADOQueryBaseCmd.Connection := ADOConnection1;
    ADOQueryBaseTemp.Connection := ADOConnection1;
  except
-    application.MessageBox('网络连接失败！', '提示信息');
+    application.MessageBox('网络连接失败！', '提示信息');
  end;
 end;

@ -461,11 +465,11 @@ begin
  begin
    close;
    sql.Clear;
-    sql.Add(' select CoCode,CoAbbrName from BS_Company A left join BS_Company_contact B on A.COID = B.COID where CoType=''客户'' ');
+    sql.Add(' select CoCode,CoAbbrName from BS_Company A left join BS_Company_contact B on A.COID = B.COID where CoType=''客户'' ');

-    if Trim(canshu4) = '新余' then
-//      sql.Add(' and Stores=''新余'' ');
-      sql.Add(' and stores=''新余'' ');
+    if Trim(canshu4) = '新余' then
+//      sql.Add(' and Stores=''新余'' ');
+      sql.Add(' and stores=''新余'' ');

    Open;

@ -488,7 +492,7 @@ begin
    sql.Add(' exec P_BS_CloInfo_Hot ');
    ExecSQL;
  end;
-  readCxGrid(TRIM(SELF.Caption), Tv1, '生产指示单管理');
+  readCxGrid(TRIM(SELF.Caption), Tv1, '生产指示单管理');
  TMMNo.Text := '';
  fFlileFlag := UserDataFlag + 'HX';
  InitData();
@ -508,11 +512,12 @@ begin
    sql.Clear;
    sql.Add(' SELECT distinct A.C_Code,A.C_Name,A.qtyunit,A.HotQty,StkQty = SUM(B.StkQty) ');
    SQL.ADD(' FROM Bs_Cloth_Info A  LEFT JOIN Bs_Cloth_Io B on A.C_Code=B.C_Code');
-    sql.add(' where B.ioflag=''入库'' ');
-    if Trim(canshu4) = '新余' then
-      sql.Add(' and isnull(STKNAME,'''')=''新余'' ');
+    sql.add(' where B.ioflag=''入库'' ');
+    if Trim(canshu4) = '新余' then
+      sql.Add(' and isnull(STKNAME,'''')=''新余'' ');
    SQL.add('group by A.C_Code,A.C_Name,A.qtyunit,A.HotQty');
    SQL.ADD('order by  A.C_Code ');
+
    Open;
  end;
  with ADO_YS do
@ -545,23 +550,61 @@ end;
 function TfrmTradeMarketInPut_XY.SaveData(): Boolean;
 var
  maxno, Smaxno, maxTMMNo, MaxFNo, MQZ, MTMMNo: string;
+  RetryCount: Integer;
 begin
  try
    ADOCmd.Connection.BeginTrans;

-/////////////////////               保存主表            ///////////////////////////
+/////////////////////               保存主表            ///////////////////////////

    if Trim(FTMMID) = '' then
    begin
      if GetLSNo(ADOCmd, maxno, 'JM', 'Trade_Market_Main', 3, 1) = False then
-        raise Exception.Create('取最大号失败!');
+        raise Exception.Create('取最大号失败!');

-//  大货单编号G50313001<-- G50313 001
-//(“G”+ 25年的“5”(每过五年辉清一下以前的数据 所以0-9循环)+0313(月日)+“001”(单号,不会超过999单))
+//  大货单编号G50313001<-- G50313 001
+//(“G”+ 25年的“5”(每过五年辉清一下以前的数据 所以0-9循环)+0313(月日)+“001”(单号,不会超过999单))

-      MQZ := 'G' + RightStr(Trim(FormatDateTime('yyMMdd', SGetServerDate(ADOTemp))), 5);
-      if GetLSNo(ADOCmd, MTMMNo, MQZ, 'Trade_Market_Main', 3, 0) = False then
-        raise Exception.Create('取最大号失败!');
+//      RetryCount := 0;
+//
+//  // 循环取号，直到不重复为止
+//      while True do
+//      begin
+//    // 1. 取流水号
+//        MQZ := 'G' + RightStr(Trim(FormatDateTime('yyMMdd', SGetServerDate(ADOTemp))), 6);
+//        if not GetLSNo(ADOCmd, MTMMNo, MQZ, 'Trade_Market_Main', 3, 0) then
+//          raise Exception.Create('取最大号失败!');
+//
+//    // 2. 查询是否已存在
+//        with ADOCmd do
+//        begin
+//          Close;
+//          SQL.Clear;
+//          SQL.Add('select count(*) from Trade_Market_Main where TMMNo=:TMMNo');
+//          Parameters.ParamByName('TMMNo').Value := Trim(MTMMNo);
+//          Open;
+//
+//      // 如果数量 > 0 表示已存在
+//          if Fields[0].AsInteger > 0 then
+//          begin
+//            Close;
+//
+//        // 防死循环：最多重试10次
+//            Inc(RetryCount);
+//            if RetryCount > 10 then
+//              raise Exception.Create('自动重试取号10次均重复，请检查流水号规则！');
+//
+//            Continue; // 重复了 → 重新回到循环开头再取一次
+//          end;
+//
+//          Close;
+//        end;
+//
+//    // 3. 不重复 → 退出循环
+//        Break;
+//      end;
+      if not GetLSNo(ADOCmd, MTMMNo, 'G', 'Trade_Market_Main', 3, 1) then
+        raise Exception.Create('取最大号失败!');
      TMMNo.Text := MTMMNo;

    end
@ -584,9 +627,9 @@ begin
        Append;
        FieldByName('FillId').Value := Trim(DCode);
        FieldByName('Filler').Value := Trim(DName);
-        if btnFlag = 1 then //保存后立即完成
+        if btnFlag = 1 then //保存后立即完成
          FieldByName('status').Value := Trim('10');
-        if btnFlag = 5 then //保存后立即提交
+        if btnFlag = 5 then //保存后立即提交
          FieldByName('status').Value := Trim('1');
      end
      else
@ -606,8 +649,8 @@ begin
      Post;
    end;

-/////////////////////               保存主表            ///////////////////////////
-/////////////////////               保存子表            ///////////////////////////
+/////////////////////               保存主表            ///////////////////////////
+/////////////////////               保存子表            ///////////////////////////
    with CDS_1 do
    begin
      First;
@ -616,7 +659,7 @@ begin
        if Trim(CDS_1.fieldbyname('TMSId').AsString) = '' then
        begin
          if GetLSNo(ADOCmd, Smaxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then
-            raise Exception.Create('取子流水号失败!');
+            raise Exception.Create('取子流水号失败!');
        end
        else
        begin
@ -646,7 +689,7 @@ begin
        Next;
      end;
    end;
-/////////////////////               保存子表           ///////////////////////////
+/////////////////////               保存子表           ///////////////////////////


    with ADOCmd do
@ -657,7 +700,7 @@ begin
      Open;
    end;
    if ADOCmd.RecordCount > 1 then
-      raise Exception.Create('订单号重复!');
+      raise Exception.Create('订单号重复!');

    with ADOCmd do
    begin
@ -668,7 +711,7 @@ begin
      Open;
    end;
    if not ADOCmd.IsEmpty then
-      raise Exception.Create('颜色重复!');
+      raise Exception.Create('颜色重复!');

    FTMMID := Trim(maxno);
    ADOCmd.Connection.CommitTrans;
@ -684,14 +727,14 @@ begin
    end;
    SCreateCDS(ADO_1, CDS_1);
    SInitCDSData(ADO_1, CDS_1);
-    Result := True; //保存后立即打印
+    Result := True; //保存后立即打印
    if (btnFlag = 2) or (btnFlag = 4) then
    begin
      try
        frmLabelPrint := TfrmLabelPrint.Create(Application);
        with frmLabelPrint do
        begin
-          if canshu4 = '新余' then
+          if canshu4 = '新余' then
            FLMType := 'TradePlanPrintxy'
          else
            FLMType := 'TradePlanPrint';
@ -705,14 +748,14 @@ begin
        frmLabelPrint.Free;
      end;
    end;
-    if btnFlag = 3 then //保存后立即新增
+    if btnFlag = 3 then //保存后立即新增
    begin
      PState := 0;
      FTMMId := '';
      FormShow(Self);
 //      CDS_1.Close;
 //      InitData();
-//      SClearData(ScrollBox1, 2); //清空容器中控件的内容
+//      SClearData(ScrollBox1, 2); //清空容器中控件的内容
 //      CustName.Text := '';
 //      if CDS_1.IsEmpty then
 //      begin
@ -722,7 +765,7 @@ begin
  except
    Result := False;
    ADOCmd.Connection.RollbackTrans;
-    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
  end;
 end;

@ -742,51 +785,51 @@ begin

  if trim(CustName.Text) = '' then
  begin
-    Application.MessageBox('客户不能为空!', '提示', 0);
+    Application.MessageBox('客户不能为空!', '提示', 0);
    Exit;
  end;

  if CDS_1.IsEmpty then
  begin
-    Application.MessageBox('明细不能为空!', '提示', 0);
+    Application.MessageBox('明细不能为空!', '提示', 0);
    Exit;
  end;

  if CDS_1.Locate('TMSUnit', null, []) then
  begin
-    Application.MessageBox('单位不能为空!', '提示', 0);
+    Application.MessageBox('单位不能为空!', '提示', 0);
    Exit;
  end;

  if CDS_1.Locate('TMSQty', null, []) then
  begin
-    Application.MessageBox('数量不能为空!', '提示', 0);
+    Application.MessageBox('数量不能为空!', '提示', 0);
    Exit;
  end;

  if CDS_1.Locate('C_Color', null, []) then
  begin
-    Application.MessageBox('颜色不能为空!', '提示', 0);
+    Application.MessageBox('颜色不能为空!', '提示', 0);
    Exit;
  end;
 //  if CDS_1.Locate('OrderQty', null, []) then
 //  begin
-//    Application.MessageBox('报单数量不能为空!', '提示', 0);
+//    Application.MessageBox('报单数量不能为空!', '提示', 0);
 //    Exit;
 //  end;
 //  if CDS_1.Locate('OrderUnit', null, []) then
 //  begin
-//    Application.MessageBox('报单单位不能为空!', '提示', 0);
+//    Application.MessageBox('报单单位不能为空!', '提示', 0);
 //    Exit;
 //  end;
  if CDS_1.Locate('Price', null, []) then
  begin
-    Application.MessageBox('单价不能为空!', '提示', 0);
+    Application.MessageBox('单价不能为空!', '提示', 0);
    Exit;
  end;
  if not CDS_KH.Locate('CoAbbrName', self.CustName.Text, []) then
  begin
-    Application.MessageBox('客户不存在!', '提示', 0);
+    Application.MessageBox('客户不存在!', '提示', 0);
    Exit;
  end
  else
@ -797,8 +840,8 @@ begin
  if SaveData() then
  begin

-    Application.MessageBox('保存成功！', '提示', 0);
-    if btnFlag = 4 then  //保存后打印并退出
+    Application.MessageBox('保存成功！', '提示', 0);
+    if btnFlag = 4 then  //保存后打印并退出
      ModalResult := 1;
  end;
 end;
@ -815,10 +858,10 @@ begin
    Exit;
  if CDS_1.Locate('SSel', True, []) = False then
  begin
-    Application.MessageBox('没有选择数据!', '提示', 0);
+    Application.MessageBox('没有选择数据!', '提示', 0);
    Exit;
  end;
-  if Application.MessageBox('确定要删除选择的数据吗？', '提示', 32 + 4) <> IDYES then
+  if Application.MessageBox('确定要删除选择的数据吗？', '提示', 32 + 4) <> IDYES then
    exit;
  CDS_1.DisableControls;
  with CDS_1 do
@ -846,7 +889,7 @@ end;

 procedure TfrmTradeMarketInPut_XY.ToolButton3Click(Sender: TObject);
 begin
-  WriteCxGrid(TRIM(SELF.Caption), Tv1, '生产指示单管理');
+  WriteCxGrid(TRIM(SELF.Caption), Tv1, '生产指示单管理');

 end;

@ -893,7 +936,7 @@ begin
                if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then
                begin
                  ADOCmd.Connection.RollbackTrans;
-                  Application.MessageBox('取子流水号失败！', '提示', 0);
+                  Application.MessageBox('取子流水号失败！', '提示', 0);
                  Exit;
                end;
                with self.CDS_1 do
@ -1088,18 +1131,19 @@ begin
    sql.Add('from BS_Company A  ');
    sql.Add('left join  BS_Company_contact B ON A.COID=B.COID and B.IsDefault=1  ');
    sql.Add('where 1=1 ');
-    sql.Add(' and A.CoType=''' + Trim('客户') + '''');
-//    if Trim(FAuthority) = '理单业务' then
+    sql.Add(' and A.CoType=''' + Trim('客户') + '''');
+//    if Trim(FAuthority) = '理单业务' then
 //    begin
 //      sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))');
 //    end;
-    if canshu4 = '新余' then
-      sql.Add(' and A.Stores=''' + Trim('新余') + '''');
+    if canshu4 = '新余' then
+      sql.Add(' and A.Stores=''' + Trim('新余') + '''');
    sql.Add(' and A.CoAbbrName=''' + Trim(CustName.Text) + '''');
    Open;
  end;
  self.ShippingAddress.Text := Trim(adotemp.fieldbyname('mxaddress').AsString);
  self.CONTACT.Text := Trim(adotemp.fieldbyname('Telephone').AsString);
+  self.AddressArea.Text := Trim(adotemp.fieldbyname('MXAREA').AsString);

 end;

@ -1115,7 +1159,7 @@ var
  sFieldName: string;
 begin

-  sFieldName := leftbstr(ExtractFilePath(Application.ExeName), 1) + ':\图片查看';
+  sFieldName := leftbstr(ExtractFilePath(Application.ExeName), 1) + ':\图片查看';

  if not DirectoryExists(pchar(sFieldName)) then
    CreateDirectory(pchar(sFieldName), nil);
@ -1123,7 +1167,7 @@ begin
  sFieldName := sFieldName + '\' + trim(FileName);

  try
-    IdFTP1.Host := ReadINIFileStr('SYSTEMSET.INI', 'SERVER', '服务器地址', '127.0.0.1');
+    IdFTP1.Host := ReadINIFileStr('SYSTEMSET.INI', 'SERVER', '服务器地址', '127.0.0.1');
    IdFTP1.Username := 'three';
    IdFTP1.Password := '641010';
    IdFTP1.Connect();
@ -1136,14 +1180,14 @@ begin
    try
      IdFTP1.Get(fFlileFlag + '\' + Trim(FileName), sFieldName, true, false);
    except
-      Application.MessageBox('客户图样文件不存在', '提示', MB_ICONWARNING);
+      Application.MessageBox('客户图样文件不存在', '提示', MB_ICONWARNING);
      IdFTP1.Quit;
      Exit;
    end;
  end
  else
  begin
-    Application.MessageBox('无法连接文件服务器', '提示', MB_ICONWARNING);
+    Application.MessageBox('无法连接文件服务器', '提示', MB_ICONWARNING);
    IdFTP1.Quit;
    Exit;
  end;
@ -1194,7 +1238,7 @@ begin
    frmCompanySel := TfrmCompanySel.Create(Application);
    with frmCompanySel do
    begin
-      FCoType := '我司';
+      FCoType := '我司';
      if ShowModal = 1 then
      begin
        self.OurCoName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
@ -1217,7 +1261,7 @@ begin
    with frmZDYHelp do
    begin
      flag := 'OrderUnit';
-      flagname := '数量单位';
+      flagname := '数量单位';
      if ShowModal = 1 then
      begin
        Self.CDS_1.Edit;
@ -1234,7 +1278,7 @@ var
  mvalue, FFieldName, YValue: string;
  FDDQty, FCPCDXS, FQty, FDKCQty: Double;
 begin
-  mvalue := TcxComboBox(Sender).EditingText;                                           //变化后单位
+  mvalue := TcxComboBox(Sender).EditingText;                                           //变化后单位
  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
  with CDS_1 do
  begin
@ -1242,8 +1286,8 @@ begin
    Edit;
    FieldByName(FFieldName).Value := mvalue;
    Post;
-    YValue := FieldByName('DDQtyUnit').AsString;                                        //原单位=订单单位
-    FDDQty := FieldByName('DDQty').AsFloat;                                            //订单数量
+    YValue := FieldByName('DDQtyUnit').AsString;                                        //原单位=订单单位
+    FDDQty := FieldByName('DDQty').AsFloat;                                            //订单数量
    FCPCDXS := FieldByName('CPCDXS').AsFloat;
    FDKCQty := FieldByName('DKCQty').AsFloat;
    FQty := FieldByName('PRTOrderQty').AsFloat;
@ -1312,8 +1356,8 @@ begin
    with frmZDYHelp do
    begin
      flag := 'PriceUnit';
-      flagname := '价格单位';
-      if Trim(DParameters1) <> '高权限' then
+      flagname := '价格单位';
+      if Trim(DParameters1) <> '高权限' then
      begin
        TBAdd.Visible := False;
        TBEdit.Visible := False;
@ -1348,6 +1392,8 @@ begin
      begin
        self.ShippingAddress.Text := Trim(frmComContactSel.CDS_1.fieldbyname('mxaddress').AsString);
        self.CONTACT.Text := Trim(frmComContactSel.CDS_1.fieldbyname('PhoneNumber').AsString);
+        self.AddressArea.Text := Trim(frmComContactSel.CDS_1.fieldbyname('MXAREA').AsString);
+
      end;
    end;
  finally
@ -1361,7 +1407,7 @@ begin
    frmCompanySel := TfrmCompanySel.Create(Application);
    with frmCompanySel do
    begin
-      FCoType := '客户';
+      FCoType := '客户';
      FStores := Trim(canshu4);
      FsqlStr := ' and stores = ' + QuotedStr(Trim(canshu4));
      if ShowModal = 1 then
@ -1370,6 +1416,7 @@ begin
        self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
        self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString);
        self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Telephone').AsString);
+        self.AddressArea.Text := Trim(frmCompanySel.CDS_1.fieldbyname('MXAREA').AsString);

      end;
    end;
@ -1423,16 +1470,16 @@ var
 begin
  if Key = #13 then
  begin
-    if Label38.Caption = '序号' then
+    if Label38.Caption = '序号' then
    begin
-      Application.MessageBox('请选择数据', '提示', 0);
+      Application.MessageBox('请选择数据', '提示', 0);
      Exit;
    end;
    if StrTofloatDef(QtyMX.Text, 0) = 0 then
      Exit;
    if GetLSNo(ADOTemp, MaxNo, 'MX', 'Trade_Market_Sub_Qty', 4, 1) = False then
    begin
-      Application.MessageBox('取最大号失败!', '提示', 0);
+      Application.MessageBox('取最大号失败!', '提示', 0);
      Exit;
    end;
    try
@ -1462,7 +1509,7 @@ begin
      end;
    except
      ADOCmd.Connection.RollbackTrans;
-      Application.MessageBox('添加失败!', '提示', 0);
+      Application.MessageBox('添加失败!', '提示', 0);
    end;
    QtyMX.Text := '';
    TvMX.Controller.EditingController.ShowEdit();
@ -1489,15 +1536,15 @@ procedure TfrmTradeMarketInPut_XY.Tv1CellDblClick(Sender: TcxCustomGridTableView
 var
  AColumn: TcxGridColumn;
 begin
-  // 获取被双击的列
+  // 获取被双击的列
  AColumn := ACellViewInfo.Item as TcxGridColumn;

-  // 检查是否双击了 Qty 列（通过列名判断）
+  // 检查是否双击了 Qty 列（通过列名判断）
  if AColumn.Name = 'Tv1Column19' then
  begin
    if not CDS_1.IsEmpty then
    begin
-      // 获取当前行的相关ID
+      // 获取当前行的相关ID
      Self.MTMSId := CDS_1.FieldByName('TMSId').AsString;
      Self.FTMMID := CDS_1.FieldByName('TMMId').AsString;

@ -1541,6 +1588,40 @@ begin
  end;
 end;

+procedure TfrmTradeMarketInPut_XY.Tv1Column12PropertiesChange(Sender: TObject);
+var
+  sInput: string;
+  ACombo: TcxLookupComboBox;
+begin
+  inherited;
+  ACombo := TcxLookupComboBox(Sender);
+  sInput := Trim(ACombo.Text); // 获取你输入的文字
+  if CDS_1.FieldByName('C_CODE').AsString = '' then
+    EXIT;
+
+  with ADO_YS do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' SELECT * ');
+    sql.Add(' FROM V_COLOR_VIEW A WHERE 1=1 and C_CODE= ' + QuotedStr(CDS_1.FieldByName('C_CODE').AsString));
+
+    if sInput <> '' then
+    begin
+      sql.Add(Format(' AND  A.C_ColorNo LIKE ''%%%s%%'' ', [sInput]));
+    // ✅ 关键：DISTINCT 下绝对不报错的排序（只排查询里出现的字段）
+      sql.Add(Format(' ORDER BY CASE WHEN A.C_ColorNo = ''%s'' THEN 0 ELSE 1 END, A.C_ColorNo ', [sInput]));
+
+    end
+    else
+    begin
+//      sql.Add(' AND  C_CODE= ' + QuotedStr(CDS_1.FieldByName('C_CODE').AsString));
+    end;
+//    ShowMessage(SQL.Text);
+    Open;
+  end;
+end;
+
 procedure TfrmTradeMarketInPut_XY.Tv1Column12PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -1569,7 +1650,39 @@ begin
    FieldByName('C_Color').Value := ADO_YS.FieldByName('C_Color').Value;
    FieldByName('price').Value := ADO_YS.FieldByName('price').Value * (1 + (FIncludeTax / 100));
    FieldByName('referencePrice').Value := ADO_YS.FieldByName('Price').Value;
+
    Post;
+
+    with ADOTemp do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add(' SELECT');
+      SQL.Add('   (ISNULL((SELECT SUM(ISNULL(StkQty, 0))');
+      SQL.Add('      FROM Bs_Cloth_IO');
+      SQL.Add('      WHERE C_Code = ' + QuotedStr(cds_1.FieldByName('C_Code').AsString));
+      SQL.Add('        AND C_ColorNO = ' + QuotedStr(cds_1.FieldByName('C_ColorNO').AsString));
+      SQL.Add('        AND STKNAME = ''新余''), 0)');
+      SQL.Add('    - ISNULL((SELECT SUM(ISNULL(Qty, 0))');
+      SQL.Add('      FROM Trade_Market_Sub_Qty X');
+      SQL.Add('      INNER JOIN Trade_Market_Sub F ON X.TMSID = F.TMSID');
+      SQL.Add('      INNER JOIN Trade_Market_Main E ON E.TMMID = F.TMMID');
+      SQL.Add('      WHERE Store = ''新余''');
+      SQL.Add('        AND E.Status = ''10''');
+      SQL.Add('        AND F.C_Code = ' + QuotedStr(cds_1.FieldByName('C_Code').AsString));
+      SQL.Add('        AND F.C_ColorNo = ' + QuotedStr(cds_1.FieldByName('C_ColorNO').AsString));
+      SQL.Add('   ), 0)) AS StkQty');
+
+      Open;
+
+    // 获取计算结果
+
+    end;
+
+  // 更新当前记录
+    CDS_1.Edit;
+    CDS_1.FieldByName('StkQty').Value := ADOTemp.FieldByName('StkQty').AsFloat;
+    CDS_1.Post;
  end;

  with ADOTemp do
@ -1675,7 +1788,7 @@ begin
    FieldByName('C_Code').Value := ADO_PM.FieldByName('C_Code').Value;
    FieldByName('TMSUnit').Value := ADO_PM.FieldByName('qtyunit').Value;

-    FieldByName('StkQty').Value := ADO_PM.FieldByName('StkQty').Value;
+//    FieldByName('StkQty').Value := ADO_PM.FieldByName('StkQty').Value;

    Post;
  end;
@ -1728,7 +1841,7 @@ end;
 procedure TfrmTradeMarketInPut_XY.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
  inherited;
-  Label38.Caption := '序号：' + Trim(cds_1.fieldbyname('SerialNo').AsString);
+  Label38.Caption := '序号：' + Trim(cds_1.fieldbyname('SerialNo').AsString);
  MTMSId := Trim(cds_1.fieldbyname('TMSId').AsString);
  InitMXGrid(MTMSId);
 end;
@ -1812,7 +1925,7 @@ begin
 //    close;
 //    sql.Clear;
 //    sql.Add(' exec P_KCSD_AllNew ');
-//    sql.Add(' @Operation=''大货单明细删除'' ');
+//    sql.Add(' @Operation=''大货单明细删除'' ');
 //    sql.Add(' ,@TMMNo=' + quotedstr(trim(TMMNo.Text)));
 //    ExecSQL;
 //  end;
@ -1904,8 +2017,8 @@ begin
      flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
      if Trim(flag) = 'OrdDefStr2' then
      begin
-        V1Name.Caption := '中文名称';
-        V1Note.Caption := '英文名称';
+        V1Name.Caption := '中文名称';
+        V1Note.Caption := '英文名称';
        fnote := True;
      end;
      if ShowModal = 1 then
--- a/T05贸易门市管理/U_TradeMarketInPut_XYth.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut_XYth.dfm
--- a/T05贸易门市管理/U_TradeMarketInPut_XYth.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut_XYth.pas
--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@ -9,7 +9,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
-  ExplicitLeft = -526
  ExplicitWidth = 1556
  ExplicitHeight = 633
  PixelsPerInch = 96
@ -124,16 +123,24 @@ inherited frmTradeMarketList: TfrmTradeMarketList
      ImageIndex = 11
      OnClick = TNowcClick
    end
-    object TBZF: TToolButton
+    object ToolButton3: TToolButton
      Left = 996
      Top = 0
      AutoSize = True
+      Caption = #25764#38144#22238#21333
+      ImageIndex = 11
+      OnClick = ToolButton3Click
+    end
+    object TBZF: TToolButton
+      Left = 1099
+      Top = 0
+      AutoSize = True
      Caption = #20316#24223
      ImageIndex = 31
      OnClick = TBZFClick
    end
    object TBNOZF: TToolButton
-      Left = 1067
+      Left = 1170
      Top = 0
      AutoSize = True
      Caption = #25764#38144#20316#24223
@ -141,7 +148,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
      OnClick = TBNOZFClick
    end
    object ToolButton2: TToolButton
-      Left = 1170
+      Left = 1273
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -149,7 +156,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
      OnClick = ToolButton2Click
    end
    object ToolButton1: TToolButton
-      Left = 1273
+      Left = 1376
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -157,7 +164,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 1344
+      Left = 1447
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -296,6 +303,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        HeaderAlignmentHorz = taCenter
        Width = 77
      end
+      object Tv1Column32: TcxGridDBColumn
+        Caption = #35746#21333#29366#24577
+        DataBinding.FieldName = 'dqstatus'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #21333#25454#32534#21495
        DataBinding.FieldName = 'TMMNo'
@ -313,14 +327,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        Options.Editing = False
        Width = 77
      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #32463#33829#21333#20301
-        DataBinding.FieldName = 'OurCoName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
      object Tv1Column4: TcxGridDBColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CustName'
@ -329,55 +335,12 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        Options.Editing = False
        Width = 77
      end
-      object v1DeliveryDate: TcxGridDBColumn
-        Caption = #20132#36135#26085#26399
-        DataBinding.FieldName = 'DlyDate'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.ShowTime = False
-        OnCustomDrawCell = v1DeliveryDateCustomDrawCell
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #21046#21333#20154
-        DataBinding.FieldName = 'FILLER'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'OrdNote'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #21457#36135#22320#22336
-        DataBinding.FieldName = 'ShippingAddress'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 77
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #32852#31995#26041#24335
-        DataBinding.FieldName = 'CONTACT'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
      object Tv1Column8: TcxGridDBColumn
-        Caption = #20135#21697#32534#21495
-        DataBinding.FieldName = 'C_Code'
+        Caption = #19994#21153#21592
+        DataBinding.FieldName = 'Saleser'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
+        Width = 70
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #33394#24067#21517#31216
@ -387,14 +350,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        Options.Editing = False
        Width = 77
      end
-      object Tv1Column12: TcxGridDBColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'C_Color'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
      object Tv1Column17: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
@ -403,6 +358,14 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        Options.Editing = False
        Width = 58
      end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
      object Tv1Column11: TcxGridDBColumn
        Caption = #25253#21333#25968#37327
        DataBinding.FieldName = 'OrderQty'
@ -410,13 +373,35 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        HeaderAlignmentHorz = taCenter
        Width = 104
      end
-      object Tv1Column22: TcxGridDBColumn
-        Caption = #20986#24211#25968#37327
-        DataBinding.FieldName = 'OutQty'
+      object Tv1Column13: TcxGridDBColumn
+        Caption = #25253#21333#21333#20301
+        DataBinding.FieldName = 'OrderUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 91
+      end
+      object Tv1Column31: TcxGridDBColumn
+        Caption = #24212#37197#25968#37327
+        DataBinding.FieldName = 'tmsqty'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 84
      end
+      object Tv1Column22: TcxGridDBColumn
+        Caption = #24050#37197#25968#37327
+        DataBinding.FieldName = 'OutQty'
+        DataBinding.IsNullValueType = True
+        OnCustomDrawCell = Tv1Column22CustomDrawCell
+        HeaderAlignmentHorz = taCenter
+        Width = 84
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #35745#20215#21333#20301
+        DataBinding.FieldName = 'TMSUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
      object Tv1Column23: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'Price'
@ -431,20 +416,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        HeaderAlignmentHorz = taCenter
        Width = 70
      end
-      object Tv1Column13: TcxGridDBColumn
-        Caption = #25253#21333#21333#20301
-        DataBinding.FieldName = 'OrderUnit'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 91
-      end
-      object Tv1Column19: TcxGridDBColumn
-        Caption = #27424#21333#25968
-        DataBinding.FieldName = 'OrderOweQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 84
-      end
      object Tv1Column14: TcxGridDBColumn
        Caption = #24211#23384#38656#27714
        DataBinding.FieldName = 'TMSQty'
@ -460,34 +431,20 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        HeaderAlignmentHorz = taCenter
        Width = 111
      end
-      object Tv1Column15: TcxGridDBColumn
-        Caption = #22791#36135#21333#20301
-        DataBinding.FieldName = 'TMSUnit'
+      object Tv1Column19: TcxGridDBColumn
+        Caption = #27424#21333#25968
+        DataBinding.FieldName = 'OrderOweQty'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 93
+        Width = 84
      end
-      object Tv1Column21: TcxGridDBColumn
-        Caption = #22791#36135#29366#24577
-        DataBinding.FieldName = 'StkStatus'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 92
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #27004#23618
-        DataBinding.FieldName = 'StkPosition'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 95
-      end
-      object Tv1Column16: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'OrdSNote'
+      object v1DeliveryDate: TcxGridDBColumn
+        Caption = #20132#36135#26085#26399
+        DataBinding.FieldName = 'DlyDate'
        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.ShowTime = False
+        OnCustomDrawCell = v1DeliveryDateCustomDrawCell
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 77
@ -500,6 +457,67 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        Options.Editing = False
        Width = 88
      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #21046#21333#20154
+        DataBinding.FieldName = 'FILLER'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #35746#21333#22791#27880
+        DataBinding.FieldName = 'OrdNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column16: TcxGridDBColumn
+        Caption = #26126#32454#22791#27880
+        DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #32852#31995#26041#24335
+        DataBinding.FieldName = 'CONTACT'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 77
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #21457#36135#22320#22336
+        DataBinding.FieldName = 'ShippingAddress'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 117
+      end
+      object Tv1Column27: TcxGridDBColumn
+        Caption = #21306#22495#20195#21495
+        DataBinding.FieldName = 'MXAREA'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 68
+      end
+      object Tv1Column21: TcxGridDBColumn
+        Caption = #22791#36135#29366#24577
+        DataBinding.FieldName = 'StkStatus'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 92
+      end
+      object Tv1Column26: TcxGridDBColumn
+        Caption = #36710#21495
+        DataBinding.FieldName = 'carPlate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
      object Tv1Column25: TcxGridDBColumn
        Caption = #35746#21333#31867#22411
        DataBinding.FieldName = 'OrdType'
@ -507,11 +525,41 @@ inherited frmTradeMarketList: TfrmTradeMarketList
        HeaderAlignmentHorz = taCenter
        Width = 60
      end
-      object Tv1Column26: TcxGridDBColumn
-        Caption = #36710#21495
-        DataBinding.FieldName = 'carPlate'
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #27004#23618
+        DataBinding.FieldName = 'StkPosition'
        DataBinding.IsNullValueType = True
-        Width = 60
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 95
+      end
+      object Tv1Column15: TcxGridDBColumn
+        Caption = #35013#36710#26102#38388
+        DataBinding.FieldName = 'zctime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 73
+      end
+      object Tv1Column28: TcxGridDBColumn
+        Caption = #20986#36710#26102#38388
+        DataBinding.FieldName = 'Cctime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column29: TcxGridDBColumn
+        Caption = #22238#21333#26102#38388
+        DataBinding.FieldName = 'hdtime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 68
+      end
+      object Tv1Column30: TcxGridDBColumn
+        Caption = #25171#21360#27425#25968
+        DataBinding.FieldName = 'PRINTCOUNT'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 72
      end
    end
    object cxGrid1Level1: TcxGridLevel
@ -530,7 +578,8 @@ inherited frmTradeMarketList: TfrmTradeMarketList
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
      '      '#26410#37197#36135'       '
-      '      '#24050#37197#36135'       '
+      '      '#24050#37197#36135#26410#25171#21360'       '
+      '      '#24050#37197#36135#24050#25171#21360'       '
      '      '#24050#35013#36710'       '
      '      '#24050#22238#21333'      '
      '      '#24050#20316#24223'      '
--- a/T05贸易门市管理/U_TradeMarketList.pas
+++ b/T05贸易门市管理/U_TradeMarketList.pas
@ -63,7 +63,6 @@ type
    CustName: TcxTextEdit;
    Tv1Column6: TcxGridDBColumn;
    cxgrdpmn2: TcxGridPopupMenu;
-    Tv1Column2: TcxGridDBColumn;
    Tv1Column1: TcxGridDBColumn;
    Label2: TLabel;
    C_Name: TcxTextEdit;
@ -80,11 +79,9 @@ type
    Tv1Column5: TcxGridDBColumn;
    frmFrameDateSel1: TfrmFrameDateSel;
    Tv1Column7: TcxGridDBColumn;
-    Tv1Column8: TcxGridDBColumn;
    Tv1Column9: TcxGridDBColumn;
    Tv1Column12: TcxGridDBColumn;
    Tv1Column14: TcxGridDBColumn;
-    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
    Tv1Column10: TcxGridDBColumn;
    ToolButton1: TToolButton;
@ -104,6 +101,16 @@ type
    TBNOZF: TToolButton;
    Tv1Column25: TcxGridDBColumn;
    Tv1Column26: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column28: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    ToolButton3: TToolButton;
+    Tv1Column30: TcxGridDBColumn;
+    Tv1Column31: TcxGridDBColumn;
+    Tv1Column32: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -146,6 +153,8 @@ type
    procedure TBZFClick(Sender: TObject);
    procedure TBNOZFClick(Sender: TObject);
    procedure Tv1DblClick(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure Tv1Column22CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
  private
    DQdate: TDateTime;
    procedure InitGrid();
@ -203,7 +212,14 @@ begin
  TWC.Enabled := False;
  TNowc.Enabled := False;
  TBDel.Enabled := False;
-
+  ToolButton3.Enabled := False;
+  TBPrint.Enabled := False;
+  TBZF.Enabled := False;
+  TBNOZF.Enabled := False;
+  if (canshu1 <> '查询') and (canshu2 = '') then
+  begin
+    TBZF.Enabled := True;
+    TBNOZF.Enabled := True;
    case cxTabControl1.TabIndex of
      0:
        begin
@ -215,12 +231,14 @@ begin
        end;
      1:
        begin
+          TBEdit.Enabled := True;
          TBTJCX.Enabled := True;
          btnCopy.Enabled := True;
          TBDel.Enabled := True;
        //tchk.Enabled := True;
          TWC.Enabled := True;
          btnCopy.Enabled := True;
+          TBPrint.Enabled := True;
        end;
 //    2:
 //      begin
@ -228,11 +246,33 @@ begin
 //
 //        //tnochk.Enabled := True;
 //      end;
+
      2:
+        begin
+          TBTJCX.Enabled := True;
+          btnCopy.Enabled := True;
+          TBDel.Enabled := True;
+        //tchk.Enabled := True;
+          TWC.Enabled := True;
+          btnCopy.Enabled := True;
+          TBPrint.Enabled := True;
+        end;
+
+      3:
        begin
          TNowc.Enabled := True;
          btnCopy.Enabled := True;
        end;
+      4:
+        begin
+          TNowc.Enabled := True;
+          btnCopy.Enabled := True;
+        end;
+      5:
+        begin
+          ToolButton3.Enabled := true;
+        end;
+    end;
  end;

 end;
@ -273,6 +313,36 @@ procedure TfrmTradeMarketList.InitGrid();
 var
  SqlStr, FilterStr: string;
 begin
+  case cxTabControl1.TabIndex of
+    0:
+      begin
+        with ADOQueryCmd do
+        begin
+          close;
+          sql.Clear;
+          sql.Add('update  Trade_Market_Main SET status=''2'' ');
+          sql.Add(' where NOT EXISTS(SELECT * FROM Trade_Market_SUB B WHERE B.TMMID=Trade_Market_Main.TMMID AND B.OUTQTY<=TMSQTY) ');
+          SQL.Add('AND ISNULL(status, ''0'')=''1''  AND STORE<>''新余''');
+//          ShowMessage(sql.Text);
+          execsql;
+        end;
+
+      end;
+//    1:
+//      begin
+//        with ADOQueryCmd do
+//        begin
+//          close;
+//          sql.Clear;
+//          sql.Add('update  Trade_Market_Main SET status=''1'' ');
+//          sql.Add(' where   EXISTS(SELECT * FROM Trade_Market_SUB B WHERE B.TMMID=Trade_Market_Main.TMMID AND B.OUTQTY<TMSQTY) ');
+//          SQL.Add('AND ISNULL(status, ''0'')=''2''  AND STORE<>''新余''');
+////          ShowMessage(sql.Text);
+//          execsql;
+//        end;
+//      end;
+  end;
+
  FilterStr := SGetFilters(Panel1, 1, 2);

  SqlStr := ' exec  P_Trade_Market_View  ';
@ -290,22 +360,36 @@ begin
      end;
    1:
      begin
-        SqlStr := SqlStr + ' , @Status=''2'' ';   //待审核
+        SqlStr := SqlStr + ' , @Status=''2'' ';   //已配货未打印
+        SqlStr := SqlStr + ' , @dyStatus=''0'' ';   //已配货未打印
      end;
    2:
      begin
-        SqlStr := SqlStr + ' , @Status=''9'' ';   //已完成
+        SqlStr := SqlStr + ' , @Status=''2'' ';   //已配货已打印
+        SqlStr := SqlStr + ' , @dyStatus=''1'' ';   //已配货已打印
      end;
+
    3:
      begin
-        SqlStr := SqlStr + ' , @Status=''10'' ';   //已回单
+        SqlStr := SqlStr + ' , @Status=''9'' ';   //已完成
      end;
    4:
+      begin
+        SqlStr := SqlStr + ' , @Status=''10'' ';   //已回单
+      end;
+    5:
      begin
        SqlStr := SqlStr + ' , @Status=''11'' ';   //已作废
      end;
+    6:
+      begin
+        if canshu2 <> '' then
+        begin
+          SqlStr := SqlStr + ' , @TSStatus=''1'' ';
+        end;

      end;
+  end;
 //  ShowMessage(SqlStr);
  InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId');
 end;
@ -363,7 +447,7 @@ end;

 procedure TfrmTradeMarketList.InitForm();
 begin
-  ReadCxGrid('指示单列表FF1', Tv1, '生产指示单管理');
+  ReadCxGrid('指示单列表FF11', Tv1, '生产指示单管理');
  frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180;
  frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);

@ -376,11 +460,11 @@ begin
  if Order_Main.IsEmpty then
    Exit;

-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
-    Exit;
-  end;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;

  try
    frmTradeMarketInPut := TfrmTradeMarketInPut.Create(Application);
@ -408,11 +492,11 @@ procedure TfrmTradeMarketList.TBNOZFClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    exit;
-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
-    Exit;
-  end;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;
  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
    Exit;
  try
@ -453,11 +537,11 @@ procedure TfrmTradeMarketList.TBDelClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    Exit;
-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
-    Exit;
-  end;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;

  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
    Exit;
@ -466,10 +550,18 @@ begin
  begin
    if Trim(Order_Main.fieldbyname('TMMId').AsString) <> '' then
    begin
-      DelData()
+      DelData();
+
    end;
+    with Order_Main do
+    begin
      Order_Main.Delete;
    end;
+
+
+//    Order_Main.Delete;
+  end;
+  initgrid();
 end;

 function TfrmTradeMarketList.DelData(): Boolean;
@ -519,6 +611,13 @@ begin
  end;
  WSql := '';
  Order_Main.DisableControls;
+
+  if canshu4 = '新余' then
+  begin
+    WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
+  end
+  else
+  begin
    with Order_Main do
    begin
      First;
@ -526,20 +625,22 @@ begin
      begin
        if Order_Main.fieldbyname('SSel').AsBoolean then
        begin
-//        if WSql <> '' then
-//        begin
-//          WSql := WSql + ',' + Trim(Order_Main.fieldbyname('TMSId').AsString);    //TMSId
-//        end
-//        else
-//        begin
-//          WSql := Trim(Order_Main.fieldbyname('TMSId').AsString);
-//        end;
-        WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
+          if WSql <> '' then
+          begin
+            WSql := WSql + ',' + Trim(Order_Main.fieldbyname('TMmId').AsString);    //TMSId
+          end
+          else
+          begin
+            WSql := Trim(Order_Main.fieldbyname('TMmId').AsString);
+          end;
+//        WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
        end;
        Next;
      end;
    end;
    Order_Main.Locate('SSel', True, []);
+  end;
+
  Order_Main.EnableControls;
  try
    frmLabelPrint := TfrmLabelPrint.Create(Application);
@ -552,7 +653,17 @@ begin
      FFiltration1 := Trim(WSql);
      if ShowModal = 1 then
      begin
-//        Self.InitGrid();
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('update  Trade_Market_Main set PRINTCOUNT=PRINTCOUNT+1   ');
+          sql.add('where  exists(select * from [dbo].[F_Tool_SplitString](' + quotedstr(WSql) + ','','') X where X.RTVALUE=Trade_Market_Main.TMMID  )');
+
+          ExecSQL;
+        end;
+
+        Self.InitGrid();
      end;
    end;
  finally
@ -601,6 +712,12 @@ begin
  canshu1 := trim(self.fParameters1);
  canshu2 := trim(self.fParameters2);
  canshu4 := trim(self.fParameters4);
+  if canshu2 <> '' then
+  begin
+    cxTabControl1.Tabs[3].Visible := False;  // 隐藏第3个标签页（索引2）
+    cxTabControl1.Tabs[4].Visible := False;  // 隐藏第4个标签页（索引3）
+    cxTabControl1.Tabs[5].Visible := False;  // 隐藏第5个标签页（索引4）
+  end;
  fFlileFlag := UserDataFlag + 'HX';
  cxTabControl1.TabIndex := 0;
  InitForm();
@ -700,6 +817,11 @@ begin
      TBSave.Visible := False;
      ScrollBox1.Enabled := True;
      N2.Visible := False;
+
+      TBAdd.Visible := False;
+      ToolButton6.Visible := False;
+      TBEdit.Visible := False;
+
      frmTradeMarketInPut.fordtype := self.fordtype;
      TvMX.OnCellDblClick := nil;
      Panel5.Visible := False;
@ -754,33 +876,44 @@ begin
  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;

+procedure TfrmTradeMarketList.Tv1Column22CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+var
+  id: Integer;
+begin
+
+  if AViewInfo.GridRecord.Values[TV1.GetColumnByFieldName('OutQty').Index] >= AViewInfo.GridRecord.Values[TV1.GetColumnByFieldName('tmsqty').Index] then
+  begin
+    ACanvas.Brush.Color := $0080FF80;
+  end;
+end;
+
 procedure TfrmTradeMarketList.Tv1DblClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    Exit;
-
-  try
-    frmTradeMarketInPut := TfrmTradeMarketInPut.Create(Application);
-    with frmTradeMarketInPut do
-    begin
-      PState := 1;
-      FTMMId := Trim(Self.Order_Main.fieldbyname('TMMId').AsString);
-      ToolBar2.Enabled := False;
-      TBSave.Enabled := False;
-      ScrollBox1.Enabled := False;
-      N2.Visible := False;
-      frmTradeMarketInPut.fordtype := self.fordtype;
-      TvMX.OnCellDblClick := nil;
-      Panel5.Enabled := False;
-      canshu4 := self.canshu4;
-      if ShowModal = 1 then
-      begin
-
-      end;
-    end;
-  finally
-    frmTradeMarketInPut.Free;
-  end;
+  TBCK.Click();
+//  try
+//    frmTradeMarketInPut := TfrmTradeMarketInPut.Create(Application);
+//    with frmTradeMarketInPut do
+//    begin
+//      PState := 1;
+//      FTMMId := Trim(Self.Order_Main.fieldbyname('TMMId').AsString);
+//      ToolBar2.Enabled := False;
+//      TBSave.Enabled := False;
+//      ScrollBox1.Enabled := False;
+//      N2.Visible := False;
+//      frmTradeMarketInPut.fordtype := self.fordtype;
+//      TvMX.OnCellDblClick := nil;
+//      Panel5.Enabled := False;
+//      canshu4 := self.canshu4;
+//      if ShowModal = 1 then
+//      begin
+//
+//      end;
+//    end;
+//  finally
+//    frmTradeMarketInPut.Free;
+//  end;

 end;

@ -883,11 +1016,11 @@ procedure TfrmTradeMarketList.TWCClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    exit;
-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
-    Exit;
-  end;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;
  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
    Exit;
  try
@ -929,21 +1062,32 @@ procedure TfrmTradeMarketList.TNowcClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    exit;
-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;
+  if Order_Main.fieldbyname('CCTIME').AsString <> '' then
  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+    if Application.MessageBox('当前单据已绑定出车,将同时取消出车数据是否继续', '提示', 32 + 4) <> IDYES then
      Exit;
-  end;
+  end
+  else
+  begin
    if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
      Exit;
+  end;
+
  try
    with ADOQueryCmd do
    begin
      close;
      sql.Clear;
-      sql.Add('update  Trade_Market_Main SET status=''2'' ');
+      sql.Add('update  Trade_Market_Main SET status=''2'',zctime=NULL,zcid=NULL,Driver=NULL,carPlate=NULL,CCTIME=NULL ');
      sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));

+      SQL.Add('DELETE Trade_Market_CarTransportSUB WHERE  TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+
      sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) ');
      sql.Add('values(''贸易布坯出库''    ');
      sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
@ -975,22 +1119,22 @@ begin
  if Order_Main.IsEmpty then
    exit;

-  if canshu1 <> '高权限' then
-  begin
-    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-    begin
-      Application.MessageBox('不能操作他人的数据!', '提示', 0);
-      Exit;
-    end;
-  end;
+//  if canshu1 <> '高权限' then
+//  begin
+//    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//    begin
+//      Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//      Exit;
+//    end;
+//  end;

  if cxTabControl1.TabIndex <> 0 then
  begin
    Application.MessageBox('只能在待提交状态下进行提交操作!', '提示', 0);
    Exit;
  end;
-  if Application.MessageBox('确定要提交数据吗？', '提示', 32 + 4) <> IDYES then
-    Exit;
+  if Application.MessageBox('是否生成欠单？', '提示', 32 + 4) <> IDYES then
+  begin
    try
      with ADOQueryCmd do
      begin
@ -1028,22 +1172,81 @@ begin
      application.MessageBox('计划单提交失败！', '提示信息', 0);
    end;
    TBRafresh.Click;
+  end
+  else
+  begin
+    try
+      with ADOQueryTemp do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('exec P_Trade_Market_QD ');
+        Sql.Add(' @TMMID=' + quotedstr(Trim(Order_Main.fieldbyname('TMMId').AsString)));
+        Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+        Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+
+        Open;
+      end;
+      if ADOQueryTemp.FieldByName('intReturn').AsInteger = -1 then
+      begin
+        Application.MessageBox(PChar(ADOQueryTemp.fieldbyname('ShowMsg').AsString), '提示', 0);
+        exit;
+      end;
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+
+        sql.Add('update  Trade_Market_Main SET status=''2'' ');
+        sql.Add(' where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+        sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+        sql.Add(' ' + quotedstr(trim(DName)));
+        sql.Add(',getdate() ');
+        sql.Add(',' + quotedstr(trim(self.Caption)));
+        sql.Add(',' + quotedstr(trim('计划单提交')));
+        sql.Add(',' + quotedstr(trim('计划单号：' + trim(Order_Main.FieldByName('TMMNO').AsString))));
+        sql.Add(',' + quotedstr(trim('成功')));
+        sql.Add(')');
+        execsql;
+      end;
+      SendMessageQR(trim(Order_Main.FieldByName('TMMId').AsString), trim(Order_Main.FieldByName('Filler').AsString), trim(Order_Main.FieldByName('TMMNO').AsString), Trim(FormatDateTime('yyyy-MM-dd', Order_Main.FieldByName('TMMDate').asdatetime)));
+
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('exec P_MSG_in ');
+        sql.Add(' @MSG=' + QuotedStr(trim('计划单号：' + trim(Order_Main.FieldByName('TMMNO').AsString) + ' 需要审核')));
+        sql.Add(',@FillUserid=' + QuotedStr(trim(DCode)));
+        sql.Add(',@FillUserName=' + QuotedStr(trim(DName)));
+        sql.Add(',@FillType=' + QuotedStr(trim('需要确认')));
+        sql.Add(',@MegType=' + QuotedStr(trim('计划单提交')));
+        execsql;
+      end;
+      application.MessageBox('计划单提交成功！', '提示信息');
+
+    except
+      application.MessageBox('计划单提交失败！', '提示信息', 0);
+    end;
+    TBRafresh.Click;
+  end;
+
 end;

 procedure TfrmTradeMarketList.TBTJCXClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    exit;
-  if canshu1 <> '高权限' then
-  begin
-    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-    begin
-      Application.MessageBox('不能操作他人的数据!', '提示', 0);
-      Exit;
-    end;
-  end;
+//  if canshu1 <> '高权限' then
+//  begin
+//    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//    begin
+//      Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//      Exit;
+//    end;
+//  end;

-  if cxTabControl1.TabIndex <> 1 then
+  if (cxTabControl1.TabIndex <> 1) and (cxTabControl1.TabIndex <> 2) then
  begin
    Application.MessageBox('只能在待审核状态下进行提交撤销操作!', '提示', 0);
    Exit;
@ -1128,18 +1331,58 @@ end;

 procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject);
 begin
- WriteCxGrid(Self.Caption, Tv1, '发货通知单录入');
+
+  WriteCxGrid('指示单列表FF11', Tv1, '生产指示单管理');
+end;
+
+procedure TfrmTradeMarketList.ToolButton3Click(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;
+
+  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
+    Exit;
+
+  try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update  Trade_Market_Main SET status=''9'', hdTIME=NULL ');
+      sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString)));
+
+      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      sql.Add(' ' + quotedstr(trim(DName)));
+      sql.Add(',getdate() ');
+      sql.Add(',' + quotedstr(trim(self.Caption)));
+      sql.Add(',' + quotedstr(trim('计划单撤销回单')));
+      sql.Add(',' + quotedstr(trim('计划单号：' + trim(Order_Main.FieldByName('TMMNO').AsString))));
+      sql.Add(',' + quotedstr(trim('成功')));
+      sql.Add(')');
+      execsql;
+    end;
+    application.MessageBox('计划单撤销回单成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    application.MessageBox('计划单撤销回单失败！', '提示信息', 0);
+  end;
+
 end;

 procedure TfrmTradeMarketList.TBZFClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
    exit;
-  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-  begin
-    Application.MessageBox('不能操作他人的数据!', '提示', 0);
-    Exit;
-  end;
+//  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+//  begin
+//    Application.MessageBox('不能操作他人的数据!', '提示', 0);
+//    Exit;
+//  end;
  if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
    Exit;
  try
--- a/Show More
+++ b/Show More