2222

2026-05-15 09:44:36 +08:00 · 2026-05-15 09:44:36 +08:00 · 0188dce9ac
commit 0188dce9ac
parent 9c9076e6af
42 changed files with 922 additions and 698 deletions
--- a/A00通用窗体/U_SalesContract_SXSel.dfm
+++ b/A00通用窗体/U_SalesContract_SXSel.dfm
@ -340,6 +340,13 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
        Options.Editing = False
        Width = 58
      end
+      object TV1Column3: TcxGridDBColumn
+        Caption = #32463#32433'/'#32428#32433
+        DataBinding.FieldName = 'YRType'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 75
+      end
      object TV1Column13: TcxGridDBColumn
        Caption = #32433#32447#32534#21495
        DataBinding.FieldName = 'Y_Code'
--- a/A00通用窗体/U_SalesContract_SXSel.pas
+++ b/A00通用窗体/U_SalesContract_SXSel.pas
@ -86,6 +86,7 @@ type
    TV1Column17: TcxGridDBColumn;
    TV1Column18: TcxGridDBColumn;
    TV1Column19: TcxGridDBColumn;
+    TV1Column3: TcxGridDBColumn;
    procedure FormCreate(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormShow(Sender: TObject);
@ -157,10 +158,10 @@ begin
    begin
      Close;
      sql.Clear;
-      SQL.add('select ConNo,ConMId,ConSId,FROMCPMID,BuyConNo,Z_Number,max(ConDate) as ConDate,max(DlyDate) as DlyDate ');
+      SQL.add('select YRType,ConNo,ConMId,ConSId,FROMCPMID,BuyConNo,Z_Number,max(ConDate) as ConDate,max(DlyDate) as DlyDate ');
      SQL.add(',C_Code,C_Name,Y_Code,Y_Name, Y_Composition');
      sql.add(',Y_Color,TestDenier,Z_Number,FF,ND,sum(SXQty) as SXQty,sum(KCQty) as KCQty   ') ;
-      SQL.Add('from V_HT_SX GROUP BY ConNo,ConMId,ConSId,FROMCPMID,BuyConNo,Z_Number,C_Code,C_Name,Y_Code,Y_Name,Y_Composition,Y_Color,TestDenier,Z_Number,FF,ND');
+      SQL.Add('from V_HT_SX GROUP BY YRType,ConNo,ConMId,ConSId,FROMCPMID,BuyConNo,Z_Number,C_Code,C_Name,Y_Code,Y_Name,Y_Composition,Y_Color,TestDenier,Z_Number,FF,ND');
 //      showmessage(sql.Text);
      Open;
    end;
--- a/A09财务通用管理/U_ExpenseInput.dfm
+++ b/A09财务通用管理/U_ExpenseInput.dfm
@ -335,9 +335,6 @@ object frmExpenseInput: TfrmExpenseInput
        Height = 148
        Align = alClient
        TabOrder = 0
-        ExplicitLeft = 0
-        ExplicitWidth = 426
-        ExplicitHeight = 183
        object Tv1: TcxGridDBTableView
          OnDblClick = Tv1DblClick
          Navigator.Buttons.CustomButtons = <>
--- a/A09财务通用管理/U_ExpenseInput.pas
+++ b/A09财务通用管理/U_ExpenseInput.pas
@ -424,25 +424,44 @@ begin
      if ShowModal = 1 then
      begin
        FoppShuiNoChange := '0';
-        with frmInvoiceSel.CDS_Invoice do
+        Self.IVNo.Text := '';
+
+        Self.IVNo.Properties.LookupItems.Text := '';
+        Self.Amount.Text := '0';
+
+        while CDS_Invoice.Locate('SSel', true, []) do
        begin

-          Self.IVNo.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString;
-          Self.IVNo.Properties.LookupItems.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString;
+          with frmInvoiceSel.CDS_Invoice do
+          begin
+            if Self.IVNo.Text = '' then
+            begin
+              Self.IVNo.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString;
+              Self.IVNo.Properties.LookupItems.Text := frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString;
+              Self.Amount.Text := frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').AsString;
+            end
+            else
+            begin
+              Self.IVNo.Text := Trim(Self.IVNo.Text) + ',' + Trim(frmInvoiceSel.CDS_Invoice.FieldByName('IVNo').AsString);
+              Self.IVNo.Properties.LookupItems.Text := trim(Self.IVNo.Properties.LookupItems.Text) + ',' + Trim(frmInvoiceSel.CDS_Invoice.FieldByName('IVID').AsString);
+              Self.Amount.Text := FloatToStr(strtofloatdef(Self.Amount.Text, 0) + frmInvoiceSel.CDS_Invoice.FieldByName('TaxAmount').asfloat);
+            end;

-          Self.OppCoName.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString;
-          Self.OppCoName.Properties.LookupItems.Text := frmInvoiceSel.CDS_Invoice.FieldByName('CoCode').AsString;
-          Self.oppShuiNo.Text := trim(frmInvoiceSel.CDS_Invoice.FieldByName('SupplierShuiNo').AsString);
+            Self.OppCoName.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Supplier').AsString;
+            Self.OppCoName.Properties.LookupItems.Text := frmInvoiceSel.CDS_Invoice.FieldByName('CoCode').AsString;
+            Self.oppShuiNo.Text := trim(frmInvoiceSel.CDS_Invoice.FieldByName('SupplierShuiNo').AsString);

-          Self.Amount.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Amount').AsString;
-          Self.Currency.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Currency').AsString;
-          Self.OppBankName.text := frmInvoiceSel.CDS_Invoice.FieldByName('BankName').AsString;
-          Self.OppBankCardNo.text := frmInvoiceSel.CDS_Invoice.FieldByName('BankNo').AsString;
+            Self.Currency.Text := frmInvoiceSel.CDS_Invoice.FieldByName('Currency').AsString;
+            Self.OppBankName.text := frmInvoiceSel.CDS_Invoice.FieldByName('BankName').AsString;
+            Self.OppBankCardNo.text := frmInvoiceSel.CDS_Invoice.FieldByName('BankNo').AsString;

-          OurBankName.Text := Trim(frmInvoiceSel.CDS_Invoice.fieldbyname('BankDeposit').AsString);
-          OurBankCardNo.Text := Trim(frmInvoiceSel.CDS_Invoice.fieldbyname('BankCardNo').AsString);
+            OurBankName.Text := Trim(frmInvoiceSel.CDS_Invoice.fieldbyname('BankDeposit').AsString);
+            OurBankCardNo.Text := Trim(frmInvoiceSel.CDS_Invoice.fieldbyname('BankCardNo').AsString);

+          end;
+          CDS_Invoice.Delete;
        end;
+
        FoppShuiNoChange := '1';
      end;
    end;
--- a/A09财务通用管理/U_ExpenseList.dfm
+++ b/A09财务通用管理/U_ExpenseList.dfm
@ -518,6 +518,20 @@ inherited frmExpenseList: TfrmExpenseList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #23457#26680#20154'2'
+        DataBinding.FieldName = 'Chker2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 71
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #23457#26680#26102#38388'2'
+        DataBinding.FieldName = 'Chktime2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 69
+      end
      object Tv1IVNo: TcxGridDBColumn
        Caption = #21457#31080#21495
        DataBinding.FieldName = 'IVNo'
@ -556,7 +570,6 @@ inherited frmExpenseList: TfrmExpenseList
      #20840#37096)
    LookAndFeel.Kind = lfUltraFlat
    OnChange = cxTabControl1Change
-    ExplicitTop = 94
    ClientRectRight = 0
    ClientRectTop = 0
  end
--- a/A09财务通用管理/U_ExpenseList.pas
+++ b/A09财务通用管理/U_ExpenseList.pas
@ -92,6 +92,8 @@ type
    btnReChk2: TToolButton;
    Tv1IVNo: TcxGridDBColumn;
    TbFP: TToolButton;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -181,7 +183,7 @@ begin
  if Trim(FAuthority) = 'ÉóºË2' then
  begin
    btnAdd.Enabled := true;
-    cxTabControl1.Tabs[1].Visible := False;
+    cxTabControl1.Tabs[0].Visible := False;
    cxTabControl1.Tabs[3].Visible := False;
    case cxTabControl1.TabIndex of
      0:
@ -214,6 +216,7 @@ begin
    cxTabControl1.Tabs[1].Visible := False;
    cxTabControl1.Tabs[2].caption := 'Î´¸¶¿î';
    btnAdd.Enabled := true;
+
    case cxTabControl1.TabIndex of
      0:
        begin
@ -879,7 +882,12 @@ begin
  Enddate.Date := SGetServerDate(ADOQueryTemp);
  begdate.Date := Enddate.Date - 30;
  FAuthority := self.fParameters1;
+  if FAuthority = '¸¶¿î' then
+  begin
+    cxTabControl1.TabIndex := 2;
+  end;
  SetStatus();
+
  InitGrid();
 end;

--- a/A09财务通用管理/U_FtyStatement.dfm
+++ b/A09财务通用管理/U_FtyStatement.dfm
@ -66,6 +66,7 @@ inherited frmFtyStatement: TfrmFtyStatement
      AutoSize = True
      Caption = #24212#20184#26126#32454#21333
      ImageIndex = 21
+      Visible = False
      OnClick = ToolButton5Click
    end
    object ToolButton6: TToolButton
@ -104,6 +105,7 @@ inherited frmFtyStatement: TfrmFtyStatement
    Color = clWhite
    ParentBackground = False
    TabOrder = 5
+    ExplicitTop = 36
    object Label3: TLabel
      Left = 400
      Top = 13
@ -170,8 +172,7 @@ inherited frmFtyStatement: TfrmFtyStatement
    Align = alClient
    PopupMenu = PM_1
    TabOrder = 2
-    ExplicitLeft = -8
-    ExplicitTop = 97
+    ExplicitTop = 111
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -255,11 +256,9 @@ inherited frmFtyStatement: TfrmFtyStatement
        end
        item
          Kind = skSum
-          Column = Tv2Column1
        end
        item
          Kind = skSum
-          Column = Tv2Column2
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -269,6 +268,13 @@ inherited frmFtyStatement: TfrmFtyStatement
      OptionsSelection.CellSelect = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #31246#21495
+        DataBinding.FieldName = 'oppshuino'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 150
+      end
      object v2Column6: TcxGridDBColumn
        Caption = #23545#26041#21333#20301
        DataBinding.FieldName = 'OppCoName'
@ -283,8 +289,8 @@ inherited frmFtyStatement: TfrmFtyStatement
        Caption = #19978#26399#27424#27454
        DataBinding.FieldName = 'SQJYAmount'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
        Width = 96
@ -293,8 +299,8 @@ inherited frmFtyStatement: TfrmFtyStatement
        Caption = #26412#26399#24212#20184
        DataBinding.FieldName = 'BQYFAmount'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
        Width = 106
@ -303,8 +309,8 @@ inherited frmFtyStatement: TfrmFtyStatement
        Caption = #26412#26399#20184#27454
        DataBinding.FieldName = 'BQFKAmount'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
        Width = 108
@ -313,42 +319,12 @@ inherited frmFtyStatement: TfrmFtyStatement
        Caption = #26412#26399#27424#27454
        DataBinding.FieldName = 'BQJYAmount'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
        Width = 104
      end
-      object Tv2Column5: TcxGridDBColumn
-        Caption = #19978#26399#27424#31080
-        DataBinding.FieldName = 'SQWKTaxAmount'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 77
-      end
-      object Tv2Column2: TcxGridDBColumn
-        Caption = #26412#26399#24320#31080
-        DataBinding.FieldName = 'BQYKTaxAmount'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
-      object Tv2Column1: TcxGridDBColumn
-        Caption = #26412#26399#27424#31080
-        DataBinding.FieldName = 'BQWKTaxAmount'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 77
-      end
-      object Tv2Column6: TcxGridDBColumn
-        Caption = #26412#26399#38656#24320#31080
-        DataBinding.FieldName = 'BQXKTaxAmount'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 77
-      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv2
@ -363,7 +339,7 @@ inherited frmFtyStatement: TfrmFtyStatement
    TabOrder = 3
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 11
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
    Properties.Tabs.Strings = (
      '           USD              '
      '           CNY             '
@ -374,6 +350,10 @@ inherited frmFtyStatement: TfrmFtyStatement
    ClientRectTop = 0
  end
  inherited cxProgressBar2: TcxProgressBar
+    Left = 322
+    Top = 204
+    ExplicitLeft = 322
+    ExplicitTop = 204
    ExplicitHeight = 29
  end
  inherited ADOQueryBaseCmd: TADOQuery
--- a/A09财务通用管理/U_FtyStatement.pas
+++ b/A09财务通用管理/U_FtyStatement.pas
@ -13,10 +13,9 @@ uses
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxBarBuiltInMenu, cxPC,   dxDateRanges,
-  U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils, cxContainer, dxCore,
-  cxDateUtils, cxDropDownEdit, dxSkinsCore, dxSkinsDefaultPainters,
-  dxScrollbarAnnotations, cxProgressBar;
+  dxBarBuiltInMenu, cxPC, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd,
+  DateUtils, cxContainer, dxCore, cxDateUtils, cxDropDownEdit, dxSkinsCore,
+  dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar, cxCurrencyEdit;

 type
  TfrmFtyStatement = class(TfrmBaseList)
@ -52,16 +51,13 @@ type
    ToolButton1: TToolButton;
    PM_1: TPopupMenu;
    N1: TMenuItem;
-    Tv2Column1: TcxGridDBColumn;
-    Tv2Column2: TcxGridDBColumn;
-    Tv2Column5: TcxGridDBColumn;
-    Tv2Column6: TcxGridDBColumn;
    ToolButton5: TToolButton;
    ToolButton6: TToolButton;
    Label2: TLabel;
    begdate: TcxDateEdit;
    Enddate: TcxDateEdit;
    Label4: TLabel;
+    Tv2Column3: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -94,6 +90,7 @@ uses

 procedure TfrmFtyStatement.InitGrid();
 begin
+  Panel1.SetFocus();
  try
    ADOQueryMain.DisableControls;
    with ADOQueryMain do
@ -115,10 +112,10 @@ begin
          end;
        2:
          begin
-            sql.Add(' ,@Currency=''EUR'' ');
+            sql.Add(' ,@Currency=''VND'' ');
          end;
      end;
-
+//      ShowMessage(sql.Text);
      Open;
    end;
    SCreateCDS(ADOQueryMain, CDS_HZ);
@ -195,7 +192,7 @@ begin
    begdate.Date := self.begdate.Date;
    enddate.Date := self.Enddate.Date;
    OppCoName.Text := self.CDS_HZ.fieldbyname('OppCoName').AsString;
-    FOppCoNo := self.CDS_HZ.fieldbyname('OppCoNo').AsString;
+    FOppCoNo := self.CDS_HZ.fieldbyname('oppshuino').AsString;
    FZKType := Self.FZKType;
    case cxTabControl1.TabIndex of
      0:
@ -208,7 +205,7 @@ begin
        end;
      2:
        begin
-          FCurrency := 'EUR';
+          FCurrency := 'VND';
        end;
    end;
    show;
--- a/A09财务通用管理/U_GetDllForm.pas
+++ b/A09财务通用管理/U_GetDllForm.pas
@ -77,9 +77,9 @@ begin
    user := 'kaixiyasa';
    pswd := 'rightsoft,.KXY@YN';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//       Parameters1:='管理';
-    Parameters1 := '审核';
-//    Parameters1 := '付款';
+       Parameters1:='管理';
+//    Parameters1 := '审核2';
+    Parameters1 := '付款';
  end
  else
  begin
--- a/A09财务通用管理/U_InvoiceInInPut.dfm
+++ b/A09财务通用管理/U_InvoiceInInPut.dfm
@ -95,8 +95,6 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
    Height = 601
    Align = alClient
    TabOrder = 1
-    ExplicitLeft = 8
-    ExplicitTop = 36
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -233,6 +231,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCurrencyEditProperties'
        Properties.DisplayFormat = '#,###.##'
+        Properties.OnEditValueChanged = Tv1AmountPropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
        Width = 65
      end
--- a/A09财务通用管理/U_InvoiceInInPut.pas
+++ b/A09财务通用管理/U_InvoiceInInPut.pas
@ -217,12 +217,54 @@ begin
        ADOQueryCmd.FieldByName('SupplierShuiNo').Value := Trim(CDS_Invoice.fieldbyname('SupplierShuiNo').AsString);
        ADOQueryCmd.FieldByName('SupplierNo').Value := Trim(CDS_Invoice.fieldbyname('SupplierNo').AsString);
        ADOQueryCmd.fieldbyname('OurCoNo').Value := trim(CDS_Invoice.FieldByName('OurCoNo').AsString);
-        ADOQueryCmd.fieldbyname('PayDate').Value := trim(CDS_Invoice.FieldByName('PayDate').AsString);
+//        ADOQueryCmd.fieldbyname('PayDate').Value := trim(CDS_Invoice.FieldByName('PayDate').AsString);

        ADOQueryCmd.Post;
        CDS_Invoice.Edit;
        CDS_Invoice.FieldByName('IVId').Value := MaxNo;
        CDS_Invoice.Post;
+        with ADOQueryTmp do
+        begin
+          close;
+          sql.Clear;
+          sql.add('UPDATE Finance_FLOW SET  NoTaxPrice =' + (Trim(CDS_Invoice.FieldByName('PRICE').AsString)));
+          SQL.Add(',Currency=' + QuotedStr(Trim(CDS_Invoice.FieldByName('Currency').AsString)));
+          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(CDS_Invoice.FieldByName('fromFlow').AsString) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+         // SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+          ExecSQL;
+        end;
+        with ADOQueryTmp do
+        begin
+          close;
+          sql.Clear;
+          sql.add('UPDATE Finance_FLOW SET NoTaxInclude=NoTaxPrice*QTY ');
+
+          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(CDS_Invoice.FieldByName('fromFlow').AsString) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+         // SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+          ExecSQL;
+        end;
+
+        with ADOQueryTmp do
+        begin
+          close;
+          sql.Clear;
+          sql.add('UPDATE Finance_FLOW SET  Tax=NoTaxInclude*TaxRate/100 ');
+
+          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(CDS_Invoice.FieldByName('fromFlow').AsString) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+        //  SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+          ExecSQL;
+        end;
+        with ADOQueryTmp do
+        begin
+          close;
+          sql.Clear;
+          sql.add('UPDATE Finance_FLOW SET   TaxInclude=NoTaxInclude+Tax ');
+
+          sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(CDS_Invoice.FieldByName('fromFlow').AsString) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+        //  SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+          ExecSQL;
+        end;
+
        next;
      end;
    end;
@ -460,7 +502,7 @@ begin

  end;

-  mTaxAmount := RoundFloat(mAmount + mTaxFee, 2);
+  mTaxAmount := RoundFloat(mAmount + mTaxFee, 3);

  with CDS_Invoice do
  begin
@ -616,8 +658,8 @@ begin
  CDS_Invoice.FieldByName('Currency').Value := 'CNY';

  Self.CDS_Invoice.FieldByName('OurCoName').value := 'DESHINE VIETNAM CO., LTD';
-  Self.CDS_Invoice.FieldByName('OurCoNo').value := '1102083046';
-  Self.CDS_Invoice.FieldByName('OurShuiNo').value := 'W0001';
+  Self.CDS_Invoice.FieldByName('OurCoNo').value := 'W0001';
+  Self.CDS_Invoice.FieldByName('OurShuiNo').value := '1102083046';

  CDS_Invoice.Post;

@ -717,6 +759,11 @@ begin
 //        CDS_Invoice.fieldbyname('OurCoName').Value := '圆中圆';
 //        CDS_Invoice.FieldByName('Currency').Value := 'CNY';
        Post;
+        if CDS_Invoice.FieldByName('IVNo').AsString = '' then
+        begin
+          CDS_Invoice.Delete;
+        end;
+
      end;
    end;
    WorkBook.Close;
--- a/A09财务通用管理/U_InvoiceInList.dfm
+++ b/A09财务通用管理/U_InvoiceInList.dfm
@ -259,7 +259,6 @@ inherited frmInvoiceInList: TfrmInvoiceInList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
-    ExplicitTop = 132
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -378,8 +377,8 @@ inherited frmInvoiceInList: TfrmInvoiceInList
        Caption = #21333#20215
        DataBinding.FieldName = 'Price'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        Width = 57
      end
--- a/A09财务通用管理/U_InvoiceInList.pas
+++ b/A09财务通用管理/U_InvoiceInList.pas
@ -288,29 +288,72 @@ begin
        with frmPayableSel.CDS_1 do
        begin
          self.ADOQueryCmd.Edit;
-          self.ADOQueryCmd.FieldByName('Supplier').AsString := frmPayableSel.CDS_1.FieldByName('OppCoName').AsString;
-          self.ADOQueryCmd.FieldByName('SupplierNo').AsString := frmPayableSel.CDS_1.FieldByName('OppCoNo').AsString;
-          self.ADOQueryCmd.FieldByName('SupplierShuiNo').AsString := frmPayableSel.CDS_1.FieldByName('oppShuiNo').AsString;
-          self.ADOQueryCmd.FieldByName('OurCoName').AsString := frmPayableSel.CDS_1.FieldByName('OurCoName').AsString;
-          self.ADOQueryCmd.FieldByName('OurCoNo').AsString := frmPayableSel.CDS_1.FieldByName('OurCoNo').AsString;
-          self.ADOQueryCmd.FieldByName('OurShuiNo').AsString := frmPayableSel.CDS_1.FieldByName('ourShuiNo').AsString;
+//          self.ADOQueryCmd.FieldByName('Supplier').AsString := frmPayableSel.CDS_1.FieldByName('OppCoName').AsString;
+//          self.ADOQueryCmd.FieldByName('SupplierNo').AsString := frmPayableSel.CDS_1.FieldByName('OppCoNo').AsString;
+//          self.ADOQueryCmd.FieldByName('SupplierShuiNo').AsString := frmPayableSel.CDS_1.FieldByName('oppShuiNo').AsString;
+//          self.ADOQueryCmd.FieldByName('OurCoName').AsString := frmPayableSel.CDS_1.FieldByName('OurCoName').AsString;
+//          self.ADOQueryCmd.FieldByName('OurCoNo').AsString := frmPayableSel.CDS_1.FieldByName('OurCoNo').AsString;
+//          self.ADOQueryCmd.FieldByName('OurShuiNo').AsString := frmPayableSel.CDS_1.FieldByName('ourShuiNo').AsString;

-          self.ADOQueryCmd.FieldByName('Currency').AsString := frmPayableSel.CDS_1.FieldByName('Currency').AsString;
-          self.ADOQueryCmd.FieldByName('BillCycle').AsString := frmPayableSel.CDS_1.FieldByName('BillCycle').AsString;
+//          self.ADOQueryCmd.FieldByName('Currency').AsString := frmPayableSel.CDS_1.FieldByName('Currency').AsString;
+//          self.ADOQueryCmd.FieldByName('BillCycle').AsString := frmPayableSel.CDS_1.FieldByName('BillCycle').AsString;

-          if frmPayableSel.CDS_1.FieldByName('NoTaxPrice').AsString <> '' then
-          begin
-            Self.ADOQueryCmd.FieldByName('Price').value := frmPayableSel.CDS_1.FieldByName('NoTaxPrice').AsString;
-          end
-          else
-          begin
-            Self.ADOQueryCmd.FieldByName('Price').value := 0;
-          end;
-          Self.ADOQueryCmd.FieldByName('Amount').value := frmPayableSel.FNoTaxInclude;
-          Self.ADOQueryCmd.FieldByName('TaxFee').value := frmPayableSel.FTax;
-          Self.ADOQueryCmd.FieldByName('TaxAmount').value := frmPayableSel.FTaxInclude;
+//          if frmPayableSel.CDS_1.FieldByName('NoTaxPrice').AsString <> '' then
+//          begin
+//            Self.ADOQueryCmd.FieldByName('Price').value := frmPayableSel.CDS_1.FieldByName('NoTaxPrice').AsString;
+//          end
+//          else
+//          begin
+//            Self.ADOQueryCmd.FieldByName('Price').value := 0;
+//          end;
+//          Self.ADOQueryCmd.FieldByName('Amount').value := frmPayableSel.FNoTaxInclude;
+//          Self.ADOQueryCmd.FieldByName('TaxFee').value := frmPayableSel.FTax;
+//          Self.ADOQueryCmd.FieldByName('TaxAmount').value := frmPayableSel.FTaxInclude;
          self.ADOQueryCmd.FieldByName('fromFlow').Value := frmPayableSel.FFFIDs;
          mffIDS := frmPayableSel.FFFIDs;
+
+          with ADOQueryTemp do
+          begin
+            close;
+            sql.Clear;
+            sql.add('UPDATE Finance_FLOW SET  NoTaxPrice =' + (Trim(CDS_Invoice.FieldByName('PRICE').AsString)));
+            SQL.Add(',Currency=' + QuotedStr(Trim(CDS_Invoice.FieldByName('Currency').AsString)));
+            sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(mffIDS) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+          //  SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+            ExecSQL;
+          end;
+          with ADOQueryTemp do
+          begin
+            close;
+            sql.Clear;
+            sql.add('UPDATE Finance_FLOW SET NoTaxInclude=NoTaxPrice*QTY ');
+
+            sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(mffIDS) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+           // SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+            ExecSQL;
+          end;
+
+          with ADOQueryTemp do
+          begin
+            close;
+            sql.Clear;
+            sql.add('UPDATE Finance_FLOW SET  Tax=NoTaxInclude*TaxRate/100 ');
+
+            sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(mffIDS) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+           // SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+            ExecSQL;
+          end;
+          with ADOQueryTemp do
+          begin
+            close;
+            sql.Clear;
+            sql.add('UPDATE Finance_FLOW SET   TaxInclude=NoTaxInclude+Tax ');
+
+            sql.Add(' where EXISTS (select SP.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(mffIDS) + ','','') SP where SP.RTValue=Finance_FLOW.FFID )');
+           // SQL.ADD('AND ISNULL(STATUS,''0'')=''0''');
+            ExecSQL;
+          end;
+
          self.ADOQueryCmd.Post;
        end;
      end;
--- a/A09财务通用管理/U_InvoiceOutList.dfm
+++ b/A09财务通用管理/U_InvoiceOutList.dfm
@ -252,8 +252,6 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
-    ExplicitLeft = 8
-    ExplicitTop = 118
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
--- a/A09财务通用管理/U_InvoiceSel.dfm
+++ b/A09财务通用管理/U_InvoiceSel.dfm
@ -40,17 +40,25 @@ object frmInvoiceSel: TfrmInvoiceSel
      Visible = False
      OnClick = TSaveClick
    end
-    object ToolButton1: TToolButton
+    object ToolButton6: TToolButton
      Left = 71
      Top = 0
      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 8
+      OnClick = ToolButton6Click
+    end
+    object ToolButton1: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
      Caption = #22686#34892
      ImageIndex = 2
      Visible = False
      OnClick = ToolButton1Click
    end
    object ToolButton5: TToolButton
-      Left = 142
+      Left = 213
      Top = 0
      AutoSize = True
      Caption = #24212#20184#27454
@ -59,7 +67,7 @@ object frmInvoiceSel: TfrmInvoiceSel
      OnClick = ToolButton5Click
    end
    object ToolButton2: TToolButton
-      Left = 229
+      Left = 300
      Top = 0
      AutoSize = True
      Caption = #21024#34892
@ -68,7 +76,7 @@ object frmInvoiceSel: TfrmInvoiceSel
      OnClick = ToolButton2Click
    end
    object ToolButton4: TToolButton
-      Left = 300
+      Left = 371
      Top = 0
      AutoSize = True
      Caption = #23548#20837
@ -77,7 +85,7 @@ object frmInvoiceSel: TfrmInvoiceSel
      OnClick = ToolButton4Click
    end
    object Tbssel: TToolButton
-      Left = 371
+      Left = 442
      Top = 0
      AutoSize = True
      Caption = #36873#25321
@ -85,7 +93,7 @@ object frmInvoiceSel: TfrmInvoiceSel
      OnClick = TbsselClick
    end
    object ToolButton3: TToolButton
-      Left = 442
+      Left = 513
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -93,7 +101,7 @@ object frmInvoiceSel: TfrmInvoiceSel
      OnClick = ToolButton3Click
    end
    object TBClose: TToolButton
-      Left = 545
+      Left = 616
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -103,9 +111,9 @@ object frmInvoiceSel: TfrmInvoiceSel
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 30
+    Top = 124
    Width = 1530
-    Height = 474
+    Height = 380
    Align = alClient
    TabOrder = 1
    object Tv1: TcxGridDBTableView
@ -142,6 +150,16 @@ object frmInvoiceSel: TfrmInvoiceSel
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      OptionsView.Indicator = True
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'ssel'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.NullStyle = nssUnchecked
+        HeaderAlignmentHorz = taCenter
+        Width = 67
+      end
      object Tv1IVNo: TcxGridDBColumn
        Caption = #21457#31080#21495#30721
        DataBinding.FieldName = 'IVNo'
@ -293,6 +311,65 @@ object frmInvoiceSel: TfrmInvoiceSel
      GridView = Tv1
    end
  end
+  object cxTabControl1: TcxTabControl
+    Left = 0
+    Top = 95
+    Width = 1530
+    Height = 29
+    Align = alTop
+    TabOrder = 2
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 11
+    Properties.TabIndex = 0
+    Properties.Tabs.Strings = (
+      '  '#26410#30003#35831'  '
+      '  '#24050#30003#35831'  '
+      '  '#20840#37096'  ')
+    LookAndFeel.Kind = lfUltraFlat
+    OnChange = cxTabControl1Change
+    ClientRectRight = 0
+    ClientRectTop = 0
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 30
+    Width = 1530
+    Height = 65
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clWhite
+    ParentBackground = False
+    TabOrder = 3
+    object Label1: TLabel
+      Left = 67
+      Top = 37
+      Width = 16
+      Height = 21
+      Caption = #33267
+    end
+    object Label4: TLabel
+      Left = 17
+      Top = 6
+      Width = 64
+      Height = 21
+      Caption = #26597#35810#26085#26399
+    end
+    object begdate: TcxDateEdit
+      Left = 87
+      Top = 2
+      Properties.ShowTime = False
+      TabOrder = 0
+      Width = 120
+    end
+    object Enddate: TcxDateEdit
+      Left = 87
+      Top = 30
+      Properties.ShowTime = False
+      TabOrder = 1
+      Width = 120
+    end
+  end
  object DataSource1: TDataSource
    DataSet = CDS_Invoice
    Left = 516
--- a/A09财务通用管理/U_InvoiceSel.pas
+++ b/A09财务通用管理/U_InvoiceSel.pas
@ -11,7 +11,8 @@ uses
  DBClient, ExtCtrls, StdCtrls, BtnEdit, cxButtonEdit, cxTextEdit,
  cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar,
  dxDateRanges, dxBarBuiltInMenu, ComObj, dxSkinsCore, dxSkinsDefaultPainters,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, cxPC, cxContainer, dxCore, cxDateUtils, cxCheckBox,
+  cxMaskEdit;

 type
  TfrmInvoiceSel = class(TForm)
@ -47,6 +48,14 @@ type
    ToolButton5: TToolButton;
    Tv1fromFlow: TcxGridDBColumn;
    Tbssel: TToolButton;
+    cxTabControl1: TcxTabControl;
+    Panel1: TPanel;
+    Label1: TLabel;
+    begdate: TcxDateEdit;
+    Enddate: TcxDateEdit;
+    ToolButton6: TToolButton;
+    Label4: TLabel;
+    Tv1Column1: TcxGridDBColumn;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TSaveClick(Sender: TObject);
@ -69,6 +78,8 @@ type
    procedure ToolButton5Click(Sender: TObject);
    procedure TbsselClick(Sender: TObject);
    procedure Tv1DblClick(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure ToolButton6Click(Sender: TObject);
  private
    procedure initGrid();
    procedure SaveDate();
@ -250,8 +261,21 @@ begin
    SQL.Add(' ) C ON A.OurCoName = C.GSTT AND C.rn = 1');

    sql.add(' where isnull(A.Status,''0'')=''9'' ');
-    sql.add(' and not exists (select 1 from Finance_Flow X where X.IVID = A.IVID) ');
-//    ShowMessage(sql.Text);
+
+    if cxTabControl1.TabIndex = 1 then
+    begin
+      sql.Add(' and A.ivdate>=''' + FormatDateTime('yyyy-MM-dd', begdate.Date) + ''' ');
+      sql.Add(' and A.ivdate<''' + FormatDateTime('yyyy-MM-dd', Enddate.Date + 1) + ''' ');
+    end;
+    if cxTabControl1.TabIndex = 0 then
+    begin
+      sql.add(' and not exists (select 1 from Finance_Flow X where X.IVID = A.IVID) ');
+    end;
+    if cxTabControl1.TabIndex = 1 then
+    begin
+      sql.add(' and  exists (select 1 from Finance_Flow X where X.IVID = A.IVID) ');
+    end;
+
    open;
  end;

@ -276,7 +300,7 @@ end;

 procedure TfrmInvoiceSel.FormShow(Sender: TObject);
 begin
-  ReadCxGrid(Self.Caption, Tv1, '财务管理');
+  ReadCxGrid(Self.Caption + 'TV1', Tv1, '财务管理');
  with CDS_LM do
  begin
    FieldDefs.Clear;
@ -286,6 +310,8 @@ begin
    close;
    CreateDataSet;
  end;
+  Enddate.Date := SGetServerDate(ADOQueryTmp);
+  begdate.Date := Enddate.Date - 30;
  initGrid();
 end;

@ -425,6 +451,19 @@ begin

 end;

+procedure TfrmInvoiceSel.cxTabControl1Change(Sender: TObject);
+begin
+  if cxTabControl1.TabIndex = 0 then
+  begin
+    Tbssel.visible := True;
+  end
+  else
+  begin
+    Tbssel.visible := false;
+  end;
+  initGrid();
+end;
+
 procedure TfrmInvoiceSel.FormDestroy(Sender: TObject);
 begin
  frmInvoiceSel := nil;
@ -649,7 +688,7 @@ end;

 procedure TfrmInvoiceSel.ToolButton3Click(Sender: TObject);
 begin
-  WriteCxGrid(Self.Caption, Tv1, '财务管理');
+  WriteCxGrid(Self.Caption + 'TV1', Tv1, '财务管理');
 end;

 procedure TfrmInvoiceSel.ToolButton4Click(Sender: TObject);
@ -785,5 +824,10 @@ begin
  end;
 end;

+procedure TfrmInvoiceSel.ToolButton6Click(Sender: TObject);
+begin
+  initGrid();
+end;
+
 end.

--- a/A09财务通用管理/U_PayableList.pas
+++ b/A09财务通用管理/U_PayableList.pas
@ -308,7 +308,7 @@ end;

 procedure TfrmPayableList.TBRafreshClick(Sender: TObject);
 begin
-  begdate.SetFocus;
+  panel1.SetFocus;
  with ADOQueryCmd do
  begin
    Close;
--- a/A09财务通用管理/U_SingleFtyStatement.dfm
+++ b/A09财务通用管理/U_SingleFtyStatement.dfm
@ -81,18 +81,20 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
    Left = 0
    Top = 38
    Width = 1573
-    Height = 38
+    Height = 53
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 1
+    ExplicitTop = 32
    object Label1: TLabel
      Left = 698
      Top = 45
      Width = 24
      Height = 12
      Caption = #21697#21517
+      Visible = False
    end
    object Label3: TLabel
      Left = 510
@ -100,20 +102,33 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      Width = 48
      Height = 12
      Caption = #20986#24211#21333#21495
+      Visible = False
    end
    object Label2: TLabel
      Left = 22
      Top = 13
-      Width = 48
-      Height = 12
+      Width = 64
+      Height = 16
      Caption = #23545#36134#26085#26399
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
    end
    object Label6: TLabel
-      Left = 164
+      Left = 207
      Top = 13
-      Width = 30
-      Height = 12
+      Width = 40
+      Height = 16
      Caption = '-----'
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
    end
    object Label4: TLabel
      Left = 598
@ -123,11 +138,17 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      Caption = #25910#27454#36827#24230
    end
    object Label5: TLabel
-      Left = 324
+      Left = 366
      Top = 13
-      Width = 48
-      Height = 12
+      Width = 64
+      Height = 16
      Caption = #23545#26041#21333#20301
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
    end
    object MPRTCodeName: TEdit
      Tag = 2
@ -136,6 +157,7 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      Width = 120
      Height = 20
      TabOrder = 3
+      Visible = False
    end
    object OrderNo: TEdit
      Tag = 2
@ -144,25 +166,38 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      Width = 120
      Height = 20
      TabOrder = 2
+      Visible = False
    end
    object begdate: TDateTimePicker
-      Left = 72
+      Left = 93
      Top = 9
-      Width = 97
-      Height = 20
+      Width = 110
+      Height = 24
      Date = 41256.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.918237847232376200
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
      TabOrder = 0
    end
    object Enddate: TDateTimePicker
-      Left = 182
+      Left = 225
      Top = 9
-      Width = 97
-      Height = 20
+      Width = 110
+      Height = 24
      Date = 41256.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.918237847232376200
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
      TabOrder = 1
    end
    object OrdDefNote3: TComboBox
@ -184,22 +219,36 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
    end
    object OppCoName: TEdit
      Tag = 2
-      Left = 378
+      Left = 436
      Top = 9
      Width = 169
-      Height = 20
+      Height = 24
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
      TabOrder = 5
    end
  end
  object cxGrid2: TcxGrid
    Left = 0
-    Top = 76
+    Top = 91
    Width = 1573
-    Height = 542
+    Height = 527
    Align = alClient
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -16
+    Font.Name = #23435#20307
+    Font.Style = []
+    ParentFont = False
    TabOrder = 2
+    ExplicitTop = 97
    object TV1: TcxGridDBBandedTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_HZ
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
@ -208,7 +257,6 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        end
        item
          Kind = skSum
-          Column = V1Column7
        end
        item
          Kind = skSum
@ -232,7 +280,6 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        end
        item
          Kind = skSum
-          Column = V1Column16
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -240,106 +287,34 @@ 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 = 795
        end
        item
          Caption = #23545#36134#20449#24687
          Width = 396
-        end
-        item
-          Caption = #24320#31080#20449#24687
-          Width = 287
-        end
-        item
-          Caption = #35814#32454#20449#24687
-          Width = 941
        end>
      object V1Column2: TcxGridDBBandedColumn
-        Caption = #23545#36134#26085#26399
+        Caption = #21457#31080#26085#26399
        DataBinding.FieldName = 'ReconciliationDate'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
-        Width = 79
+        Width = 109
        Position.BandIndex = 0
        Position.ColIndex = 1
        Position.RowIndex = 0
      end
-      object V1Column4: TcxGridDBBandedColumn
-        Caption = #32534#21495
-        DataBinding.FieldName = 'F_Code'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 87
-        Position.BandIndex = 3
-        Position.ColIndex = 3
-        Position.RowIndex = 0
-      end
-      object V1Column5: TcxGridDBBandedColumn
-        Caption = #21697#21517
-        DataBinding.FieldName = 'F_Name'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 91
-        Position.BandIndex = 3
-        Position.ColIndex = 4
-        Position.RowIndex = 0
-      end
-      object V1Column6: TcxGridDBBandedColumn
-        Caption = #35268#26684
-        DataBinding.FieldName = 'F_Spec'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 92
-        Position.BandIndex = 3
-        Position.ColIndex = 5
-        Position.RowIndex = 0
-      end
-      object V1Column7: TcxGridDBBandedColumn
-        Caption = #25968#37327
-        DataBinding.FieldName = 'Qty'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 77
-        Position.BandIndex = 3
-        Position.ColIndex = 7
-        Position.RowIndex = 0
-      end
-      object V1Column8: TcxGridDBBandedColumn
-        Caption = #21333#20215
-        DataBinding.FieldName = 'Price'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 84
-        Position.BandIndex = 3
-        Position.ColIndex = 9
-        Position.RowIndex = 0
-      end
      object V1Column9: TcxGridDBBandedColumn
-        Caption = #24212#20184#37329#39069
+        Caption = #24635#37329#39069#24050#21547#31246
        DataBinding.FieldName = 'BQYFAmount'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -351,8 +326,9 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
      object V1Column12: TcxGridDBBandedColumn
        Caption = #20184#27454#37329#39069
        DataBinding.FieldName = 'BQFKAmount'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -362,10 +338,11 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Position.RowIndex = 0
      end
      object V1Column15: TcxGridDBBandedColumn
-        Caption = #32047#35745#20313#39069
+        Caption = #20313#39069
        DataBinding.FieldName = 'BQJYAmount'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '#,###.##'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -374,21 +351,9 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Position.ColIndex = 2
        Position.RowIndex = 0
      end
-      object V1Column3: TcxGridDBBandedColumn
-        Caption = #25688#35201
-        DataBinding.FieldName = 'FFAbstract'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 129
-        Position.BandIndex = 3
-        Position.ColIndex = 1
-        Position.RowIndex = 0
-      end
      object V1Column10: TcxGridDBBandedColumn
        DataBinding.FieldName = 'CWID'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        Visible = False
@ -397,104 +362,42 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Options.Moving = False
        VisibleForCustomization = False
        Width = 45
-        Position.BandIndex = 3
-        Position.ColIndex = 0
-        Position.RowIndex = 0
+        Position.BandIndex = -1
+        Position.ColIndex = -1
+        Position.RowIndex = -1
      end
      object V1Column14: TcxGridDBBandedColumn
        Caption = #24207#21495
        DataBinding.FieldName = 'keyNO'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
-        Width = 62
+        Width = 111
        Position.BandIndex = 0
        Position.ColIndex = 0
        Position.RowIndex = 0
      end
-      object V1Column16: TcxGridDBBandedColumn
-        Caption = #24320#31080#37329#39069
-        DataBinding.FieldName = 'BQKPAmount'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 72
-        Position.BandIndex = 2
-        Position.ColIndex = 1
-        Position.RowIndex = 0
-      end
-      object V1Column17: TcxGridDBBandedColumn
-        Caption = #32047#35745#27424#31080
-        DataBinding.FieldName = 'BQWKPAmount'
+      object V1Column20: TcxGridDBBandedColumn
+        Caption = #21457#31080#21495#30721
+        DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
        Width = 119
-        Position.BandIndex = 2
+        Position.BandIndex = 0
        Position.ColIndex = 2
        Position.RowIndex = 0
      end
-      object V1Column20: TcxGridDBBandedColumn
-        Caption = #31080#21495
-        DataBinding.FieldName = 'IVNo'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 91
-        Position.BandIndex = 2
-        Position.ColIndex = 0
-        Position.RowIndex = 0
-      end
-      object V1Column21: TcxGridDBBandedColumn
-        Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'OrderNo'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 68
-        Position.BandIndex = 3
-        Position.ColIndex = 2
-        Position.RowIndex = 0
-      end
-      object V1Column22: TcxGridDBBandedColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'Piece'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 71
-        Position.BandIndex = 3
-        Position.ColIndex = 6
-        Position.RowIndex = 0
-      end
-      object V1Column23: TcxGridDBBandedColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'P_Color'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 64
-        Position.BandIndex = 3
-        Position.ColIndex = 12
-        Position.RowIndex = 0
-      end
      object V1Column25: TcxGridDBBandedColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'MxNote'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        HeaderAlignmentHorz = taCenter
@ -504,33 +407,10 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Position.ColIndex = -1
        Position.RowIndex = -1
      end
-      object V1Column26: TcxGridDBBandedColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'YMxNote'
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.Alignment.Horz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 58
-        Position.BandIndex = 3
-        Position.ColIndex = 8
-        Position.RowIndex = 0
-      end
-      object V1Column33: TcxGridDBBandedColumn
-        Caption = #20854#20182#36153
-        DataBinding.FieldName = 'OtherFee'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 83
-        Position.BandIndex = 3
-        Position.ColIndex = 10
-        Position.RowIndex = 0
-      end
      object V1Column34: TcxGridDBBandedColumn
        Caption = #36135#27454
        DataBinding.FieldName = 'HKMONEY'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -539,24 +419,54 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement
        Position.ColIndex = -1
        Position.RowIndex = -1
      end
-      object TV1Column1: TcxGridDBBandedColumn
-        Caption = #20943#20813#37329#39069
-        DataBinding.FieldName = 'Deduction'
+      object TV1Column3: TcxGridDBBandedColumn
+        Caption = #25253#20851#21333#21495#30721
+        DataBinding.FieldName = 'BGDNum'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Moving = False
-        Width = 78
-        Position.BandIndex = 3
-        Position.ColIndex = 11
+        Width = 85
+        Position.BandIndex = 0
+        Position.ColIndex = 3
        Position.RowIndex = 0
      end
-      object TV1Column2: TcxGridDBBandedColumn
-        Caption = #26159#21542#21547#31246
-        DataBinding.FieldName = 'IsInvoice'
+      object TV1Column4: TcxGridDBBandedColumn
+        Caption = #27700#21333#32534#21495
+        DataBinding.FieldName = 'BankSlipNumber'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 72
-        Position.BandIndex = 1
-        Position.ColIndex = 3
+        Width = 123
+        Position.BandIndex = 0
+        Position.ColIndex = 4
+        Position.RowIndex = 0
+      end
+      object TV1Column5: TcxGridDBBandedColumn
+        Caption = #31246#21495
+        DataBinding.FieldName = 'oppShuiNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+        Position.BandIndex = 0
+        Position.ColIndex = 5
+        Position.RowIndex = 0
+      end
+      object TV1Column6: TcxGridDBBandedColumn
+        Caption = #21378#21830#21517#31216
+        DataBinding.FieldName = 'oppconame'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+        Position.BandIndex = 0
+        Position.ColIndex = 6
+        Position.RowIndex = 0
+      end
+      object TV1Column7: TcxGridDBBandedColumn
+        Caption = #24065#31181
+        DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 78
+        Position.BandIndex = 0
+        Position.ColIndex = 7
        Position.RowIndex = 0
      end
    end
--- a/A09财务通用管理/U_SingleFtyStatement.pas
+++ b/A09财务通用管理/U_SingleFtyStatement.pas
@ -14,11 +14,11 @@ uses
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView,
  cxGridDBBandedTableView, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator,   dxDateRanges,
-  dxBarBuiltInMenu;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, dxSkinsCore,
+  dxSkinsDefaultPainters, dxScrollbarAnnotations, cxCurrencyEdit, U_BaseHelp;

 type
-  TfrmSingleFtyStatement = class(TForm)
+  TfrmSingleFtyStatement = class(TfrmBaseHELP)
    ToolBar1: TToolBar;
    TBRafresh: TToolButton;
    TBClose: TToolButton;
@ -50,31 +50,21 @@ type
    ADOQueryPrint: TADOQuery;
    TV1: TcxGridDBBandedTableView;
    V1Column2: TcxGridDBBandedColumn;
-    V1Column4: TcxGridDBBandedColumn;
-    V1Column5: TcxGridDBBandedColumn;
-    V1Column6: TcxGridDBBandedColumn;
-    V1Column7: TcxGridDBBandedColumn;
-    V1Column8: TcxGridDBBandedColumn;
    V1Column9: TcxGridDBBandedColumn;
    V1Column12: TcxGridDBBandedColumn;
    V1Column15: TcxGridDBBandedColumn;
-    V1Column3: TcxGridDBBandedColumn;
    V1Column10: TcxGridDBBandedColumn;
    V1Column14: TcxGridDBBandedColumn;
-    V1Column16: TcxGridDBBandedColumn;
-    V1Column17: TcxGridDBBandedColumn;
    V1Column20: TcxGridDBBandedColumn;
-    V1Column21: TcxGridDBBandedColumn;
-    V1Column22: TcxGridDBBandedColumn;
-    V1Column23: TcxGridDBBandedColumn;
    V1Column25: TcxGridDBBandedColumn;
-    V1Column26: TcxGridDBBandedColumn;
-    V1Column33: TcxGridDBBandedColumn;
    V1Column34: TcxGridDBBandedColumn;
    OppCoName: TEdit;
    ToolButton2: TToolButton;
-    TV1Column1: TcxGridDBBandedColumn;
-    TV1Column2: TcxGridDBBandedColumn;
+    TV1Column3: TcxGridDBBandedColumn;
+    TV1Column4: TcxGridDBBandedColumn;
+    TV1Column5: TcxGridDBBandedColumn;
+    TV1Column6: TcxGridDBBandedColumn;
+    TV1Column7: TcxGridDBBandedColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -147,7 +137,7 @@ end;

 procedure TfrmSingleFtyStatement.TBRafreshClick(Sender: TObject);
 begin
-  begdate.SetFocus;
+  PANEL1.SetFocus;
  InitGrid();
 end;

--- a/B02基础纱线仓库/U_YarnInEdit.dfm
+++ b/B02基础纱线仓库/U_YarnInEdit.dfm
@ -9,6 +9,7 @@ inherited frmYarnInEdit: TfrmYarnInEdit
  Font.Height = -16
  Position = poScreenCenter
  OnClose = FormClose
+  ExplicitLeft = -343
  ExplicitWidth = 1556
  ExplicitHeight = 618
  PixelsPerInch = 96
@ -21,7 +22,6 @@ inherited frmYarnInEdit: TfrmYarnInEdit
    Height = 549
    Align = alClient
    TabOrder = 0
-    ExplicitTop = 36
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -223,11 +223,13 @@ inherited frmYarnInEdit: TfrmYarnInEdit
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsEditFixedList
-        Properties.Items.Strings = (
-          'Kg'
-          'M')
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = Tv1QtyUnitPropertiesButtonClick
        HeaderAlignmentHorz = taCenter
        Width = 54
      end
--- a/B02基础纱线仓库/U_YarnInEdit.pas
+++ b/B02基础纱线仓库/U_YarnInEdit.pas
@ -89,6 +89,7 @@ type
    procedure ToolButton5Click(Sender: TObject);
    procedure Tv1Column3PropertiesEditValueChanged(Sender: TObject);
    procedure Tv1FromConNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure Tv1QtyUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
  private
    { Private declarations }
    function SaveCKData(): Boolean;
@ -884,6 +885,29 @@ begin
  end;
 end;

+procedure TfrmYarnInEdit.Tv1QtyUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := 'SXQTYUNIT';
+      flagname := 'µ¥Î»';
+      MainType := FSTKName;
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_Sub do
+        begin
+          Edit;
+          FieldByName('QtyUnit').Value := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString);
+        end;
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
 procedure TfrmYarnInEdit.v1Column14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin

--- a/B02基础纱线仓库/YarnStk.dproj.local
+++ b/B02基础纱线仓库/YarnStk.dproj.local
@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.664,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_TatPlanMachInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.807,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.345,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_WBSpecSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.089,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_TatPlanMachInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.807,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.664,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.345,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_WBSpecSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.089,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10SZKaiXiYa"/>
--- a/B02基础纱线仓库/testDll.res
+++ b/B02基础纱线仓库/testDll.res
--- a/B04采购计划管理/PurchasePlan.dproj.local
+++ b/B04采购计划管理/PurchasePlan.dproj.local
@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.921,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B04采购计划管理\U_GKManageSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.204,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>2025-12-06 09:54:40.000.204,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B04采购计划管理\U_GKManageSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10SZKaiXiYa"/>
--- a/B04采购计划管理/U_YarnPurchasePlanPut.dfm
+++ b/B04采购计划管理/U_YarnPurchasePlanPut.dfm
@ -10,7 +10,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
  OldCreateOrder = True
  Position = poScreenCenter
  WindowState = wsMaximized
-  ExplicitLeft = -673
  ExplicitWidth = 1540
  ExplicitHeight = 757
  PixelsPerInch = 96
@ -125,7 +124,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    Align = alClient
    BorderStyle = cxcbsNone
    TabOrder = 2
-    ExplicitLeft = -6
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -428,7 +426,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 3
-    ExplicitTop = 36
+    ExplicitTop = 24
    object lbl5: TLabel
      Left = 32
      Top = 50
--- a/E01梭织生产计划/TatPlan.dproj.local
+++ b/E01梭织生产计划/TatPlan.dproj.local
@ -1,85 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKManageSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>2025/10/13 10:49:44.000.724,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_YarnStkSel.pas</Transaction>
-    <Transaction>2025/11/26 15:57:54.000.998,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.724,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_YarnStkSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.998,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.258,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKManageSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10SZKaiXiYa"/>
--- a/E01梭织生产计划/TatPlan.identcache
+++ b/E01梭织生产计划/TatPlan.identcache
--- a/E01梭织生产计划/testDll.res
+++ b/E01梭织生产计划/testDll.res
--- a/E02梭织经轴仓库/U_TatWBPlan.dfm
+++ b/E02梭织经轴仓库/U_TatWBPlan.dfm
@ -33,7 +33,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
    ParentFont = False
    ShowCaptions = True
    TabOrder = 5
-    ExplicitTop = 4
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
@ -166,8 +165,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
    Color = clWhite
    ParentBackground = False
    TabOrder = 6
-    ExplicitLeft = 8
-    ExplicitTop = 32
    object Label1: TLabel
      Left = 18
      Top = 14
@ -278,8 +275,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
    Height = 541
    Align = alLeft
    TabOrder = 2
-    ExplicitLeft = -5
-    ExplicitTop = 117
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -500,7 +495,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
      #24050#32467#26463
      #20840#37096)
    OnChange = cxTabControl1Change
-    ExplicitLeft = -1
    ClientRectBottom = 30
    ClientRectRight = 1540
    ClientRectTop = 30
@ -521,8 +515,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
      Align = alClient
      PopupMenu = PM_1
      TabOrder = 0
-      ExplicitLeft = 6
-      ExplicitTop = 61
      object TV2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
@ -675,8 +667,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
-      ExplicitLeft = 6
-      ExplicitTop = 6
      object ToolButton2: TToolButton
        Left = 0
        Top = 0
@ -730,8 +720,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan
        #31232#36724
        #27974#36724)
      OnChange = cxTabControl2Change
-      ExplicitLeft = 6
-      ExplicitTop = 45
      ClientRectBottom = 30
      ClientRectRight = 709
      ClientRectTop = 30
--- a/E02梭织经轴仓库/U_TatWBPlanInPut.dfm
+++ b/E02梭织经轴仓库/U_TatWBPlanInPut.dfm
@ -8,6 +8,7 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
  Font.Charset = GB2312_CHARSET
  Font.Name = #23435#20307
  Position = poScreenCenter
+  ExplicitLeft = -12
  ExplicitWidth = 1445
  ExplicitHeight = 802
  PixelsPerInch = 96
@ -337,9 +338,18 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
          Caption = #31570#37325'KG'
          DataBinding.FieldName = 'TZQTY'
          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxTextEditProperties'
+          Properties.OnEditValueChanged = Tv1Column6PropertiesEditValueChanged
          HeaderAlignmentHorz = taCenter
          Width = 79
        end
+        object Tv1Column5: TcxGridDBColumn
+          Caption = #21333#31570#32433#38271'M'
+          DataBinding.FieldName = 'TMETER'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 69
+        end
        object Tv1Column4: TcxGridDBColumn
          Caption = #35745#21010#24635#29992#37327'KG'
          DataBinding.FieldName = 'JHYLQTY'
@ -392,6 +402,7 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
    ParentFont = False
    TabOrder = 2
    OnDblClick = gynoDblClick
+    ExplicitLeft = 2
    ExplicitTop = 41
    object Label3: TLabel
      Left = 708
@ -920,6 +931,19 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
      Font.Style = []
      ParentFont = False
    end
+    object Label36: TLabel
+      Left = 558
+      Top = 81
+      Width = 112
+      Height = 21
+      Caption = #21333#20010#31232#36724#38271#24230#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlue
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
+    end
    object C_NAME: TEdit
      Left = 788
      Top = 5
@ -1378,6 +1402,20 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
      TabOrder = 29
      Width = 70
    end
+    object wb_dgxzcd: TEdit
+      Left = 668
+      Top = 76
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 30
+      OnKeyPress = ConNoKeyPress
+    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Left = 969
--- a/E02梭织经轴仓库/U_TatWBPlanInPut.pas
+++ b/E02梭织经轴仓库/U_TatWBPlanInPut.pas
@ -127,6 +127,9 @@ type
    Label42: TLabel;
    Tv1Supplier: TcxGridDBColumn;
    Tv1IOTime: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Label36: TLabel;
+    wb_dgxzcd: TEdit;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -148,8 +151,7 @@ type

    procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
    procedure WB_YarnTotalLenExit(Sender: TObject);
-    procedure ButtonEdit(Sender: TObject;
-      AButtonIndex: Integer);
+    procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
  private
    procedure InitData();
    function SaveData(): Boolean;
@ -169,7 +171,7 @@ implementation

 uses
  U_DataLink, U_ZDYHelp, U_RTFun, U_CompanySel, U_YarnInfoSel, U_TatPlanSel2,
-  U_WBSpecSel, U_GKManageSel, U_WeaveSel, U_YarnStkSel,U_LogInput;
+  U_WBSpecSel, U_GKManageSel, U_WeaveSel, U_YarnStkSel, U_LogInput;

 {$R *.dfm}

@ -301,8 +303,8 @@ begin
        begin
          Close;
          sql.Clear;
-          sql.Add(' select A.*  from Tat_Plan_Yarn A  ');
-          sql.Add(' where YRType=''¾Ë¿'' AND ISNULL(Y_CODE,'''')<>'''' and A.MainId=''' + Trim(CDS_1.fieldbyname('MAINID').AsString) + '''');
+          sql.Add(' select A.*,MeterQty2=(select top 1 MeterQty from Tat_WB_Formula g where g.y_code=a.y_code and g.wbsid=(select wb_code from tat_plan_sub h where h.subid=a.subid))   ');
+          sql.Add(' from Tat_Plan_Yarn A  where YRType=''¾Ë¿'' AND ISNULL(Y_CODE,'''')<>'''' and A.MainId=''' + Trim(CDS_1.fieldbyname('MAINID').AsString) + '''');
          sql.Add(' Order by RowNo ');
          Open;
        end;
@ -324,7 +326,7 @@ begin

            FieldByName('ZS').Value := ADOQuery1.fieldbyname('Z_Number').Value;
            FieldByName('QFYARNQTY').Value := ADOQuery1.fieldbyname('QFYARNQTY').Value;
-            FieldByName('MeterQty').Value := ADOQuery1.fieldbyname('MeterQty').Value;
+            FieldByName('MeterQty').Value := ADOQuery1.fieldbyname('MeterQty2').Value;

 //            FieldByName('TZQTY').Value := ADOQuery1.fieldbyname('TZQTY').Value;
 //            FieldByName('JHYLQTY').Value := ADOQuery1.fieldbyname('JHYLQTY').Value;
@ -355,7 +357,6 @@ begin
  try
    ADOQueryCmd.Connection.BeginTrans;

-
    try
      if FTWPId <> '' then
      begin
@ -378,8 +379,6 @@ begin
      frmLogInput.Free;
    end;

-
-
    if Trim(FTWPId) = '' then
    begin
      if GetLSNo(ADOQueryCmd, maxno, 'JS', 'Tat_WB_Plan', 4, 1) = False then
@ -554,7 +553,7 @@ end;
 procedure TfrmTatWBPlanInPut.Tv1Column6PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
-  ZS, ZGS, zms: double;
+  ZS, ZGS, zms, ZDDZL, FZS: double;
 begin

  mvalue := TcxTextEdit(Sender).EditingText;
@ -575,6 +574,15 @@ begin
      ZGS := FieldByName('QFYARNQTY').Value;   //全服根数
    end;

+    if FieldByName('TZQTY').Value = null then
+    begin
+      ZDDZL := 0;
+    end
+    else
+    begin
+      ZDDZL := FieldByName('TZQTY').Value;
+    end;
+
    if FieldByName('ZS').Value = null then
    begin
      ZS := 0; //循环根数
@ -583,15 +591,22 @@ begin
    begin
      ZS := FieldByName('ZS').Value; //循环根数
    end;
-
+    FZS := StrToFloatDef(Z_ZHOUSHU1.Text, 0) + StrToFloatDef(Z_ZHOUSHU2.Text, 0);
  end;
  if ZS <> 0 then
  begin
    with CDS_1 do
    begin
      Edit;
-      FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2);
-      FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS * 1.08 / 100 * zms, 2);
+      FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS, 2);
+
+      FieldByName('TMETER').Value := roundfloat(ZS * ZDDZL * 1693, 2);
+
+      FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS / 100 * zms, 2);
+      if FZS <> 0 then
+      begin
+        wb_dgxzcd.Text := FloatToStr(roundfloat(ZS * ZDDZL * 1693 / FZS, 2));
+      end;
      Post;
    end;
  end;
@ -661,8 +676,7 @@ begin
  end;
 end;

-procedure TfrmTatWBPlanInPut.ButtonEdit(Sender: TObject;
-  AButtonIndex: Integer);
+procedure TfrmTatWBPlanInPut.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
 begin
  try
    frmYarnStkSel := TfrmYarnStkSel.Create(Application);
@ -692,7 +706,7 @@ begin
  finally
    frmYarnStkSel.Free;
  end;
-
+  Tv1Column6PropertiesEditValueChanged(Sender);
 end;

 procedure TfrmTatWBPlanInPut.WB_CodeBtnUpClick(Sender: TObject);
@ -838,8 +852,8 @@ begin
        with CDS_1 do
        begin
          Edit;
-          FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2);
-          FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS * 1.08 / 100 * zms, 2);
+          FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS, 2);
+          FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS / 100 * zms, 2);
          Post;
        end;
      end;
--- a/E02梭织经轴仓库/U_TatWBPlanZJZK.dfm
+++ b/E02梭织经轴仓库/U_TatWBPlanZJZK.dfm
@ -6,7 +6,6 @@ inherited frmTatWBPlanZJZK: TfrmTatWBPlanZJZK
  ClientWidth = 1540
  Font.Height = -16
  Position = poScreenCenter
-  ExplicitLeft = -689
  ExplicitWidth = 1556
  ExplicitHeight = 691
  PixelsPerInch = 96
@ -721,6 +720,7 @@ inherited frmTatWBPlanZJZK: TfrmTatWBPlanZJZK
          DataBinding.FieldName = 'Ssel'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
+          Properties.ImmediatePost = True
          HeaderAlignmentHorz = taCenter
          Width = 50
        end
--- a/E02梭织经轴仓库/U_TatWBPlanZJZK.pas
+++ b/E02梭织经轴仓库/U_TatWBPlanZJZK.pas
@ -176,9 +176,9 @@ type
 implementation

 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_TatWBPlanInPut,U_TatWBCardInPut,
-  U_TatWBPlanZJZKInPut,U_TatWBPlanZJZKKaiKa ,
-  U_TatWBCardInPut2, U_RPFun,U_LogInput; //U_TatWBPlanCardInPut
+  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_TatWBPlanInPut,
+  U_TatWBCardInPut, U_TatWBPlanZJZKInPut, U_TatWBPlanZJZKKaiKa,
+  U_TatWBCardInPut2, U_RPFun, U_LogInput; //U_TatWBPlanCardInPut

 {$R *.dfm}

@ -416,16 +416,15 @@ begin
    sql.Add(' ' + quotedstr(trim(DName)));
    sql.Add(',getdate() ');
    sql.Add(',' + quotedstr(trim(self.Caption)));
-    sql.Add(',' + quotedstr(trim('½¬É´¼Æ»®µ¥ĞŞ¸Ä')));
+    sql.Add(',' + quotedstr(trim('Õû¾¼Æ»®µ¥ĞŞ¸Ä')));
    sql.Add(',' + quotedstr(trim('¼Æ»®µ¥ºÅ£º' + trim(CDS_1.FieldByName('TWPId').AsString))));
    sql.Add(',' + quotedstr(trim('³É¹¦')));
    sql.Add(')');
    ExecSQL;
  end;
-
  try
-    frmTatWBPlanInPut := TfrmTatWBPlanInPut.Create(Application);
-    with frmTatWBPlanInPut do
+    frmTatWBPlanZJZKInPut := TfrmTatWBPlanZJZKInPut.Create(Application);
+    with frmTatWBPlanZJZKInPut do
    begin
      PState := 1;
      FTWPId := Trim(Self.CDS_1.fieldbyname('TWPId').AsString);
@ -436,8 +435,9 @@ begin
      end;
    end;
  finally
-    frmTatWBPlanInPut.Free;
+    frmTatWBPlanZJZKInPut.Free;
  end;
+
 end;

 procedure TfrmTatWBPlanZJZK.TBEndClick(Sender: TObject);
@ -545,7 +545,7 @@ begin
    frmLabelPrint := TfrmLabelPrint.Create(Application);
    with frmLabelPrint do
    begin
-      FLMType := 'TatWBPlan';
+      FLMType := 'TatWBPlan2';
      FFiltration1 := WSql;
      FFiltration2 := WSql;
      FFiltration3 := WSql;
@ -604,8 +604,8 @@ end;
 procedure TfrmTatWBPlanZJZK.TBViewClick(Sender: TObject);
 begin
  try
-    frmTatWBPlanInPut := TfrmTatWBPlanInPut.Create(Application);
-    with frmTatWBPlanInPut do
+    frmTatWBPlanZJZKInPut := TfrmTatWBPlanZJZKInPut.Create(Application);
+    with frmTatWBPlanZJZKInPut do
    begin
      PState := 1;
      FTWPId := Trim(Self.CDS_1.fieldbyname('TWPId').AsString);
@ -618,7 +618,7 @@ begin
      end;
    end;
  finally
-    frmTatWBPlanInPut.Free;
+    frmTatWBPlanZJZKInPut.Free;
  end;
 end;

@ -708,7 +708,8 @@ begin
 //          begin
 //            FLMType := 'TatWBCard2';
 //          end;
-//      end;
+//      end;      ¡¢
+//      FLMType := 'TatWBCard3';
      FFiltration1 := RTValues[0];
      if ShowModal = 1 then
      begin
--- a/E02梭织经轴仓库/U_TatWBPlanZJZKInPut.dfm
+++ b/E02梭织经轴仓库/U_TatWBPlanZJZKInPut.dfm
@ -3,13 +3,13 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
  Top = 14
  Caption = #25972#32463#35745#21010#24405#20837
  ClientHeight = 763
-  ClientWidth = 1049
+  ClientWidth = 1155
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Name = #23435#20307
  Position = poScreenCenter
  WindowState = wsMaximized
-  ExplicitWidth = 1065
+  ExplicitWidth = 1171
  ExplicitHeight = 802
  PixelsPerInch = 96
  TextHeight = 12
@ -17,7 +17,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
    Tag = 1
    Left = 0
    Top = 0
-    Width = 1049
+    Width = 1155
    Height = 38
    AutoSize = True
    ButtonHeight = 38
@ -63,14 +63,14 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
  object Panel2: TPanel [1]
    Left = 0
    Top = 441
-    Width = 1049
+    Width = 1155
    Height = 322
    Align = alClient
    TabOrder = 1
    object cxPageControl1: TcxPageControl
      Left = 1
      Top = 36
-      Width = 1047
+      Width = 1153
      Height = 285
      Align = alClient
      Color = clWhite
@ -87,13 +87,13 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Properties.CustomButtons.Buttons = <>
      Properties.Style = 6
      ClientRectBottom = 285
-      ClientRectRight = 1047
+      ClientRectRight = 1153
      ClientRectTop = 0
    end
    object Panel5: TPanel
      Left = 1
      Top = 1
-      Width = 1047
+      Width = 1153
      Height = 35
      Align = alTop
      TabOrder = 1
@ -166,7 +166,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
    object cxGrid1: TcxGrid
      Left = 1
      Top = 36
-      Width = 1047
+      Width = 1153
      Height = 285
      Align = alClient
      TabOrder = 2
@ -338,9 +338,18 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
          Caption = #31570#37325'KG'
          DataBinding.FieldName = 'TZQTY'
          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxTextEditProperties'
+          Properties.OnEditValueChanged = Tv1Column6PropertiesEditValueChanged
          HeaderAlignmentHorz = taCenter
          Width = 79
        end
+        object Tv1Column5: TcxGridDBColumn
+          Caption = #21333#31570#32433#38271'M'
+          DataBinding.FieldName = 'TMETER'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 70
+        end
        object Tv1Column4: TcxGridDBColumn
          Caption = #35745#21010#24635#29992#37327'KG'
          DataBinding.FieldName = 'JHYLQTY'
@ -378,7 +387,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
  object ScrollBox1: TScrollBox [2]
    Left = 0
    Top = 38
-    Width = 1049
+    Width = 1155
    Height = 403
    Align = alTop
    BevelInner = bvNone
@ -457,6 +466,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
+      Visible = False
    end
    object Label6: TLabel
      Left = 25
@ -470,6 +480,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
+      Visible = False
    end
    object Label13: TLabel
      Left = 25
@ -672,6 +683,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
+      Visible = False
    end
    object Label24: TLabel
      Left = 576
@ -685,6 +697,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
+      Visible = False
    end
    object Label33: TLabel
      Left = 25
@ -876,6 +889,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Style = []
      ParentFont = False
      TabOrder = 3
+      Visible = False
      OnDblClick = gynoDblClick
      OnKeyPress = ConNoKeyPress
    end
@ -891,6 +905,7 @@ inherited frmTatWBPlanZJZKInPut: TfrmTatWBPlanZJZKInPut
      Font.Style = []
      ParentFont = False
      TabOrder = 4
+      Visible = False
      OnDblClick = gynoDblClick
      OnKeyPress = ConNoKeyPress
    end
--- a/E02梭织经轴仓库/U_TatWBPlanZJZKInPut.pas
+++ b/E02梭织经轴仓库/U_TatWBPlanZJZKInPut.pas
@ -113,6 +113,7 @@ type
    Tv1IOTime: TcxGridDBColumn;
    Label1: TLabel;
    F_yushu: TEdit;
+    Tv1Column5: TcxGridDBColumn;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -263,10 +264,11 @@ begin
        Self.WB_Name.Text := Trim(ADOQueryTemp.fieldbyname('WB_Name').AsString);

        Self.WB_YarnQty.Text := ADOQueryTemp.fieldbyname('WB_YarnQty').asstring;
-        Self.Z_BINGSHU.Text := ADOQueryTemp.fieldbyname('Z_BINGSHU').asstring;

-        Self.Z_MAXKESHU.Text := ADOQueryTemp.fieldbyname('Z_MAXKESHU').asstring;
-        Self.Z_SJKESHU1.Text := ADOQueryTemp.fieldbyname('Z_SJKESHU1').asstring;
+        Self.Z_BINGSHU.Text := ADOQueryTemp.fieldbyname('F_YarnStripQty').asstring;
+
+        Self.Z_MAXKESHU.Text := ADOQueryTemp.fieldbyname('F_MAXKESHU').asstring;
+        Self.Z_SJKESHU1.Text := ADOQueryTemp.fieldbyname('F_SJKESHU').asstring;

        Self.F_YUSHU.Text := ADOQueryTemp.fieldbyname('F_YUSHU').asstring;

@ -285,9 +287,10 @@ begin
        begin
          Close;
          sql.Clear;
-          sql.Add(' select A.*  from Tat_Plan_Yarn A  ');
+          sql.Add(' select A.*,MeterQty2=(select top 1 MeterQty from Tat_WB_Formula g where g.y_code=a.y_code and g.wbsid=(select wb_code from tat_plan_sub h where h.subid=a.subid))  from Tat_Plan_Yarn A  ');
          sql.Add(' where YRType=''¾Ë¿'' AND ISNULL(Y_CODE,'''')<>'''' and A.MainId=''' + Trim(CDS_1.fieldbyname('MAINID').AsString) + '''');
          sql.Add(' Order by RowNo ');
+
          Open;
        end;
        self.CDS_1.EmptyDataSet;
@ -308,7 +311,7 @@ begin

            FieldByName('ZS').Value := ADOQuery1.fieldbyname('Z_Number').Value;
            FieldByName('QFYARNQTY').Value := ADOQuery1.fieldbyname('QFYARNQTY').Value;
-            FieldByName('MeterQty').Value := ADOQuery1.fieldbyname('MeterQty').Value;
+            FieldByName('MeterQty').Value := ADOQuery1.fieldbyname('MeterQty2').Value;

 //            FieldByName('TZQTY').Value := ADOQuery1.fieldbyname('TZQTY').Value;
 //            FieldByName('JHYLQTY').Value := ADOQuery1.fieldbyname('JHYLQTY').Value;
@ -535,7 +538,7 @@ end;
 procedure TfrmTatWBPlanZJZKInPut.Tv1Column6PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
-  ZS, ZGS, zms: double;
+  ZS, ZGS, zms, ZDDZL: double;
 begin

  mvalue := TcxTextEdit(Sender).EditingText;
@ -556,6 +559,15 @@ begin
      ZGS := FieldByName('QFYARNQTY').Value;   //È«·þ¸ùÊý
    end;

+    if FieldByName('TZQTY').Value = null then
+    begin
+      ZDDZL := 0;
+    end
+    else
+    begin
+      ZDDZL := FieldByName('TZQTY').Value;
+    end;
+
    if FieldByName('ZS').Value = null then
    begin
      ZS := 0; //Ñ»·¸ùÊý
@ -571,11 +583,15 @@ begin
    with CDS_1 do
    begin
      Edit;
-      FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2);
-      FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS * 1.08 / 100 * zms, 2);
+      FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS, 2);
+
+      FieldByName('TMETER').Value := roundfloat(ZS * ZDDZL * 1693, 2);
+
+      FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS / 100 * zms, 2);
      Post;
    end;
  end;
+
 end;

 procedure TfrmTatWBPlanZJZKInPut.Tv1Column7PropertiesEditValueChanged(Sender: TObject);
@ -672,7 +688,7 @@ begin
  finally
    frmYarnStkSel.Free;
  end;
-
+  Tv1Column6PropertiesEditValueChanged(Sender);
 end;

 procedure TfrmTatWBPlanZJZKInPut.WB_CodeBtnUpClick(Sender: TObject);
@ -689,10 +705,12 @@ begin
        Self.WB_Name.Text := Trim(CDS_1.fieldbyname('WB_Name').AsString);

        Self.WB_YarnQty.Text := CDS_1.fieldbyname('WB_YarnQty').asstring;
-        Self.Z_BINGSHU.Text := CDS_1.fieldbyname('Z_BINGSHU').asstring;
+        Self.Z_BINGSHU.Text := CDS_1.fieldbyname('F_YarnStripQty').asstring;

-        Self.Z_MAXKESHU.Text := CDS_1.fieldbyname('Z_MAXKESHU').asstring;
-        Self.Z_SJKESHU1.Text := CDS_1.fieldbyname('Z_SJKESHU1').asstring;
+        Self.Z_MAXKESHU.Text := CDS_1.fieldbyname('F_MAXKESHU').asstring;
+        Self.Z_SJKESHU1.Text := CDS_1.fieldbyname('F_SJKESHU').asstring;
+
+        Self.F_YUSHU.Text := CDS_1.fieldbyname('F_YUSHU').asstring;

        Self.gkbh.Text := Trim(CDS_1.fieldbyname('gkbh').AsString);
        Self.WB_Width.Text := Trim(CDS_1.fieldbyname('WB_Width').AsString);
@ -815,8 +833,8 @@ begin
        with CDS_1 do
        begin
          Edit;
-          FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2);
-          FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS * 1.08 / 100 * zms, 2);
+          FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS, 2);
+          FieldByName('JHYLQTY').Value := roundfloat(ZGS * 0.059 / ZS / 100 * zms, 2);
          Post;
        end;
      end;
--- a/E02梭织经轴仓库/U_WBSpecInPut.dfm
+++ b/E02梭织经轴仓库/U_WBSpecInPut.dfm
@ -308,7 +308,6 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
    ParentCtl3D = False
    ParentFont = False
    TabOrder = 2
-    ExplicitTop = 24
    object Label3: TLabel
      Left = 11
      Top = 17
@ -1004,7 +1003,7 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
    end
    object cxGroupBox2: TcxGroupBox
      Left = 0
-      Top = 91
+      Top = 90
      Caption = #25972#27974#24182
      ParentFont = False
      Style.Font.Charset = ANSI_CHARSET
--- a/E02梭织经轴仓库/U_WeaveSel.dfm
+++ b/E02梭织经轴仓库/U_WeaveSel.dfm
@ -64,7 +64,6 @@ inherited frmWeaveSel: TfrmWeaveSel
    BevelInner = bvRaised
    BevelOuter = bvLowered
    TabOrder = 1
-    ExplicitTop = 32
    object Label3: TLabel
      Left = 15
      Top = 7
@ -170,7 +169,6 @@ inherited frmWeaveSel: TfrmWeaveSel
      #24050#23433#25490
      #20840#37096)
    OnChange = cxTabControl1Change
-    ExplicitTop = 99
    ClientRectBottom = 545
    ClientRectLeft = 1
    ClientRectRight = 1539
--- a/E02梭织经轴仓库/U_WeaveSel.pas
+++ b/E02梭织经轴仓库/U_WeaveSel.pas
@ -132,7 +132,7 @@ begin
      sql.Add(' select *,PZQty=(select count(*) from Tat_WB_Card X where X.OrderNo =A.OrderNo)');
      SQL.Add(',apqty=(select sum(WB_YarnLen) from Tat_WB_Card X where X.OrderNo =A.OrderNo)');
      sql.Add(',ZS=(select ZS from Bs_Cloth_Info X where X.C_Code =B.C_Code)  ');
-      SQL.Add(',ORDQTY2=ROUND(ORDQTY*1.08,2)');
+      SQL.Add(',ORDQTY2=ROUND(ORDQTY*(100+isnull(zs,0))/100,2)');
      sql.Add(',ISSizing=(select ISSizing from Tat_WB_Spec E where E.WB_Code =B.WB_Code)  ');
      sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.MainId=B.MainId');

--- a/E02梭织经轴仓库/WarpBeamStk.dproj.local
+++ b/E02梭织经轴仓库/WarpBeamStk.dproj.local
@ -147,31 +147,31 @@
    <File Path="U_WBNeedHTList.dfm"/>
  </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.416,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatYarnSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_GKInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.215,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_Tat_WB_InPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
-    <Transaction>2025/11/15 16:39:54.000.378,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
-    <Transaction>2025/11/15 17:02:40.000.598,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_LogInput.pas</Transaction>
-    <Transaction>2025/12/12 14:33:26.000.162,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZKInPut.pas</Transaction>
-    <Transaction>2025/12/12 14:51:55.000.373,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZKKaiKa.pas</Transaction>
-    <Transaction>2025/12/12 14:57:30.000.192,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZK.pas</Transaction>
-    <Transaction>2025/12/23 09:36:15.000.210,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WBNeedHTLook.pas</Transaction>
-    <Transaction>2025/12/25 16:38:57.000.020,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WBNeedHTList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.416,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatYarnSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.210,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WBNeedHTLook.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.215,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_Tat_WB_InPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.192,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZK.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_GKInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.378,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZKKaiKa.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.020,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WBNeedHTList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.162,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlanZJZKInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.598,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_LogInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas</Transaction>
  </Transactions>
 </BorlandProject>
--- a/E02梭织经轴仓库/WarpBeamStk.identcache
+++ b/E02梭织经轴仓库/WarpBeamStk.identcache
--- a/E02梭织经轴仓库/testDll.identcache
+++ b/E02梭织经轴仓库/testDll.identcache
--- a/E02梭织经轴仓库/testDll.res
+++ b/E02梭织经轴仓库/testDll.res