111123456

2025-05-28 09:28:35 +08:00 · 2025-05-28 09:28:35 +08:00 · d03865acd9
commit d03865acd9
parent 6f18380ee4
28 changed files with 612 additions and 277 deletions
--- a/A00通用窗体/U_LabelMapSet.dfm
+++ b/A00通用窗体/U_LabelMapSet.dfm
@ -95,6 +95,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -125,6 +126,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object v2Column1: TcxGridDBColumn
        Caption = #31867#22411
        DataBinding.FieldName = 'LMType'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -134,6 +136,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object Tv1Column3: TcxGridDBColumn
        Caption = #24207#21495
        DataBinding.FieldName = 'SerialNo'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = TextEdit
        HeaderAlignmentHorz = taCenter
@ -142,6 +145,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object v2Column12: TcxGridDBColumn
        Caption = #25253#34920#21517#31216
        DataBinding.FieldName = 'LMName'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -150,6 +154,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object v2Column8: TcxGridDBColumn
        Caption = #35843#29992#23384#20648'1'
        DataBinding.FieldName = 'LMSql1'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -158,6 +163,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object Tv1Column1: TcxGridDBColumn
        Caption = #35843#29992#23384#20648'2'
        DataBinding.FieldName = 'LMSql2'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -166,6 +172,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      object Tv1Column2: TcxGridDBColumn
        Caption = #35843#29992#23384#20648'3'
        DataBinding.FieldName = 'LMSql3'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -231,6 +238,7 @@ object frmLabelMapSet: TfrmLabelMapSet
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
--- a/A00通用窗体/U_LabelMapSet.pas
+++ b/A00通用窗体/U_LabelMapSet.pas
@ -15,7 +15,8 @@ uses
  cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
   dxDateRanges, dxBarBuiltInMenu, System.ImageList,
-  Vcl.ImgList, U_BaseHelp, Vcl.Clipbrd;
+  Vcl.ImgList, U_BaseHelp, Vcl.Clipbrd, dxSkinsCore, dxSkinsDefaultPainters,
  dxScrollbarAnnotations;
 type
  TfrmLabelMapSet = class(Tform)
--- a/A02基础产品管理/U_TatClothInfo.dfm
+++ b/A02基础产品管理/U_TatClothInfo.dfm
@ -359,8 +359,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      Align = alClient
      PopupMenu = PM_1
      TabOrder = 0
-      ExplicitLeft = 6
+      ExplicitLeft = 4
      ExplicitTop = 39
      object Tv1: TcxGridDBTableView
        OnDblClick = Tv1DblClick
        Navigator.Buttons.CustomButtons = <>
@ -704,7 +703,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      Height = 367
      Align = alBottom
      TabOrder = 2
-      Properties.ActivePage = cxTabSheet1
+      Properties.ActivePage = cxTabSheet2
      Properties.CustomButtons.Buttons = <>
      Properties.Style = 9
      LookAndFeel.Kind = lfUltraFlat
@ -753,6 +752,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
            Height = 337
            Align = alClient
            TabOrder = 1
            ExplicitLeft = 0
            object TV2: TcxGridDBTableView
              Navigator.Buttons.CustomButtons = <>
              ScrollbarAnnotations.CustomAnnotations = <>
@ -866,7 +866,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
                Width = 99
              end
              object TV2Column8: TcxGridDBColumn
-                Caption = #29702#35770'D'#25968
+                Caption = #20998#29305'(Dtex)'
                DataBinding.FieldName = 'TestDenier'
                DataBinding.IsNullValueType = True
                HeaderAlignmentHorz = taCenter
@ -1047,7 +1047,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
              Width = 88
            end
            object Tv4Column8: TcxGridDBColumn
-              Caption = #29702#35770'D'#25968
+              Caption = #20998#29305'(Dtex)'
              DataBinding.FieldName = 'TestDenier'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
@ -1103,6 +1103,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      object cxTabSheet3: TcxTabSheet
        Caption = #26679#21697#22270#29255
        ImageIndex = 2
        ExplicitTop = 0
        ExplicitWidth = 0
        ExplicitHeight = 0
        object GroupBox1: TGroupBox
          Left = 0
          Top = 0
@ -1126,6 +1129,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      object cxTabSheet4: TcxTabSheet
        Caption = #36215#32508#27861
        ImageIndex = 3
        ExplicitTop = 0
        ExplicitWidth = 0
        ExplicitHeight = 0
        object QZF: TMemo
          Tag = 2
          Left = 0
@ -1147,6 +1153,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      object cxTabSheet5: TcxTabSheet
        Caption = #31359#32508#27861
        ImageIndex = 3
        ExplicitTop = 0
        ExplicitWidth = 0
        ExplicitHeight = 0
        object CZF: TMemo
          Tag = 2
          Left = 0
@ -1168,6 +1177,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      object cxTabSheet6: TcxTabSheet
        Caption = #31359#31576#27861
        ImageIndex = 3
        ExplicitTop = 0
        ExplicitWidth = 0
        ExplicitHeight = 0
        object CKF: TMemo
          Tag = 2
          Left = 0
@ -1225,8 +1237,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_ClothInfo.ADOLink
    Parameters = <>
-    Left = 306
+    Left = 242
-    Top = 182
+    Top = 179
  end
  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
--- a/A02基础产品管理/U_TatClothInfoInput.dfm
+++ b/A02基础产品管理/U_TatClothInfoInput.dfm
@ -28,7 +28,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    ParentColor = False
    ShowCaptions = True
    TabOrder = 0
    ExplicitWidth = 1404
    object ToolButton1: TToolButton
      Tag = 1
      Left = 0
@ -77,7 +76,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 1
    ExplicitTop = 36
    object Label1: TLabel
      Left = 38
      Top = 26
@ -340,8 +338,8 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    end
    object C_ReedWidth: TcxTextEdit
      Tag = 2
-      Left = 870
+      Left = 869
-      Top = 24
+      Top = 26
      ParentColor = True
      Properties.OnEditValueChanged = C_ReedWidthPropertiesEditValueChanged
      TabOrder = 7
@ -476,7 +474,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    object MFDW: TcxComboBox
      Tag = 2
      Left = 1031
-      Top = 24
+      Top = 27
      Properties.Items.Strings = (
        #8220
        'CM')
@ -509,6 +507,17 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
      TabOrder = 25
      Width = 567
    end
    object LPDW: TcxComboBox
      Tag = 2
      Left = 302
      Top = 57
      Properties.Items.Strings = (
        'GSM'
        'MM')
      Properties.OnEditValueChanged = MFDWPropertiesEditValueChanged
      TabOrder = 26
      Width = 63
    end
  end
  object cxPageControl3: TcxPageControl [2]
    Left = 0
@ -517,17 +526,15 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    Height = 462
    Align = alClient
    TabOrder = 2
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
    ExplicitWidth = 1404
    ClientRectBottom = 462
    ClientRectRight = 1540
    ClientRectTop = 28
    object cxTabSheet1: TcxTabSheet
      Caption = #32463#19997#32452#21512
      ImageIndex = 0
      ExplicitWidth = 1404
      object GroupBox1: TGroupBox
        Left = 931
        Top = 0
@ -542,7 +549,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
        Font.Style = [fsBold]
        ParentFont = False
        TabOrder = 0
        ExplicitWidth = 473
        object Y_Note_PLJ: TMemo
          Tag = 2
          Left = 2
@ -551,7 +557,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
          Height = 401
          Align = alClient
          TabOrder = 0
          ExplicitWidth = 469
        end
      end
      object Panel1: TPanel
@ -723,7 +728,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
              Width = 100
            end
            object TV1Column6: TcxGridDBColumn
-              Caption = #29702#35770'D'#25968
+              Caption = #20998#29305'(Dtex)'
              DataBinding.FieldName = 'TestDenier'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
@ -762,7 +767,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    object cxTabSheet2: TcxTabSheet
      Caption = #32428#19997#32452#21512
      ImageIndex = 1
      ExplicitWidth = 1404
      object GroupBox2: TGroupBox
        Left = 961
        Top = 0
@ -777,7 +781,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
        Font.Style = [fsBold]
        ParentFont = False
        TabOrder = 0
        ExplicitWidth = 443
        object Y_Note_PLW: TMemo
          Tag = 2
          Left = 2
@ -786,7 +789,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
          Height = 401
          Align = alClient
          TabOrder = 0
          ExplicitWidth = 439
        end
      end
      object Panel2: TPanel
@ -958,7 +960,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
              Width = 80
            end
            object Tv2Column6: TcxGridDBColumn
-              Caption = #29702#35770'D'#25968
+              Caption = #20998#29305'(Dtex)'
              DataBinding.FieldName = 'TestDenier'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
@ -997,7 +999,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    object cxTabSheet3: TcxTabSheet
      Caption = #36215#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 1404
      ExplicitHeight = 0
      object Panel8: TPanel
        Left = 0
        Top = 0
@ -1083,7 +1087,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    object cxTabSheet4: TcxTabSheet
      Caption = #31359#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 1404
      ExplicitHeight = 0
      object CZF: TMemo
        Tag = 2
        Left = 0
@ -1099,7 +1105,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
    object cxTabSheet5: TcxTabSheet
      Caption = #31359#31576#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 1404
      ExplicitHeight = 0
      object CKF: TMemo
        Tag = 2
        Left = 0
@ -1115,13 +1123,13 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = ADOConnection1
-    Left = 812
+    Left = 721
-    Top = 318
+    Top = 190
  end
  inherited ADOQueryBaseTemp: TADOQuery
    Connection = ADOConnection1
-    Left = 760
+    Left = 1007
-    Top = 318
+    Top = 372
  end
  inherited ImageList_new32: TImageList
    Left = 404
@ -1170,8 +1178,8 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
  end
  object ADOConnection1: TADOConnection
    LoginPrompt = False
-    Left = 872
+    Left = 844
-    Top = 318
+    Top = 140
  end
  object ImageList1: TImageList
    DrawingStyle = dsTransparent
--- a/A02基础产品管理/U_TatClothInfoInput.pas
+++ b/A02基础产品管理/U_TatClothInfoInput.pas
@ -179,6 +179,7 @@ type
    JinSha: TcxTextEdit;
    Label22: TLabel;
    WeiSha: TcxTextEdit;
    LPDW: TcxComboBox;
    procedure FormShow(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
--- a/B01基础合同管理/Contract.dproj.local
+++ b/B01基础合同管理/Contract.dproj.local
@ -41,25 +41,25 @@
    <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.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas</Transaction>
--- a/B01基础合同管理/ProjectGroup1.groupproj
+++ b/B01基础合同管理/ProjectGroup1.groupproj
@ -1,11 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
-        <ProjectGuid>{D75EC075-444C-40C2-8ACB-0AAD801B39FF}</ProjectGuid>
+        <ProjectGuid>{295B0C79-91E1-4339-B926-7EF6002EB657}</ProjectGuid>
    </PropertyGroup>
    <ItemGroup>
        <Projects Include="Contract.dproj">
            <Dependencies/>
        </Projects>
        <Projects Include="testDll.dproj">
            <Dependencies/>
        </Projects>
@ -17,15 +14,6 @@
            <Default.Personality/>
        </BorlandProject>
    </ProjectExtensions>
    <Target Name="Contract">
        <MSBuild Projects="Contract.dproj"/>
    </Target>
    <Target Name="Contract:Clean">
        <MSBuild Projects="Contract.dproj" Targets="Clean"/>
    </Target>
    <Target Name="Contract:Make">
        <MSBuild Projects="Contract.dproj" Targets="Make"/>
    </Target>
    <Target Name="testDll">
        <MSBuild Projects="testDll.dproj"/>
    </Target>
@ -36,13 +24,13 @@
        <MSBuild Projects="testDll.dproj" Targets="Make"/>
    </Target>
    <Target Name="Build">
-        <CallTarget Targets="Contract;testDll"/>
+        <CallTarget Targets="testDll"/>
    </Target>
    <Target Name="Clean">
-        <CallTarget Targets="Contract:Clean;testDll:Clean"/>
+        <CallTarget Targets="testDll:Clean"/>
    </Target>
    <Target Name="Make">
-        <CallTarget Targets="Contract:Make;testDll:Make"/>
+        <CallTarget Targets="testDll:Make"/>
    </Target>
    <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>
--- a/B01基础合同管理/ProjectGroup1.groupproj.local
+++ b/B01基础合同管理/ProjectGroup1.groupproj.local
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B01基础合同管理\Contract.dproj"/>
+		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\Contract.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/B02基础纱线仓库/U_CJDJ.dfm
+++ b/B02基础纱线仓库/U_CJDJ.dfm
@ -2,30 +2,29 @@ object frmCJDJ: TfrmCJDJ
  Left = 682
  Top = 315
  Caption = #25277#26816#30331#35760
-  ClientHeight = 254
+  ClientHeight = 443
  ClientWidth = 794
  Color = clWhite
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -16
  Font.Name = 'MS Sans Serif'
  Font.Style = []
  OldCreateOrder = False
  Position = poMainFormCenter
  OnShow = FormShow
  PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 20
  object Panel1: TPanel
    Left = 0
    Top = 0
    Width = 794
-    Height = 254
+    Height = 443
    Align = alClient
    TabOrder = 0
-    ExplicitLeft = 1
+    ExplicitLeft = -1
    ExplicitWidth = 1064
    object Label1: TLabel
-      Left = 32
+      Left = 33
      Top = 36
      Width = 110
      Height = 21
@ -39,7 +38,7 @@ object frmCJDJ: TfrmCJDJ
    end
    object Label3: TLabel
      Left = 32
-      Top = 110
+      Top = 170
      Width = 120
      Height = 21
      AutoSize = False
@ -53,7 +52,7 @@ object frmCJDJ: TfrmCJDJ
    end
    object Label2: TLabel
      Left = 32
-      Top = 189
+      Top = 249
      Width = 120
      Height = 21
      AutoSize = False
@ -65,6 +64,19 @@ object frmCJDJ: TfrmCJDJ
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label4: TLabel
      Left = 33
      Top = 91
      Width = 110
      Height = 21
      Caption = #25277#26816#25968#37327#65306
      Font.Charset = ANSI_CHARSET
      Font.Color = clWindowText
      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Button1: TButton
      Left = 397
      Top = 33
@ -81,18 +93,11 @@ object frmCJDJ: TfrmCJDJ
      OnClick = Button1Click
    end
    object CJDate: TcxDateEdit
-      Left = 137
+      Left = 136
-      Top = 31
+      Top = 32
      AutoSize = False
      ParentFont = False
      Properties.ImmediatePost = True
      Properties.ShowTime = False
      Style.Font.Charset = ANSI_CHARSET
      Style.Font.Color = clWindowText
      Style.Font.Height = -21
      Style.Font.Name = #23435#20307
      Style.Font.Style = [fsBold]
      Style.IsFontAssigned = True
      TabOrder = 1
      Height = 33
      Width = 218
@ -100,9 +105,8 @@ object frmCJDJ: TfrmCJDJ
    object CJer: TcxButtonEdit
      Tag = 2
      Left = 137
-      Top = 186
+      Top = 246
      Hint = 'CJer/'#25277#26816#20154
      ParentFont = False
      Properties.Buttons = <
        item
          Default = True
@ -110,30 +114,38 @@ object frmCJDJ: TfrmCJDJ
        end>
      Properties.ReadOnly = False
      Properties.OnButtonClick = BegPortPropertiesButtonClick
      Style.Font.Charset = ANSI_CHARSET
      Style.Font.Color = clWindowText
      Style.Font.Height = -21
      Style.Font.Name = #23435#20307
      Style.Font.Style = [fsBold]
      Style.ButtonStyle = btsDefault
      Style.IsFontAssigned = True
      TabOrder = 2
      Width = 218
    end
    object CJNote: TRichEdit
-      Left = 137
+      Left = 282
-      Top = 79
+      Top = 139
-      Width = 548
+      Width = 341
      Height = 89
      Font.Charset = ANSI_CHARSET
      Font.Color = clWindowText
      Font.Height = -21
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
      TabOrder = 3
      Zoom = 100
    end
    object CJQuantitly: TLabeledEdit
      Left = 138
      Top = 89
      Width = 209
      Height = 28
      EditLabel.Width = 4
      EditLabel.Height = 20
      TabOrder = 4
    end
    object CJType: TcxComboBox
      Left = 142
      Top = 172
      Properties.Items.Strings = (
        #32433#32455
        #24378#21147
        #26465#24863
        #26825#32467)
      TabOrder = 5
      Width = 118
    end
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_YarnStk.ADOLink
--- a/B02基础纱线仓库/U_CJDJ.pas
+++ b/B02基础纱线仓库/U_CJDJ.pas
@ -21,6 +21,9 @@ type
    ADOQueryTemp: TADOQuery;
    ADOQueryCmd: TADOQuery;
    CJNote: TRichEdit;
    CJQuantitly: TLabeledEdit;
    Label4: TLabel;
    CJType: TcxComboBox;
    procedure Button1Click(Sender: TObject);
    procedure BegPortPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure FormShow(Sender: TObject);
@ -77,6 +80,8 @@ begin
      Sql.Add('update BS_Yarn_IO set CJDate=''' + Trim(FormatDateTime('yyyy-MM-dd', CJDate.Date)) + '''');
      Sql.Add(',CJNote=''' + Trim(CJNote.text) + '''');
      Sql.Add(',CJer=''' + Trim(CJer.text) + '''');
      Sql.Add(',CJQuantitly=''' + Trim(CJQuantitly.text) + '''');
      Sql.Add(',CJType=''' + Trim(CJType.text) + '''');
      Sql.Add('where BYIOID=''' + Trim(FBYIOID) + '''');
      ExecSQL;
    end;
@ -113,6 +118,8 @@ begin
    CJDate.Date := ADOQueryCmd.fieldbyname('CJDate').asdatetime;
    CJNote.text := ADOQueryCmd.fieldbyname('CJNote').asstring;
    CJer.text := ADOQueryCmd.fieldbyname('CJer').asstring;
    CJQuantitly.text := ADOQueryCmd.fieldbyname('CJQuantitly').asstring;
    CJType.text := ADOQueryCmd.fieldbyname('CJType').asstring;
  end;
 end;
--- a/B02基础纱线仓库/U_YarnInEdit.dfm
+++ b/B02基础纱线仓库/U_YarnInEdit.dfm
@ -21,6 +21,8 @@ inherited frmYarnInEdit: TfrmYarnInEdit
    Height = 433
    Align = alClient
    TabOrder = 0
    ExplicitLeft = -1
    ExplicitTop = 31
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/B02基础纱线仓库/U_YarnInList.dfm
+++ b/B02基础纱线仓库/U_YarnInList.dfm
@ -158,7 +158,6 @@ inherited frmYarnInList: TfrmYarnInList
    Color = clWhite
    ParentBackground = False
    TabOrder = 4
    ExplicitTop = 24
    object Label3: TLabel
      Left = 248
      Top = 46
@ -281,8 +280,8 @@ inherited frmYarnInList: TfrmYarnInList
      ParentBackground = False
      ParentColor = False
      TabOrder = 6
-      ExplicitLeft = 4
+      ExplicitLeft = 2
-      ExplicitTop = 3
+      ExplicitTop = 2
      ExplicitWidth = 1536
      ExplicitHeight = 37
      inherited lbl2: TLabel
@ -328,7 +327,6 @@ inherited frmYarnInList: TfrmYarnInList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
    ExplicitTop = 143
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/B02基础纱线仓库/U_YarnInList.pas
+++ b/B02基础纱线仓库/U_YarnInList.pas
@ -369,11 +369,15 @@ begin
 end;
-procedure TfrmYarnInList.ToolButton7Click(Sender: TObject);
+procedure TfrmYarnInList.ToolButton7Click(Sender: TObject);   //choujian dengji
 var
  MBYIOIDs: string;
 begin
-
+  if CDS_Main.Locate('SSel', True, []) = False then
  begin
    Application.MessageBox('没有选择数据!', '提示', 0);
    Exit;
  end;
  try
    frmCJDJ := TfrmCJDJ.Create(Application);
    with frmCJDJ do
--- a/B02基础纱线仓库/U_YarnInfoList.dfm
+++ b/B02基础纱线仓库/U_YarnInfoList.dfm
@ -214,7 +214,7 @@ inherited frmYarnInfoList: TfrmYarnInfoList
    Height = 483
    Align = alClient
    TabOrder = 2
-    ExplicitLeft = 1
+    ExplicitTop = 72
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/B02基础纱线仓库/YarnStk.dproj.local
+++ b/B02基础纱线仓库/YarnStk.dproj.local
@ -2,96 +2,96 @@
 <BorlandProject>
 	<Transactions>
    <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.687,=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.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.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.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</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.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.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.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.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.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm</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.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.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.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.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.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.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.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</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.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.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.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=</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.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.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm</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.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas</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.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.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.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</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.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</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.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</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.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.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.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.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.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.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.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</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.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</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.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.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.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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.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.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.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.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.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.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm</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.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.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.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.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.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm</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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm</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.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.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.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.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.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.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.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm</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.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.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.425,=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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.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.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>2025-05-19 17:06:38.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm</Transaction>
    <Transaction>2025-05-19 17:06:38.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
    <Transaction>2025-05-19 17:08:19.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas</Transaction>
    <Transaction>2025-05-19 17:08:19.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm</Transaction>
    <Transaction>2025-05-19 17:08:44.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="android-support-v4.dex.jar"/>
@ -122,7 +122,7 @@
    <File Path="fmx.dex.jar"/>
    <File Path="google-play-billing.dex.jar"/>
    <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10szKaiXiYa"/>
+    <File Path="..\..\D10SZKaiXiYa"/>
    <File Path="..\A00通用窗体"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
--- a/B02基础纱线仓库/YarnStk.identcache
+++ b/B02基础纱线仓库/YarnStk.identcache
--- a/B04采购计划管理/PurchasePlan.identcache
+++ b/B04采购计划管理/PurchasePlan.identcache
--- a/B04采购计划管理/U_YarnPurchasePlanPut.dfm
+++ b/B04采购计划管理/U_YarnPurchasePlanPut.dfm
@ -10,6 +10,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
  OldCreateOrder = True
  Position = poScreenCenter
  WindowState = wsMaximized
  ExplicitTop = -89
  ExplicitWidth = 1540
  ExplicitHeight = 690
  PixelsPerInch = 96
@ -115,6 +116,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    Align = alClient
    BorderStyle = cxcbsNone
    TabOrder = 2
    ExplicitTop = 185
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -368,6 +370,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 3
    ExplicitLeft = 1
    object lbl5: TLabel
      Left = 32
      Top = 50
@ -434,6 +437,13 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
      Height = 21
      Caption = #31246'      '#29575#65306
    end
    object Label3: TLabel
      Left = 1223
      Top = 56
      Width = 64
      Height = 21
      Caption = #32433#32447#24211#23384
    end
    object PurNo: TcxTextEdit
      Tag = 2
      Left = 119
@ -668,14 +678,14 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    Connection = DataLink_PurchasePlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 792
+    Left = 765
-    Top = 293
+    Top = 284
  end
  object ADOCmd: TADOQuery
    Connection = DataLink_PurchasePlan.ADOLink
    Parameters = <>
-    Left = 912
+    Left = 890
-    Top = 286
+    Top = 278
  end
  object DS_1: TDataSource
    DataSet = Order_Sub
@ -730,4 +740,11 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
    Left = 576
    Top = 461
  end
  object ADOQuery1: TADOQuery
    Connection = DataLink_PurchasePlan.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 871
    Top = 317
  end
 end
--- a/B04采购计划管理/U_YarnPurchasePlanPut.pas
+++ b/B04采购计划管理/U_YarnPurchasePlanPut.pas
@ -89,6 +89,8 @@ type
    Tv1Column4: TcxGridDBColumn;
    ToolButton5: TToolButton;
    Tv1Column6: TcxGridDBColumn;
    Label3: TLabel;
    ADOQuery1: TADOQuery;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -788,7 +790,7 @@ begin
  tv1.Controller.EditingController.ShowEdit();
 end;
-procedure TfrmYarnPurchasePlanPut.ToolButton1Click(Sender: TObject);
+procedure TfrmYarnPurchasePlanPut.ToolButton1Click(Sender: TObject);  //<EFBFBD>窟도갭
 var
  i, SZ: Integer;
  maxno, MAX_BCPH, ZM: string;
@ -824,10 +826,10 @@ begin
                FieldByName('PurSId').Value := maxno + INTTOSTR(i);
                FieldByName('C_Degree').Value := 'É´Ïß';
-                FieldByName('Y_Code').Value := CDS_1.fieldbyname('C_Code').value;
+                FieldByName('Y_Code').Value := CDS_1.fieldbyname('Y_Code').value;
-                FieldByName('Y_Name').Value := CDS_1.fieldbyname('C_Name').value;
+                FieldByName('Y_Name').Value := CDS_1.fieldbyname('Y_Name').value;
-                FieldByName('Y_Spec').Value := CDS_1.fieldbyname('C_Spec').value;
+                FieldByName('Y_Spec').Value := CDS_1.fieldbyname('Y_Spec').value;
-                FieldByName('Y_Composition').Value := CDS_1.fieldbyname('C_Composition').value;
+                FieldByName('Y_Composition').Value := CDS_1.fieldbyname('Y_Composition').value;
                FieldByName('Denier').Value := CDS_1.fieldbyname('Denier').value;
                FieldByName('ZS').Value := CDS_1.fieldbyname('ZS').value;
@ -835,7 +837,7 @@ begin
                FieldByName('FF').Value := CDS_1.fieldbyname('FF').value;
                FieldByName('ND').Value := Cds_1.FieldByName('ND').Value;
-                FieldByName('Y_Color').Value := Cds_1.FieldByName('C_Color').Value;
+                FieldByName('Y_Color').Value := Cds_1.FieldByName('Y_Color').Value;
                FieldByName('Qty').Value := 0;
                FieldByName('Price').Value := 0;
@ -1068,18 +1070,32 @@ end;
 procedure TfrmYarnPurchasePlanPut.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
-  with ADO_2 do
+//  with ADO_2 do
 //  begin
 //    Close;
 //    sql.Clear;
 //    sql.Add(' select top 20 A.Sellname,A.PurDate,B.Y_Name,B.Price');
 //    sql.Add(' from Pur_YarnPlan_Main A inner join Pur_YarnPlan_Sub B on A.PurMId=B.PurMId  ');
 //    sql.Add('where Y_Name=' + quotedstr(Trim(Order_Sub.fieldbyname('Y_Name').AsString)));
 //    sql.Add(' order by A.PurDate desc');
 //    Open;
 //  end;
 //  SCreateCDS(ADO_2, CDS_2);
 //  SInitCDSData(ADO_2, CDS_2);
  with ADOQuery1 do
  begin
    Close;
    sql.Clear;
-    sql.Add(' select top 20 A.Sellname,A.PurDate,B.Y_Name,B.Price');
+    sql.Add(' select Sum(stkqty) AS stkqty ');
-    sql.Add(' from Pur_YarnPlan_Main A inner join Pur_YarnPlan_Sub B on A.PurMId=B.PurMId  ');
+    sql.Add(' from BS_Yarn_IO A    ');
-    sql.Add('where Y_Name=' + quotedstr(Trim(Order_Sub.fieldbyname('Y_Name').AsString)));
+    SQL.Add(' where A.IOFlag=''흙욋'' and  isnull(StkQty,0)>0   ');
-    sql.Add(' order by A.PurDate desc');
+    sql.Add(' and isnull(stkName,'''')=''' + Trim('<27>窟') + '''');
    sql.Add(' and Y_Code=' + quotedstr(Trim(Order_Sub.fieldbyname('Y_Code').AsString)));
    Open;
  end;
-  SCreateCDS(ADO_2, CDS_2);
+  Label3.Caption := '<27>窟욋닸:' + Trim(ADOQuery1.fieldbyname('stkqty').AsString);
-  SInitCDSData(ADO_2, CDS_2);
+
 end;
 procedure TfrmYarnPurchasePlanPut.v1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
--- a/E01梭织生产计划/TatPlan.dproj.local
+++ b/E01梭织生产计划/TatPlan.dproj.local
@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.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.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.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.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm</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.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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.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.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.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.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.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.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.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.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.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.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.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.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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.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.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.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.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.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.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=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.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.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.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.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.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.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.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.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>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="android-support-v4.dex.jar"/>
--- a/E01梭织生产计划/TatPlan.identcache
+++ b/E01梭织生产计划/TatPlan.identcache
--- a/E01梭织生产计划/U_GetDllForm.pas
+++ b/E01梭织生产计划/U_GetDllForm.pas
@ -72,10 +72,10 @@ begin
  if trim(DataBaseStr) = '' then
  begin
-    server := '101.132.143.144,7781';
+    server := '150.109.121.232,7781';
    dtbase := 'KaiXiYadata';
-    user := 'rtsa';
+    user := 'kaixiyasa';
-    pswd := 'rightsoft@5740';
+    pswd := 'rightsoft,.KXY@YN';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
    DParameters1 := '管理';
 //    DName:='张燕'
--- a/E01梭织生产计划/U_TatGYInPut.dfm
+++ b/E01梭织生产计划/U_TatGYInPut.dfm
@ -3,21 +3,21 @@ inherited frmTatGYInPut: TfrmTatGYInPut
  Top = 14
  Caption = #24037#33402#21333#24405#20837
  ClientHeight = 766
-  ClientWidth = 1595
+  ClientWidth = 1540
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Height = -16
  Position = poScreenCenter
  WindowState = wsMaximized
-  ExplicitWidth = 1611
+  ExplicitWidth = 1556
  ExplicitHeight = 805
  PixelsPerInch = 96
  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
-    Top = 0
+    Top = 314
-    Width = 1595
+    Width = 1540
    Height = 30
    AutoSize = True
    ButtonHeight = 30
@ -63,9 +63,9 @@ inherited frmTatGYInPut: TfrmTatGYInPut
  end
  object ScrollBox1: TScrollBox [1]
    Left = 0
-    Top = 30
+    Top = 0
-    Width = 1595
+    Width = 1540
-    Height = 263
+    Height = 314
    Align = alTop
    BevelInner = bvNone
    BevelOuter = bvNone
@ -301,6 +301,32 @@ inherited frmTatGYInPut: TfrmTatGYInPut
      Height = 21
      Caption = #25972#32463#24037#33402#32534#21495#65306
    end
    object Label27: TLabel
      Left = 14
      Top = 255
      Width = 431
      Height = 63
      Caption = #32463#32433#31859#24212#29992#37327'='#26681#25968'/'#24635#26681#25968'*'#22836#32441'*'#20998#29305'(Dtex)*(1+'#25439#32791')/9000'#10#13#10
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
      Font.Height = -16
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
    end
    object Label28: TLabel
      Left = 14
      Top = 279
      Width = 454
      Height = 21
      Caption = #32428#32433#31859#24212#29992#37327'='#26681#25968'/'#24635#26681#25968'*('#38376#24133'+'#25439#32791')*'#20998#29305'(Dtex)*'#32428#23494'/9000'
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
      Font.Height = -16
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
    end
    object OrdPieceLen: TcxTextEdit
      Tag = 2
      Left = 952
@ -427,7 +453,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
    end
    object C_YarnQty: TcxTextEdit
      Tag = 2
-      Left = 679
+      Left = 680
      Top = 148
      ParentColor = True
      Properties.OnEditValueChanged = C_YarnQtyPropertiesEditValueChanged
@ -637,16 +663,16 @@ inherited frmTatGYInPut: TfrmTatGYInPut
  end
  object cxPageControl3: TcxPageControl [2]
    Left = 0
-    Top = 293
+    Top = 344
-    Width = 1595
+    Width = 1540
-    Height = 473
+    Height = 422
    Align = alClient
    TabOrder = 2
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    ClientRectBottom = 473
+    ClientRectBottom = 422
-    ClientRectRight = 1595
+    ClientRectRight = 1540
    ClientRectTop = 28
    object cxTabSheet1: TcxTabSheet
      Caption = #32463#19997#32452#21512
@ -654,8 +680,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
      object GroupBox1: TGroupBox
        Left = 931
        Top = 0
-        Width = 664
+        Width = 609
-        Height = 445
+        Height = 394
        Align = alClient
        Caption = #32463#25490#21015
        Font.Charset = GB2312_CHARSET
@ -669,8 +695,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Tag = 2
          Left = 2
          Top = 31
-          Width = 660
+          Width = 605
-          Height = 412
+          Height = 361
          Align = alClient
          Font.Charset = GB2312_CHARSET
          Font.Color = clWindowText
@ -685,14 +711,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        Left = 0
        Top = 0
        Width = 931
-        Height = 445
+        Height = 394
        Align = alLeft
        TabOrder = 1
        object cxPageControl2: TcxPageControl
          Left = 1
          Top = 1
          Width = 929
-          Height = 443
+          Height = 392
          Align = alClient
          Color = clWhite
          Font.Charset = GB2312_CHARSET
@ -707,7 +733,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Visible = False
          Properties.CustomButtons.Buttons = <>
          Properties.Style = 6
-          ClientRectBottom = 443
+          ClientRectBottom = 392
          ClientRectRight = 929
          ClientRectTop = 0
        end
@ -715,12 +741,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Left = 1
          Top = 1
          Width = 929
-          Height = 443
+          Height = 392
          Align = alClient
          TabOrder = 1
          ExplicitLeft = 0
          object TV1: TcxGridDBTableView
            Navigator.Buttons.CustomButtons = <>
            ScrollbarAnnotations.CustomAnnotations = <>
            OnCellClick = TV1CellClick
            DataController.DataSource = DS_1
            DataController.Filter.AutoDataSetFilter = True
            DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -796,6 +824,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              PropertiesClassName = 'TcxTextEditProperties'
              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Styles.Header = DataLink_TatPlan.grid_head_black
              Width = 60
            end
            object TV1Column2: TcxGridDBColumn
@ -812,6 +841,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              DataBinding.FieldName = 'MeterQty'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
              Options.Editing = False
              Width = 114
            end
            object TV1Column10: TcxGridDBColumn
@ -828,6 +858,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              HeaderAlignmentHorz = taCenter
              Width = 80
            end
            object TV1Column14: TcxGridDBColumn
              Caption = #25439#32791'%'
              DataBinding.FieldName = 'SH'
              DataBinding.IsNullValueType = True
              GroupSummaryAlignment = taCenter
              HeaderAlignmentHorz = taCenter
              Width = 77
            end
            object TV1Column13: TcxGridDBColumn
              Caption = #30424#22836#21495
              DataBinding.FieldName = 'PTNo'
@ -877,14 +915,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              DataBinding.FieldName = 'Cotton'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
-              Width = 80
+              Width = 67
            end
            object TV1Column5: TcxGridDBColumn
              Caption = #40635
              DataBinding.FieldName = 'Linen'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
-              Width = 80
+              Width = 48
            end
          end
          object cxGridLevel2: TcxGridLevel
@ -899,8 +937,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
      object GroupBox2: TGroupBox
        Left = 863
        Top = 0
-        Width = 732
+        Width = 677
-        Height = 445
+        Height = 394
        Align = alClient
        Caption = #32428#25490#21015
        Font.Charset = GB2312_CHARSET
@ -914,8 +952,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Tag = 2
          Left = 2
          Top = 31
-          Width = 728
+          Width = 673
-          Height = 412
+          Height = 361
          Align = alClient
          Font.Charset = GB2312_CHARSET
          Font.Color = clWindowText
@ -930,14 +968,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        Left = 0
        Top = 0
        Width = 863
-        Height = 445
+        Height = 394
        Align = alLeft
        TabOrder = 1
        object cxPageControl1: TcxPageControl
          Left = 1
          Top = 1
          Width = 861
-          Height = 443
+          Height = 392
          Align = alClient
          Color = clWhite
          Font.Charset = GB2312_CHARSET
@ -952,7 +990,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Visible = False
          Properties.CustomButtons.Buttons = <>
          Properties.Style = 6
-          ClientRectBottom = 443
+          ClientRectBottom = 392
          ClientRectRight = 861
          ClientRectTop = 0
        end
@ -960,12 +998,13 @@ inherited frmTatGYInPut: TfrmTatGYInPut
          Left = 1
          Top = 1
          Width = 861
-          Height = 443
+          Height = 392
          Align = alClient
          TabOrder = 1
          object Tv2: TcxGridDBTableView
            Navigator.Buttons.CustomButtons = <>
            ScrollbarAnnotations.CustomAnnotations = <>
            OnCellClick = Tv2CellClick
            DataController.DataSource = DS_2
            DataController.Filter.AutoDataSetFilter = True
            DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -1030,8 +1069,9 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              DataBinding.FieldName = 'TestDenier'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Styles.Header = DataLink_TatPlan.grid_head_black
              Width = 80
            end
            object Tv2Column1: TcxGridDBColumn
@ -1039,8 +1079,9 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              DataBinding.FieldName = 'YarnQty'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Styles.Header = DataLink_TatPlan.grid_head_black
              Width = 80
            end
            object Tv2Column2: TcxGridDBColumn
@ -1048,8 +1089,9 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              DataBinding.FieldName = 'CycleYarnQty'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Styles.Header = DataLink_TatPlan.grid_head_black
              Width = 80
            end
            object Tv2Column8: TcxGridDBColumn
@ -1073,6 +1115,14 @@ inherited frmTatGYInPut: TfrmTatGYInPut
              HeaderAlignmentHorz = taCenter
              Width = 100
            end
            object Tv2Column14: TcxGridDBColumn
              Caption = #25439#32791'CM'
              DataBinding.FieldName = 'SH'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
              Styles.Header = DataLink_TatPlan.grid_head_black
              Width = 83
            end
            object Tv2Column13: TcxGridDBColumn
              Caption = #28504#36890#21495
              DataBinding.FieldName = 'PTNo'
@ -1141,14 +1191,18 @@ inherited frmTatGYInPut: TfrmTatGYInPut
    object cxTabSheet3: TcxTabSheet
      Caption = #36215#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 445
      object cxGrid4: TcxGrid
        Left = 0
-        Top = 403
+        Top = 352
-        Width = 1595
+        Width = 1540
        Height = 42
        Align = alBottom
        TabOrder = 0
        Visible = False
        ExplicitTop = 403
        object TV4: TcxGridDBTableView
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
@ -1231,8 +1285,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        Tag = 2
        Left = 0
        Top = 0
-        Width = 1595
+        Width = 1540
-        Height = 403
+        Height = 352
        Align = alClient
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -1242,17 +1296,21 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
        ParentFont = False
        TabOrder = 1
        ExplicitHeight = 403
      end
    end
    object cxTabSheet4: TcxTabSheet
      Caption = #31359#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 445
      object CZF: TMemo
        Tag = 2
        Left = 0
        Top = 0
-        Width = 1595
+        Width = 1540
-        Height = 445
+        Height = 394
        Align = alClient
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -1262,17 +1320,21 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
        ParentFont = False
        TabOrder = 0
        ExplicitHeight = 445
      end
    end
    object cxTabSheet5: TcxTabSheet
      Caption = #31359#31576#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 445
      object CKF: TMemo
        Tag = 2
        Left = 0
        Top = 0
-        Width = 1595
+        Width = 1540
-        Height = 445
+        Height = 394
        Align = alClient
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
@ -1282,6 +1344,7 @@ inherited frmTatGYInPut: TfrmTatGYInPut
        ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
        ParentFont = False
        TabOrder = 0
        ExplicitHeight = 445
      end
    end
  end
--- a/E01梭织生产计划/U_TatGYInPut.pas
+++ b/E01梭织生产计划/U_TatGYInPut.pas
@ -185,6 +185,10 @@ type
    WB_Code: TcxButtonEdit;
    ADOQueryCmd: TADOQuery;
    ADOQuery1: TADOQuery;
    TV1Column14: TcxGridDBColumn;
    Tv2Column14: TcxGridDBColumn;
    Label27: TLabel;
    Label28: TLabel;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -214,6 +218,12 @@ type
    procedure Tv2Column1PropertiesEditValueChanged(Sender: TObject);
    procedure C_YarnQtyPropertiesEditValueChanged(Sender: TObject);
    procedure WB_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure TV1CellClick(Sender: TcxCustomGridTableView;
      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
      AShift: TShiftState; var AHandled: Boolean);
    procedure Tv2CellClick(Sender: TcxCustomGridTableView;
      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
      AShift: TShiftState; var AHandled: Boolean);
  private
    FXS, FGridFlag: Integer;
    procedure InitData();
@ -972,6 +982,35 @@ begin
  CDS_QZ.EnableControls;
 end;
 procedure TfrmTatGYInPut.TV1CellClick(Sender: TcxCustomGridTableView;
  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
  AShift: TShiftState; var AHandled: Boolean);
 var
  AColumn: TcxGridColumn;
  AFieldName: string;
 begin
  if Assigned(ACellViewInfo) then
  begin
    AColumn := ACellViewInfo.Item as TcxGridColumn;
    AFieldName := AColumn.DataBinding.FilterFieldName;
    if AFieldName = 'MeterQty' then
    begin
      TV1Column1.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column2.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column6.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column14.Styles.Header := DataLink_TatPlan.grid_head_blue;
      C_YarnQty.Style.Color := clMoneyGreen;
    end
    else
    begin
      TV1Column1.Styles.Header := nil;
      TV1Column2.Styles.Header := nil;
      TV1Column6.Styles.Header := nil;
      TV1Column14.Styles.Header := nil;
      C_YarnQty.Style.Color := clWhite;
    end;
  end;
 end;
 procedure TfrmTatGYInPut.TV1Column1PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -1032,6 +1071,38 @@ begin
  JSKZ();
 end;
 procedure TfrmTatGYInPut.Tv2CellClick(Sender: TcxCustomGridTableView;
  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
  AShift: TShiftState; var AHandled: Boolean);
 var
  AColumn: TcxGridColumn;
  AFieldName: string;
 begin
  if Assigned(ACellViewInfo) then
  begin
    AColumn := ACellViewInfo.Item as TcxGridColumn;
    AFieldName := AColumn.DataBinding.FilterFieldName;
    if AFieldName = 'MeterQty' then
    begin
      TV2Column1.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column2.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column6.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column14.Styles.Header := DataLink_TatPlan.grid_head_blue;
      C_ReedWidth.Style.Color := clMoneyGreen;
      C_FinishLatitudeDensity.Style.Color := clMoneyGreen;
    end
    else
    begin
      TV2Column1.Styles.Header := nil;
      TV2Column2.Styles.Header := nil;
      TV2Column6.Styles.Header := nil;
      TV2Column14.Styles.Header := nil;
      C_ReedWidth.Style.Color := clWhite;
      C_FinishLatitudeDensity.Style.Color := clWhite;
    end;
  end;
 end;
 procedure TfrmTatGYInPut.Tv2Column1PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -1253,7 +1324,7 @@ begin
          ZGS := FieldByName('CycleYarnQty').Value; //Ñ»·¸ùÊý
        end;
-        MF := strtofloatdef(C_ReedWidth.text, 0) + 15;    //óØ·ù
+        MF := strtofloatdef(C_ReedWidth.text, 0);    //óØ·ù
        if FieldByName('TestDenier').Value = null then
        begin
--- a/E01梭织生产计划/U_TatGYList.dfm
+++ b/E01梭织生产计划/U_TatGYList.dfm
@ -300,8 +300,6 @@ inherited frmTatGYList: TfrmTatGYList
    Height = 439
    Align = alClient
    TabOrder = 2
    ExplicitLeft = -6
    ExplicitTop = 146
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/E01梭织生产计划/U_TatPlanInPut.dfm
+++ b/E01梭织生产计划/U_TatPlanInPut.dfm
@ -3,13 +3,13 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
  Top = 14
  Caption = #36710#38388#29983#20135#35745#21010#21333#24405#20837
  ClientHeight = 766
-  ClientWidth = 1595
+  ClientWidth = 1540
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Height = -16
  Position = poScreenCenter
  WindowState = wsMaximized
-  ExplicitWidth = 1611
+  ExplicitWidth = 1556
  ExplicitHeight = 805
  PixelsPerInch = 96
  TextHeight = 21
@ -17,7 +17,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
    Tag = 1
    Left = 0
    Top = 0
-    Width = 1595
+    Width = 1540
    Height = 30
    AutoSize = True
    ButtonHeight = 30
@ -64,8 +64,8 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
  object ScrollBox1: TScrollBox [1]
    Left = 0
    Top = 30
-    Width = 1595
+    Width = 1540
-    Height = 305
+    Height = 363
    Align = alTop
    BevelInner = bvNone
    BevelOuter = bvNone
@ -306,6 +306,32 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
      Height = 21
      Caption = #32455#36896#24037#33402#21333#21495#65306
    end
    object Label28: TLabel
      Left = 8
      Top = 291
      Width = 431
      Height = 63
      Caption = #32463#32433#31859#24212#29992#37327'='#26681#25968'/'#24635#26681#25968'*'#22836#32441'*'#20998#29305'(Dtex)*(1+'#25439#32791')/9000'#10#13#10
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
      Font.Height = -16
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
    end
    object Label29: TLabel
      Left = 7
      Top = 317
      Width = 454
      Height = 21
      Caption = #32428#32433#31859#24212#29992#37327'='#26681#25968'/'#24635#26681#25968'*('#38376#24133'+'#25439#32791')*'#20998#29305'(Dtex)*'#32428#23494'/9000'
      Font.Charset = GB2312_CHARSET
      Font.Color = clRed
      Font.Height = -16
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentFont = False
    end
    object OrdPieceLen: TcxTextEdit
      Tag = 2
      Left = 963
@ -656,16 +682,16 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
  end
  object cxPageControl3: TcxPageControl [2]
    Left = 0
-    Top = 335
+    Top = 393
-    Width = 1595
+    Width = 1540
-    Height = 431
+    Height = 373
    Align = alClient
    TabOrder = 2
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    ClientRectBottom = 431
+    ClientRectBottom = 373
-    ClientRectRight = 1595
+    ClientRectRight = 1540
    ClientRectTop = 28
    object cxTabSheet1: TcxTabSheet
      Caption = #32463#19997#32452#21512
@ -673,8 +699,8 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
      object GroupBox1: TGroupBox
        Left = 931
        Top = 0
-        Width = 664
+        Width = 609
-        Height = 403
+        Height = 345
        Align = alClient
        Caption = #32463#25490#21015
        Font.Charset = GB2312_CHARSET
@ -688,8 +714,8 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Tag = 2
          Left = 2
          Top = 31
-          Width = 660
+          Width = 605
-          Height = 370
+          Height = 312
          Align = alClient
          Font.Charset = GB2312_CHARSET
          Font.Color = clWindowText
@ -704,14 +730,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
        Left = 0
        Top = 0
        Width = 931
-        Height = 403
+        Height = 345
        Align = alLeft
        TabOrder = 1
        object cxPageControl2: TcxPageControl
          Left = 1
          Top = 1
          Width = 929
-          Height = 401
+          Height = 343
          Align = alClient
          Color = clWhite
          Font.Charset = GB2312_CHARSET
@ -726,7 +752,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Visible = False
          Properties.CustomButtons.Buttons = <>
          Properties.Style = 6
-          ClientRectBottom = 401
+          ClientRectBottom = 343
          ClientRectRight = 929
          ClientRectTop = 0
        end
@ -734,12 +760,13 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Left = 1
          Top = 1
          Width = 929
-          Height = 401
+          Height = 343
          Align = alClient
          TabOrder = 1
          object TV1: TcxGridDBTableView
            Navigator.Buttons.CustomButtons = <>
            ScrollbarAnnotations.CustomAnnotations = <>
            OnCellClick = TV1CellClick
            DataController.DataSource = DS_1
            DataController.Filter.AutoDataSetFilter = True
            DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -830,6 +857,12 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              Caption = #31859'/'#24212#29992#37327
              DataBinding.FieldName = 'MeterQty'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxButtonEditProperties'
              Properties.Buttons = <
                item
                  Default = True
                  Kind = bkEllipsis
                end>
              HeaderAlignmentHorz = taCenter
              Width = 114
            end
@ -847,6 +880,12 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              HeaderAlignmentHorz = taCenter
              Width = 80
            end
            object TV1Column14: TcxGridDBColumn
              Caption = #25439#32791'%'
              DataBinding.FieldName = 'SH'
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
            end
            object TV1Column13: TcxGridDBColumn
              Caption = #30424#22836#21495
              DataBinding.FieldName = 'PTNo'
@ -918,8 +957,8 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
      object GroupBox2: TGroupBox
        Left = 863
        Top = 0
-        Width = 732
+        Width = 677
-        Height = 403
+        Height = 345
        Align = alClient
        Caption = #32428#25490#21015
        Font.Charset = GB2312_CHARSET
@ -933,8 +972,8 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Tag = 2
          Left = 2
          Top = 31
-          Width = 728
+          Width = 673
-          Height = 370
+          Height = 312
          Align = alClient
          Font.Charset = GB2312_CHARSET
          Font.Color = clWindowText
@ -949,14 +988,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
        Left = 0
        Top = 0
        Width = 863
-        Height = 403
+        Height = 345
        Align = alLeft
        TabOrder = 1
        object cxPageControl1: TcxPageControl
          Left = 1
          Top = 1
          Width = 861
-          Height = 401
+          Height = 343
          Align = alClient
          Color = clWhite
          Font.Charset = GB2312_CHARSET
@ -971,7 +1010,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Visible = False
          Properties.CustomButtons.Buttons = <>
          Properties.Style = 6
-          ClientRectBottom = 401
+          ClientRectBottom = 343
          ClientRectRight = 861
          ClientRectTop = 0
        end
@ -979,12 +1018,13 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
          Left = 1
          Top = 1
          Width = 861
-          Height = 401
+          Height = 343
          Align = alClient
          TabOrder = 1
          object Tv2: TcxGridDBTableView
            Navigator.Buttons.CustomButtons = <>
            ScrollbarAnnotations.CustomAnnotations = <>
            OnCellClick = Tv2CellClick
            DataController.DataSource = DS_2
            DataController.Filter.AutoDataSetFilter = True
            DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -1049,7 +1089,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              DataBinding.FieldName = 'TestDenier'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Width = 80
            end
@ -1058,7 +1098,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              DataBinding.FieldName = 'YarnQty'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Width = 80
            end
@ -1067,7 +1107,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              DataBinding.FieldName = 'CycleYarnQty'
              DataBinding.IsNullValueType = True
              PropertiesClassName = 'TcxTextEditProperties'
-              Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
+              Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged
              HeaderAlignmentHorz = taCenter
              Width = 80
            end
@ -1092,6 +1132,15 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
              HeaderAlignmentHorz = taCenter
              Width = 100
            end
            object Tv2Column14: TcxGridDBColumn
              Caption = #25439#32791'CM'
              DataBinding.FieldName = 'SH'
              DataBinding.IsNullValueType = True
              FooterAlignmentHorz = taCenter
              GroupSummaryAlignment = taCenter
              HeaderAlignmentHorz = taCenter
              Width = 94
            end
            object Tv2Column13: TcxGridDBColumn
              Caption = #28504#36890#21495
              DataBinding.FieldName = 'PTNo'
@ -1160,6 +1209,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
    object cxTabSheet3: TcxTabSheet
      Caption = #36215#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 0
      object cxGrid4: TcxGrid
        Left = 0
        Top = 361
@ -1266,6 +1318,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
    object cxTabSheet4: TcxTabSheet
      Caption = #31359#32508#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 0
      object CZF: TMemo
        Tag = 2
        Left = 0
@ -1286,6 +1341,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
    object cxTabSheet5: TcxTabSheet
      Caption = #31359#31576#27861
      ImageIndex = 3
      ExplicitTop = 0
      ExplicitWidth = 0
      ExplicitHeight = 0
      object CKF: TMemo
        Tag = 2
        Left = 0
--- a/E01梭织生产计划/U_TatPlanInPut.pas
+++ b/E01梭织生产计划/U_TatPlanInPut.pas
@ -188,6 +188,10 @@ type
    Label27: TLabel;
    GYNo: TcxButtonEdit;
    ADOQueryMain: TADOQuery;
    TV1Column14: TcxGridDBColumn;
    Tv2Column14: TcxGridDBColumn;
    Label28: TLabel;
    Label29: TLabel;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -218,6 +222,12 @@ type
    procedure C_YarnQtyPropertiesEditValueChanged(Sender: TObject);
    procedure WB_CodePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure cxButtonEdit1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure TV1CellClick(Sender: TcxCustomGridTableView;
      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
      AShift: TShiftState; var AHandled: Boolean);
    procedure Tv2CellClick(Sender: TcxCustomGridTableView;
      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
      AShift: TShiftState; var AHandled: Boolean);
  private
    FXS, FGridFlag: Integer;
    procedure InitData();
@ -508,7 +518,7 @@ begin
  if PState = 1 then
  begin
    ConNo.enabled := false;
-    ScrollBox1.Enabled := False;
+//    ScrollBox1.Enabled := False;
  end;
 end;
@ -976,10 +986,39 @@ begin
  CDS_QZ.EnableControls;
 end;
 procedure TfrmTatPlanInPut.TV1CellClick(Sender: TcxCustomGridTableView;
  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
  AShift: TShiftState; var AHandled: Boolean);
 var
  AColumn: TcxGridColumn;
  AFieldName: string;
 begin
  if Assigned(ACellViewInfo) then
  begin
    AColumn := ACellViewInfo.Item as TcxGridColumn;
    AFieldName := AColumn.DataBinding.FilterFieldName;
    if AFieldName = 'MeterQty' then
    begin
      TV1Column1.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column2.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column6.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV1Column14.Styles.Header := DataLink_TatPlan.grid_head_blue;
      C_YarnQty.Style.Color := clMoneyGreen;
    end
    else
    begin
      TV1Column1.Styles.Header := nil;
      TV1Column2.Styles.Header := nil;
      TV1Column6.Styles.Header := nil;
      TV1Column14.Styles.Header := nil;
      C_YarnQty.Style.Color := clWhite;
    end;
  end;
 end;
 procedure TfrmTatPlanInPut.TV1Column1PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
-  GS, ZGS, MF, DS, WM, TW: double;
+  GS, ZGS, MF, DS, WM, TW, SH: double;
 begin
  mvalue := TcxTextEdit(Sender).EditingText;
@ -1023,6 +1062,8 @@ begin
    WM := strtofloatdef(C_FinishLatitudeDensity.text, 0); //Î³ÃÜ
    TW := strtofloatdef(C_YarnQty.text, 0); //Í·ÎÆ
  end;
  if ZGS <> 0 then
  begin
@ -1036,6 +1077,38 @@ begin
  JSKZ();
 end;
 procedure TfrmTatPlanInPut.Tv2CellClick(Sender: TcxCustomGridTableView;
  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
  AShift: TShiftState; var AHandled: Boolean);
 var
  AColumn: TcxGridColumn;
  AFieldName: string;
 begin
  if Assigned(ACellViewInfo) then
  begin
    AColumn := ACellViewInfo.Item as TcxGridColumn;
    AFieldName := AColumn.DataBinding.FilterFieldName;
    if AFieldName = 'MeterQty' then
    begin
      TV2Column1.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column2.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column6.Styles.Header := DataLink_TatPlan.grid_head_blue;
      TV2Column14.Styles.Header := DataLink_TatPlan.grid_head_blue;
      C_ReedWidth.Style.Color := clMoneyGreen;
      C_FinishLatitudeDensity.Style.Color := clMoneyGreen;
    end
    else
    begin
      TV2Column1.Styles.Header := nil;
      TV2Column2.Styles.Header := nil;
      TV2Column6.Styles.Header := nil;
      TV2Column14.Styles.Header := nil;
      C_ReedWidth.Style.Color := clWhite;
      C_FinishLatitudeDensity.Style.Color := clWhite;
    end;
  end;
 end;
 procedure TfrmTatPlanInPut.Tv2Column1PropertiesEditValueChanged(Sender: TObject);
 var
  mvalue, FFieldName: string;
@ -1365,7 +1438,7 @@ begin
          ZGS := FieldByName('CycleYarnQty').Value; //Ñ»·¸ùÊý
        end;
-        MF := strtofloatdef(C_ReedWidth.text, 0) + 15;    //óØ·ù
+        MF := strtofloatdef(C_ReedWidth.text, 0);    //óØ·ù
        if FieldByName('TestDenier').Value = null then
        begin
--- a/E01梭织生产计划/U_TatPlanList.dfm
+++ b/E01梭织生产计划/U_TatPlanList.dfm
@ -314,7 +314,6 @@ inherited frmTatPlanList: TfrmTatPlanList
    Height = 444
    Align = alClient
    TabOrder = 2
    ExplicitLeft = -6
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>