diff --git a/A01基础公司管理/Company.dproj.local b/A01基础公司管理/Company.dproj.local
index b65395c..a78ca77 100644
--- a/A01基础公司管理/Company.dproj.local
+++ b/A01基础公司管理/Company.dproj.local
@@ -1,46 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.175,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.069,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.175,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.069,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
+    <File Path="android-support-v4.dex.jar"/>
+    <File Path="cloud-messaging.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
+    <File Path="fmx.dex.jar"/>
+    <File Path="google-play-billing.dex.jar"/>
+    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache
index ea1f82e..38254fb 100644
Binary files a/A01基础公司管理/Company.identcache and b/A01基础公司管理/Company.identcache differ
diff --git a/A01基础公司管理/Company.res b/A01基础公司管理/Company.res
index 543f942..b3d7ee7 100644
Binary files a/A01基础公司管理/Company.res and b/A01基础公司管理/Company.res differ
diff --git a/A01基础公司管理/U_EmployeeInPut.dfm b/A01基础公司管理/U_EmployeeInPut.dfm
index 3e78bcb..307cfa0 100644
--- a/A01基础公司管理/U_EmployeeInPut.dfm
+++ b/A01基础公司管理/U_EmployeeInPut.dfm
@@ -86,7 +86,7 @@ object frmYGInPut: TfrmYGInPut
     Height = 502
     Align = alClient
     TabOrder = 1
-    ExplicitWidth = 1429
+    ExplicitTop = 36
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -125,6 +125,10 @@ object frmYGInPut: TfrmYGInPut
         Caption = #26159#21542#31995#32479#36134#21495
         DataBinding.FieldName = 'SFXTZH'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.Items.Strings = (
+          #26159
+          #21542)
         HeaderAlignmentHorz = taCenter
         Width = 115
       end
diff --git a/A01基础公司管理/U_EmployeeInPut.pas b/A01基础公司管理/U_EmployeeInPut.pas
index 48bf606..514e8b1 100644
--- a/A01基础公司管理/U_EmployeeInPut.pas
+++ b/A01基础公司管理/U_EmployeeInPut.pas
@@ -117,8 +117,7 @@ type
     procedure v1SYRNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure btn1Click(Sender: TObject);
-    procedure v1GangWeiPropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
+    procedure v1GangWeiPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
     TPInt: Integer;
     procedure InitData();
@@ -244,20 +243,33 @@ begin
           Edit;
           FieldByName('EEID').Value := Trim(maxno);
         end;
+        if Order_Sub.FieldByName('SFXTZH').AsString = '��' then
+        begin
+          with ADOTemp do
+          begin
+            Close;
+            SQL.Clear;
+            sql.Add('select * from SY_user e where USERID=''' + Trim(Order_Sub.fieldbyname('EECode').AsString) + '''');
+            Open;
+          end;
+          if ADOTemp.IsEmpty then
+          begin
+            with ADOCmd do
+            begin
+              Close;
+              SQL.Clear;
+              sql.Add('exec P_EE_in_Account @DataID=''' + Trim(maxno) + '''');
+              Open;
+            end;
+            if ADOCmd.FieldByName('intReturn').AsInteger = -1 then
+            begin
+              ADOCmd.Connection.RollbackTrans;
+              Application.MessageBox(PChar(ADOCmd.fieldbyname('ShowMsg').AsString), '��ʾ', 0);
+              exit;
+            end;
+          end;
 
-//        with ADOCmd do
-//        begin
-//          Close;
-//          SQL.Clear;
-//          sql.Add('exec P_EE_in_Account @DataID=''' + Trim(maxno) + '''');
-//          Open;
-//        end;
-//        if ADOCmd.FieldByName('intReturn').AsInteger = -1 then
-//        begin
-//          ADOCmd.Connection.RollbackTrans;
-//          Application.MessageBox(PChar(ADOCmd.fieldbyname('ShowMsg').AsString), '��ʾ', 0);
-//          exit;
-//        end;
+        end;
 
         next;
       end;
@@ -388,8 +400,7 @@ begin
   end;
 end;
 
-procedure TfrmYGInPut.v1GangWeiPropertiesButtonClick(Sender: TObject;
-  AButtonIndex: Integer);
+procedure TfrmYGInPut.v1GangWeiPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
diff --git a/A01基础公司管理/testDll.res b/A01基础公司管理/testDll.res
index e116c48..2465ca0 100644
Binary files a/A01基础公司管理/testDll.res and b/A01基础公司管理/testDll.res differ
diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local
index 5d825a3..47efa15 100644
--- a/A02基础产品管理/ClothInfo.dproj.local
+++ b/A02基础产品管理/ClothInfo.dproj.local
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.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.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.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.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.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.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.346,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.441,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.337,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.980,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uFomat_JSON.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.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj</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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm</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.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.743,=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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.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.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.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.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.472,=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.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.346,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.337,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.980,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uFomat_JSON.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.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.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.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>
diff --git a/A02基础产品管理/U_TatClothInfo.dfm b/A02基础产品管理/U_TatClothInfo.dfm
index ea008cf..35a14ab 100644
--- a/A02基础产品管理/U_TatClothInfo.dfm
+++ b/A02基础产品管理/U_TatClothInfo.dfm
@@ -8,6 +8,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -327
   ExplicitWidth = 1507
   ExplicitHeight = 787
   PixelsPerInch = 96
@@ -366,6 +367,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
         Navigator.Buttons.Delete.Visible = False
         ScrollbarAnnotations.CustomAnnotations = <>
         OnCellClick = Tv1CellClick
+        OnCustomDrawCell = Tv1CustomDrawCell
         OnFocusedRecordChanged = Tv1FocusedRecordChanged
         DataController.DataSource = DS_1
         DataController.Filter.AutoDataSetFilter = True
@@ -579,6 +581,13 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Options.Editing = False
           Width = 100
         end
+        object Tv1Column12: TcxGridDBColumn
+          Caption = #26377#26080#29983#25104#24037#33402#21333
+          DataBinding.FieldName = 'isgyd'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 66
+        end
       end
       object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
diff --git a/A02基础产品管理/U_TatClothInfo.pas b/A02基础产品管理/U_TatClothInfo.pas
index 0761145..0873e8b 100644
--- a/A02基础产品管理/U_TatClothInfo.pas
+++ b/A02基础产品管理/U_TatClothInfo.pas
@@ -211,6 +211,7 @@ type
     Tv1Column3: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
     Tv1Column10: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBDelClick(Sender: TObject);
@@ -246,6 +247,7 @@ type
     procedure Tv1DblClick(Sender: TObject);
     procedure Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
     procedure C_NamePropertiesChange(Sender: TObject);
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
   private
     { Private declarations }
     CurrentPage, RecordsNumber: Integer;
@@ -971,6 +973,12 @@ begin
   InitImage();
 end;
 
+procedure TfrmTatClothInfo.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+begin
+  if (AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('IsGYD').Index]) = '������' then
+    ACanvas.Brush.Color := $0080FF80;
+end;
+
 procedure TfrmTatClothInfo.Tv1DblClick(Sender: TObject);
 var
   WSql: string;
diff --git a/E01梭织生产计划/TatPlan.dproj.local b/E01梭织生产计划/TatPlan.dproj.local
index 7d2d168..dd71603 100644
--- 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.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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.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.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.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.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.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.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm</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.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_TatCardInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.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.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.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.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.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.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.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.555,=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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.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.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.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.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.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.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.422,=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.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.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.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.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="..\..\D10SZKaiXiYa"/>
diff --git a/E01梭织生产计划/TatPlan.identcache b/E01梭织生产计划/TatPlan.identcache
index bab6648..83807dd 100644
Binary files a/E01梭织生产计划/TatPlan.identcache and b/E01梭织生产计划/TatPlan.identcache differ
diff --git a/E01梭织生产计划/U_TatGYInPut.dfm b/E01梭织生产计划/U_TatGYInPut.dfm
index d97453b..1a2b10d 100644
--- a/E01梭织生产计划/U_TatGYInPut.dfm
+++ b/E01梭织生产计划/U_TatGYInPut.dfm
@@ -744,6 +744,8 @@ inherited frmTatGYInPut: TfrmTatGYInPut
           Height = 384
           Align = alClient
           TabOrder = 1
+          ExplicitLeft = -2
+          ExplicitTop = -1
           object TV1: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/E01梭织生产计划/U_TatGYInPut.pas b/E01梭织生产计划/U_TatGYInPut.pas
index 713906d..8e20520 100644
--- a/E01梭织生产计划/U_TatGYInPut.pas
+++ b/E01梭织生产计划/U_TatGYInPut.pas
@@ -558,6 +558,9 @@ begin
   ReadCxGrid('���������ƻ���¼��11', Tv1, '������������');
   ReadCxGrid('���������ƻ���¼��22', Tv2, '������������');
   InitData();
+  JSJS(); //���㾭˿
+  JSWS(); //����γ˿
+  JSKZ();
 //  Initexcel();
 end;
 
@@ -1390,9 +1393,17 @@ var
   ReedWidthStr: string;
   IsInch: Boolean;
 begin
-  SumJS := IfThen(VarIsNull(Tv1.DataController.Summary.FooterSummaryValues[0]), 0, Tv1.DataController.Summary.FooterSummaryValues[0]);
+  if Tv1.DataController.Summary.FooterSummaryValues[0] <> NULL then
+  begin
+    SumJS := IfThen(VarIsNull(Tv1.DataController.Summary.FooterSummaryValues[0]), 0, Tv1.DataController.Summary.FooterSummaryValues[0]);
 
-  SumWS := IfThen(VarIsNull(Tv2.DataController.Summary.FooterSummaryValues[0]), 0, Tv2.DataController.Summary.FooterSummaryValues[0]);
+  end;
+  if Tv2.DataController.Summary.FooterSummaryValues[0] <> NULL then
+  begin
+    SumWS := IfThen(VarIsNull(Tv2.DataController.Summary.FooterSummaryValues[0]), 0, Tv2.DataController.Summary.FooterSummaryValues[0]);
+  end;
+
+//  SumWS := IfThen(VarIsNull(Tv2.DataController.Summary.FooterSummaryValues[0]), 0, Tv2.DataController.Summary.FooterSummaryValues[0]);
   ReedWidthStr := Trim(C_ReedWidth.Text);
   IsInch := ContainsText(ReedWidthStr, '"');
   ReedWidthStr := StringReplace(ReedWidthStr, 'CM', '', [rfReplaceAll, rfIgnoreCase]);
@@ -1402,8 +1413,14 @@ begin
   if (ErrCode = 0) and (ReedWidthValue > 0) then
   begin
     if IsInch then
-      ReedWidthValue := ReedWidthValue * 0.0254;
-    C_GramWeight.Text := FormatFloat('0.00', (SumJS + SumWS) / ReedWidthValue / 100);
+    begin
+      C_GramWeight.Text := FloatToStr(roundfloat(((SumJS + SumWS) / ReedWidthValue * 2.54 * 100), 0));
+    end
+    else
+    begin
+      C_GramWeight.Text := FloatToStr(roundfloat(((SumJS + SumWS) / ReedWidthValue * 100), 0));
+    end;
+
   end
   else
     C_GramWeight.Text := '0.00';
diff --git a/E01梭织生产计划/testDll.res b/E01梭织生产计划/testDll.res
index e116c48..2465ca0 100644
Binary files a/E01梭织生产计划/testDll.res and b/E01梭织生产计划/testDll.res differ