diff --git a/E03梭织坯布检验/TatInsp.dproj.local b/E03梭织坯布检验/TatInsp.dproj.local
index d405a56..81449cf 100644
--- a/E03梭织坯布检验/TatInsp.dproj.local
+++ b/E03梭织坯布检验/TatInsp.dproj.local
@@ -1,80 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.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.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.367,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm</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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.099,=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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.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.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.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.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.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.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.367,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm</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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.099,=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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.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.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.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.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj</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="..\..\D10szXiangying"/>
+    <File Path="..\..\D10szXIANGYING"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
diff --git a/E03梭织坯布检验/TatInsp.res b/E03梭织坯布检验/TatInsp.res
index c8918d6..e2f6b57 100644
Binary files a/E03梭织坯布检验/TatInsp.res and b/E03梭织坯布检验/TatInsp.res differ
diff --git a/E03梭织坯布检验/TatInspLogin.dproj.local b/E03梭织坯布检验/TatInspLogin.dproj.local
index e194202..7f07b37 100644
--- a/E03梭织坯布检验/TatInspLogin.dproj.local
+++ b/E03梭织坯布检验/TatInspLogin.dproj.local
@@ -1,55 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<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="DbPanel"/>
-    <File Path="DbPanel\MovePanel.pas"/>
-    <File Path="delphitwain"/>
-    <File Path="delphitwain\DelphiTwain.pas"/>
-    <File Path="delphitwain\DelphiTwainUtils.pas"/>
-    <File Path="delphitwain\Twain.pas"/>
-    <File Path="AES.pas"/>
-    <File Path="ElAES.pas"/>
-    <File Path="JDAESExtend.pas"/>
     <File Path="logon.pas"/>
     <File Path="logon.dfm"/>
     <File Path="spmain.pas"/>
     <File Path="spmain.dfm"/>
-    <File Path="U_iniParam.pas"/>
-    <File Path="U_Link.pas"/>
-    <File Path="U_Link.dfm"/>
+    <File Path="delphitwain"/>
+    <File Path="delphitwain\DelphiTwain.pas"/>
+    <File Path="delphitwain\DelphiTwainUtils.pas"/>
+    <File Path="delphitwain\Twain.pas"/>
+    <File Path="DbPanel"/>
+    <File Path="DbPanel\MovePanel.pas"/>
+    <File Path="AES.pas"/>
+    <File Path="ElAES.pas"/>
     <File Path="U_upPassword.pas"/>
     <File Path="U_upPassword.dfm"/>
+    <File Path="U_Link.pas"/>
+    <File Path="U_Link.dfm"/>
+    <File Path="U_iniParam.pas"/>
+    <File Path="JDAESExtend.pas"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/E03梭织坯布检验/TatInspLogin.res b/E03梭织坯布检验/TatInspLogin.res
index 49b437f..9c03986 100644
Binary files a/E03梭织坯布检验/TatInspLogin.res and b/E03梭织坯布检验/TatInspLogin.res differ
diff --git a/E03梭织坯布检验/U_TatClothInspList.dfm b/E03梭织坯布检验/U_TatClothInspList.dfm
index 0941a4d..e77eeef 100644
--- a/E03梭织坯布检验/U_TatClothInspList.dfm
+++ b/E03梭织坯布检验/U_TatClothInspList.dfm
@@ -7,7 +7,6 @@ inherited frmTatClothInspList: TfrmTatClothInspList
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitLeft = -286
   ExplicitWidth = 1483
   ExplicitHeight = 621
   PixelsPerInch = 96
@@ -21,6 +20,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList
     AutoSize = True
     BorderStyle = bsSingle
     TabOrder = 3
+    ExplicitTop = 113
     DesignSize = (
       1463
       24)
@@ -128,7 +128,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList
     ParentFont = False
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 136
+    ExplicitTop = 133
     object Tv1: TcxGridDBTableView
       OnMouseUp = Tv1MouseUp
       Navigator.Buttons.CustomButtons = <>
@@ -171,7 +171,6 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         end
         item
           Kind = skSum
-          Column = v1Column14
         end
         item
           Format = #26816#39564#31995#25968'=#.##'
@@ -229,6 +228,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'conNO'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -237,6 +237,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -265,22 +266,6 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Options.Editing = False
         Width = 66
       end
-      object v1Column9: TcxGridDBColumn
-        Caption = #30133#28857#25968#37327
-        DataBinding.FieldName = 'CDQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column7: TcxGridDBColumn
-        Caption = #30133#28857#24773#20917
-        DataBinding.FieldName = 'FlawList'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
       object v1Column17: TcxGridDBColumn
         Caption = #29366#24577
         DataBinding.FieldName = 'CIIOFlag'
@@ -297,9 +282,63 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Options.Editing = False
         Width = 66
       end
-      object v1Column23: TcxGridDBColumn
-        Caption = #21367#21495
-        DataBinding.FieldName = 'PieceNo'
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #23450#22411#38376#24133
+        DataBinding.FieldName = 'C_DXMF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #23450#22411#31859#25968
+        DataBinding.FieldName = 'dxmeter'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 67
+      end
+      object v1Column34: TcxGridDBColumn
+        Caption = #20998#20999#21333#21495
+        DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column3: TcxGridDBColumn
+        Caption = #38376#24133
+        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column5: TcxGridDBColumn
+        Caption = #20811#37325
+        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column12: TcxGridDBColumn
+        Caption = #31561#32423
+        DataBinding.FieldName = 'Grade'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column6: TcxGridDBColumn
+        Caption = #21367#26465#30721
+        DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column10: TcxGridDBColumn
+        Caption = #31859#25968
+        DataBinding.FieldName = 'Meter'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -329,90 +368,67 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Options.Editing = False
         Width = 66
       end
-      object v1Column10: TcxGridDBColumn
-        Caption = #31859#25968
-        DataBinding.FieldName = 'Meter'
+      object v1Column9: TcxGridDBColumn
+        Caption = #30133#28857#25968#37327
+        DataBinding.FieldName = 'CDQty'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
+      object v1Column7: TcxGridDBColumn
+        Caption = #30133#28857#24773#20917
+        DataBinding.FieldName = 'FlawList'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column23: TcxGridDBColumn
+        Caption = #21367#21495
+        DataBinding.FieldName = 'PieceNo'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #25439#32791#21407#22240
+        DataBinding.FieldName = 'shreason'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #25439#32791#31859#25968
+        DataBinding.FieldName = 'SHMETER'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 69
+      end
       object v1Column20: TcxGridDBColumn
-        Caption = #25171#30721#20154
+        Caption = #20998#20999#36134#21495
         DataBinding.FieldName = 'Filler'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
-      object v1Column14: TcxGridDBColumn
-        Caption = #25187#20998
-        DataBinding.FieldName = 'KouFenQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        VisibleForCustomization = False
-        Width = 66
-      end
-      object v1Column12: TcxGridDBColumn
-        Caption = #21697#36136
-        DataBinding.FieldName = 'Grade'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
       object v1Column42: TcxGridDBColumn
         Caption = #24635#35760#24405#25968
         DataBinding.FieldName = 'TotalCount'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
-      object v1Column6: TcxGridDBColumn
-        Caption = #21367#26465#30721
-        DataBinding.FieldName = 'CIID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column3: TcxGridDBColumn
-        Caption = #38376#24133
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column5: TcxGridDBColumn
-        Caption = #20811#37325
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #23450#22411#38376#24133
-        DataBinding.FieldName = 'C_DXMF'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
       object v1MKXS: TcxGridDBColumn
         Caption = #25442#31639#31995#25968
         DataBinding.FieldName = 'Coefficient'
         DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column34: TcxGridDBColumn
-        Caption = #32568#26465#30721
-        DataBinding.FieldName = 'BCIOID'
-        DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -421,12 +437,13 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
       object v1Column46: TcxGridDBColumn
-        Caption = #26816#39564#26426#21488
+        Caption = #20998#20999#26426#21488
         DataBinding.FieldName = 'CIMachNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
@@ -456,27 +473,6 @@ inherited frmTatClothInspList: TfrmTatClothInspList
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
-      object Tv1Column7: TcxGridDBColumn
-        Caption = #25439#32791#21407#22240
-        DataBinding.FieldName = 'shreason'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
-      object Tv1Column9: TcxGridDBColumn
-        Caption = #25439#32791#31859#25968
-        DataBinding.FieldName = 'SHMETER'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 69
-      end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #23450#22411#31859#25968
-        DataBinding.FieldName = 'dxmeter'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 67
-      end
       object Tv1Column1: TcxGridDBColumn
         Caption = #32440#31649
         DataBinding.FieldName = 'tube'
diff --git a/E03梭织坯布检验/U_TatClothInspList.pas b/E03梭织坯布检验/U_TatClothInspList.pas
index 2f2db44..a0a7f56 100644
--- a/E03梭织坯布检验/U_TatClothInspList.pas
+++ b/E03梭织坯布检验/U_TatClothInspList.pas
@@ -57,7 +57,6 @@ type
     v1Column28: TcxGridDBColumn;
     v1Column10: TcxGridDBColumn;
     v1Column20: TcxGridDBColumn;
-    v1Column14: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     v1Column9: TcxGridDBColumn;
     v1Column42: TcxGridDBColumn;
diff --git a/E03梭织坯布检验/U_TatInspEdit.dfm b/E03梭织坯布检验/U_TatInspEdit.dfm
index de49e4b..7d6de7f 100644
--- a/E03梭织坯布检验/U_TatInspEdit.dfm
+++ b/E03梭织坯布检验/U_TatInspEdit.dfm
@@ -91,7 +91,6 @@ object frmTatInspEdit: TfrmTatInspEdit
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 18
     object Label1: TLabel
       Left = 745
       Top = 55
@@ -265,10 +264,9 @@ object frmTatInspEdit: TfrmTatInspEdit
     Height = 344
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 97
-    ExplicitHeight = 364
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -295,6 +293,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object TV1Column1: TcxGridDBColumn
         Caption = #30133#28857
         DataBinding.FieldName = 'CIFName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -308,6 +307,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #30133#28857#21517#31216
         DataBinding.FieldName = 'CIFName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Focusing = False
         Options.Sorting = False
@@ -316,6 +316,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #20301#32622#36215
         DataBinding.FieldName = 'CIFbeg'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = cxGridDBColumn3PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -326,6 +327,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #20301#32622#27490
         DataBinding.FieldName = 'CIFend'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 79
@@ -333,6 +335,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #38271#24230
         DataBinding.FieldName = 'CIFQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
@@ -341,6 +344,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #21407#22240
         DataBinding.FieldName = 'CDReason'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
@@ -348,12 +352,14 @@ object frmTatInspEdit: TfrmTatInspEdit
       end
       object cxGridDBColumn7: TcxGridDBColumn
         DataBinding.FieldName = 'CDQty'
+        DataBinding.IsNullValueType = True
         Visible = False
         Width = 60
       end
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #25187#20998
         DataBinding.FieldName = 'CIFPoints'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -361,6 +367,7 @@ object frmTatInspEdit: TfrmTatInspEdit
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #20010#25968
         DataBinding.FieldName = 'CIFNumber'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
diff --git a/E03梭织坯布检验/U_TatInspEdit.pas b/E03梭织坯布检验/U_TatInspEdit.pas
index 57edac6..db90113 100644
--- a/E03梭织坯布检验/U_TatInspEdit.pas
+++ b/E03梭织坯布检验/U_TatInspEdit.pas
@@ -9,7 +9,7 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, ComCtrls, ToolWin,
   cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges;
+  dxSkinsDefaultPainters, dxDateRanges, dxScrollbarAnnotations;
 
 type
   TfrmTatInspEdit = class(TForm)
diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm
index 573bce4..a48ebd2 100644
--- a/E03梭织坯布检验/U_TatMachInsp.dfm
+++ b/E03梭织坯布检验/U_TatMachInsp.dfm
@@ -7,6 +7,7 @@
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -689
   ExplicitWidth = 1556
   ExplicitHeight = 811
   PixelsPerInch = 96
@@ -829,7 +830,6 @@
               Align = alTop
               Enabled = False
               TabOrder = 5
-              ExplicitLeft = 2
               object Label39: TLabel
                 Left = 11
                 Top = 6
@@ -4831,6 +4831,7 @@
           end>
         DataController.Summary.SummaryGroups = <>
         OptionsCustomize.ColumnFiltering = False
+        OptionsView.DataRowHeight = 30
         OptionsView.Footer = True
         OptionsView.GroupByBox = False
         Styles.Content = cxStyle2
@@ -4865,7 +4866,7 @@
           Options.Editing = False
           Styles.Content = cxStyle2
           Styles.Header = cxStyle2
-          Width = 71
+          Width = 76
         end
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #21367#26465#30721
@@ -4876,7 +4877,7 @@
           Options.Sorting = False
           Styles.Content = cxStyle2
           Styles.Header = cxStyle2
-          Width = 113
+          Width = 275
         end
         object Tv3Column2: TcxGridDBColumn
           Caption = #38376#24133
@@ -4894,7 +4895,7 @@
           HeaderAlignmentHorz = taCenter
           Styles.Content = cxStyle2
           Styles.Header = cxStyle2
-          Width = 120
+          Width = 174
         end
         object Tv3Column3: TcxGridDBColumn
           Caption = #25439#32791
@@ -4903,7 +4904,7 @@
           HeaderAlignmentHorz = taCenter
           Styles.Content = cxStyle2
           Styles.Header = cxStyle2
-          Width = 68
+          Width = 100
         end
         object Tv3Column6: TcxGridDBColumn
           Caption = #25439#32791#21407#22240
@@ -4912,7 +4913,7 @@
           HeaderAlignmentHorz = taCenter
           Styles.Content = cxStyle2
           Styles.Header = cxStyle2
-          Width = 72
+          Width = 234
         end
       end
       object cxGridLevel2: TcxGridLevel
@@ -5261,20 +5262,20 @@
         AutoSize = True
         Caption = #25439#32791#31649#29702
         ImageIndex = 2
+        Wrap = True
         OnClick = ToolButton1Click
       end
       object ToolButton6: TToolButton
-        Left = 332
-        Top = 0
+        Left = 0
+        Top = 38
         AutoSize = True
         Caption = #20462#25913
         ImageIndex = 3
-        Wrap = True
         Visible = False
         OnClick = ToolButton6Click
       end
       object ToolButton7: TToolButton
-        Left = 0
+        Left = 71
         Top = 38
         AutoSize = True
         Caption = #20445#23384#26684#24335
@@ -5282,7 +5283,7 @@
         OnClick = ToolButton7Click
       end
       object ToolButton8: TToolButton
-        Left = 95
+        Left = 166
         Top = 38
         AutoSize = True
         Caption = #20851#38381
diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas
index 4f7b1bd..cc3c1e7 100644
--- a/E03梭织坯布检验/U_TatMachInsp.pas
+++ b/E03梭织坯布检验/U_TatMachInsp.pas
@@ -543,6 +543,7 @@ type
     procedure PackagingClick(Sender: TObject);
     procedure tubeClick(Sender: TObject);
 
+
   private
     { Private declarations }
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
@@ -2595,7 +2596,7 @@ end;
 
 procedure TfrmTatMachInsp.FormShow(Sender: TObject);
 begin
-  inherited;
+//  inherited;
   ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó�׼������');
   ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó�׼������');
   ReadCxGrid(trim(Self.Caption) + 'Tv3', Tv3, 'ó�׼������');
@@ -3066,6 +3067,23 @@ var
 begin
   CodeName.SetFocus;
 
+  if batchno.Text = '' then
+  begin
+    Application.MessageBox('���������ţ�', '��ʾ��Ϣ', MB_OK);
+    Exit;
+  end;
+  if PCID.Text = '' then
+  begin
+    Application.MessageBox('��������ת���ţ�', '��ʾ��Ϣ', MB_OK);
+    Exit;
+  end;
+  if DXMETER.Text = '' then
+  begin
+    Application.MessageBox('�����붨��������', '��ʾ��Ϣ', MB_OK);
+    Exit;
+  end;
+
+
   J := 0;
   BTPrint.Enabled := FALSE;
   with PNL1_6 do
@@ -4384,6 +4402,8 @@ begin
   end;
 end;
 
+
+
 procedure TfrmTatMachInsp.ToolButton3Click(Sender: TObject);
 begin
   if CDS_3.IsEmpty then
diff --git a/E03梭织坯布检验/testDll.res b/E03梭织坯布检验/testDll.res
index 2465ca0..e116c48 100644
Binary files a/E03梭织坯布检验/testDll.res and b/E03梭织坯布检验/testDll.res differ
diff --git a/E04梭织坯布仓库/TatClothStk.dproj.local b/E04梭织坯布仓库/TatClothStk.dproj.local
index 169cc95..5065562 100644
--- a/E04梭织坯布仓库/TatClothStk.dproj.local
+++ b/E04梭织坯布仓库/TatClothStk.dproj.local
@@ -1,102 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.782,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm</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.471,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.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.094,D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\TatClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\KnitClothStk.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.506,=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.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.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.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.720,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.999,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothStkList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.752,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitPlanSel.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.930,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.439,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.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.442,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.189,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.231,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.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.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.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.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj</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.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.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.267,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.231,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.669,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.813,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.378,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.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.782,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.930,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInList.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.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.506,=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.659,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.999,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothStkList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.752,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitPlanSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.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.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.094,D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\TatClothStk.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.439,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.442,=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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.189,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutEdit.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.231,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.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.720,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.378,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.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.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.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.231,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.813,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.669,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj</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.659,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.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="..\..\D10szXiangying"/>
+    <File Path="..\..\D10szXIANGYING"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
diff --git a/E04梭织坯布仓库/TatClothStk.res b/E04梭织坯布仓库/TatClothStk.res
index 0e05ae1..3a6735b 100644
Binary files a/E04梭织坯布仓库/TatClothStk.res and b/E04梭织坯布仓库/TatClothStk.res differ
diff --git a/E04梭织坯布仓库/U_GetDllForm.pas b/E04梭织坯布仓库/U_GetDllForm.pas
index 10dd07f..7e50b91 100644
--- a/E04梭织坯布仓库/U_GetDllForm.pas
+++ b/E04梭织坯布仓库/U_GetDllForm.pas
@@ -78,7 +78,7 @@ begin
     dtbase := 'xiangyingszdata';
     user := 'xiangyingsa';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-    Parameters1 := '����';
+    Parameters1 := '��ѯ';
     Parameters2 := '����';
   end
   else
diff --git a/E04梭织坯布仓库/U_TatClothStkList.dfm b/E04梭织坯布仓库/U_TatClothStkList.dfm
index b386c12..6f9de11 100644
--- a/E04梭织坯布仓库/U_TatClothStkList.dfm
+++ b/E04梭织坯布仓库/U_TatClothStkList.dfm
@@ -341,6 +341,7 @@ inherited frmTatClothStkList: TfrmTatClothStkList
     AutoSize = True
     BorderStyle = bsSingle
     TabOrder = 2
+    ExplicitTop = 111
     DesignSize = (
       1536
       23)
@@ -544,6 +545,7 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'conNO'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -552,10 +554,17 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
       end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #20837#24211#31867#22411
+        DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
+        Options.Editing = False
+      end
       object Tv1Column4: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
@@ -592,6 +601,55 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         Caption = #21367#21495
         DataBinding.FieldName = 'PieceNo'
         DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column34: TcxGridDBColumn
+        Caption = #20998#20999#21333#21495
+        DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column3: TcxGridDBColumn
+        Caption = #38376#24133
+        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column5: TcxGridDBColumn
+        Caption = #20811#37325
+        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column12: TcxGridDBColumn
+        Caption = #31561#32423
+        DataBinding.FieldName = 'Grade'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column6: TcxGridDBColumn
+        Caption = #21367#26465#30721
+        DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object v1Column10: TcxGridDBColumn
+        Caption = #31859#25968
+        DataBinding.FieldName = 'Meter'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -620,25 +678,42 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         Options.Editing = False
         Width = 66
       end
-      object v1Column10: TcxGridDBColumn
-        Caption = #31859#25968
-        DataBinding.FieldName = 'Meter'
+      object Tv1FlawList: TcxGridDBColumn
+        Caption = #30133#28857#24773#20917
+        DataBinding.FieldName = 'FlawList'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object v1Column46: TcxGridDBColumn
+        Caption = #20998#20999#26426#21488
+        DataBinding.FieldName = 'CIMachNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
-      object Tv1Column9: TcxGridDBColumn
-        Caption = #20837#24211#26102#38388
-        DataBinding.FieldName = 'IOTime'
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #26816#39564#24037
+        DataBinding.FieldName = 'jyg'
         DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
         Options.Editing = False
+        Width = 66
       end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #20837#24211#31867#22411
-        DataBinding.FieldName = 'IOType'
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #21592#24037'1'
+        DataBinding.FieldName = 'yg1'
         DataBinding.IsNullValueType = True
-        Options.Editing = False
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21592#24037'2'
+        DataBinding.FieldName = 'yg2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #24211#20301
@@ -656,66 +731,11 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         Options.Editing = False
         Width = 66
       end
-      object v1Column12: TcxGridDBColumn
-        Caption = #21697#36136
-        DataBinding.FieldName = 'Grade'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
       object v1Column42: TcxGridDBColumn
         Caption = #24635#35760#24405#25968
         DataBinding.FieldName = 'TotalCount'
         DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column6: TcxGridDBColumn
-        Caption = #21367#26465#30721
-        DataBinding.FieldName = 'CIID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column3: TcxGridDBColumn
-        Caption = #38376#24133
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column5: TcxGridDBColumn
-        Caption = #20811#37325
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column34: TcxGridDBColumn
-        Caption = #32568#26465#30721
-        DataBinding.FieldName = 'BCIOID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column46: TcxGridDBColumn
-        Caption = #26816#39564#26426#21488
-        DataBinding.FieldName = 'CIMachNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #26816#39564#24037
-        DataBinding.FieldName = 'jyg'
-        DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -740,20 +760,6 @@ inherited frmTatClothStkList: TfrmTatClothStkList
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
-      object Tv1Column7: TcxGridDBColumn
-        Caption = #21592#24037'1'
-        DataBinding.FieldName = 'yg1'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
-      object Tv1Column8: TcxGridDBColumn
-        Caption = #21592#24037'2'
-        DataBinding.FieldName = 'yg2'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
diff --git a/E04梭织坯布仓库/U_TatClothStkList.pas b/E04梭织坯布仓库/U_TatClothStkList.pas
index 76a3c7a..2217d55 100644
--- a/E04梭织坯布仓库/U_TatClothStkList.pas
+++ b/E04梭织坯布仓库/U_TatClothStkList.pas
@@ -82,7 +82,6 @@ type
     jyg: TEdit;
     C_Pattern: TEdit;
     C_Code: TEdit;
-    Tv1Column9: TcxGridDBColumn;
     Tv1Column11: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
     PM_1: TPopupMenu;
@@ -93,6 +92,7 @@ type
     Tv1Column6: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
     Tv1Column8: TcxGridDBColumn;
+    Tv1FlawList: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
diff --git a/E04梭织坯布仓库/U_TatClothStkListPH.dfm b/E04梭织坯布仓库/U_TatClothStkListPH.dfm
index 602f8e4..c9059d8 100644
--- a/E04梭织坯布仓库/U_TatClothStkListPH.dfm
+++ b/E04梭织坯布仓库/U_TatClothStkListPH.dfm
@@ -117,6 +117,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 36
     object Label2: TLabel
       Left = 70
       Top = 36
@@ -884,6 +885,13 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
         HeaderAlignmentHorz = taCenter
         Width = 68
       end
+      object Tv1GiftReason: TcxGridDBColumn
+        Caption = #36192#36865#21407#22240
+        DataBinding.FieldName = 'GiftReason'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1Column16: TcxGridDBColumn
         Caption = #25176#30424#21495
         DataBinding.FieldName = 'PalletNo'
diff --git a/E04梭织坯布仓库/U_TatClothStkListPH.pas b/E04梭织坯布仓库/U_TatClothStkListPH.pas
index 7b98f93..8d67507 100644
--- a/E04梭织坯布仓库/U_TatClothStkListPH.pas
+++ b/E04梭织坯布仓库/U_TatClothStkListPH.pas
@@ -110,6 +110,7 @@ type
     ToolButton6: TToolButton;
     Tv1Column15: TcxGridDBColumn;
     Tv1Column16: TcxGridDBColumn;
+    Tv1GiftReason: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -576,6 +577,7 @@ end;
 procedure TfrmTatClothStkListPH.ToolButton5Click(Sender: TObject);
 var
   MIOIDS, MStkIds, MOutNos: string;
+  mGiftReason : string;
 begin
   if CDS_1.IsEmpty then
     Exit;
@@ -609,8 +611,19 @@ begin
   CDS_1.Locate('SSel', True, []);
   CDS_1.EnableControls;
 
-  if Application.MessageBox('ȷ��Ҫִ�в�����', '��ʾ', 32 + 4) <> IdyeS then
+//  if Application.MessageBox('ȷ��Ҫִ�в�����', '��ʾ', 32 + 4) <> IdyeS then
+//    Exit;
+
+     // ������������������û���д����ԭ��
+  mGiftReason := '';
+  if not InputQuery('����ԭ��', '����������ԭ��', mGiftReason) then
+    Exit; // �û������ȡ��
+
+  if Trim(mGiftReason) = '' then
+  begin
+    Application.MessageBox('����������ԭ��', '��ʾ', 0);
     Exit;
+  end;
 
   try
     ADOQueryCmd.Connection.BeginTrans;
@@ -619,12 +632,12 @@ begin
       Close;
       Sql.Clear;
 
-      sql.Add('update  Tat_Cloth_Stock SET ISZS=''����''     ');
+      sql.Add('update  Tat_Cloth_Stock SET ISZS=''����'' , GiftReason = ' + QuotedStr(Trim(mGiftReason)));
 //        sql.Add('where iono=' + quotedstr(trim(Order_Main.fieldbyname('DRMID').AsString)));
       sql.add('where IsStocking=''1''');
       sql.Add('and  EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString]( ' + QuotedStr(MStkIds));
       SQL.Add(','','')  X where X.RTValue=Tat_Cloth_Stock.StkId)     ');
-
+//      showMessage(sql.Text);
       EXECSQL;
     end;
 
@@ -682,7 +695,7 @@ begin
       Close;
       Sql.Clear;
 
-      sql.Add('update  Tat_Cloth_Stock SET ISZS=NULL    ');
+      sql.Add('update  Tat_Cloth_Stock SET ISZS=NULL ,GiftReason = null ');
 //        sql.Add('where iono=' + quotedstr(trim(Order_Main.fieldbyname('DRMID').AsString)));
       sql.add('where IsStocking=''1''');
       sql.Add('and  EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString]( ' + QuotedStr(MStkIds));
diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas
index 9b39e27..0de8adf 100644
--- a/E04梭织坯布仓库/U_TatDRList.pas
+++ b/E04梭织坯布仓库/U_TatDRList.pas
@@ -169,9 +169,9 @@ begin
     TBExport.Enabled := True;
     ToolButton7.Enabled := True;
 
-    TBAdd.Enabled := False;
-    TBEdit.Enabled := False;
-    TBDel.Enabled := False;
+    TBAdd.Enabled := True;
+    TBEdit.Enabled := True;
+    TBDel.Enabled := True;
     case cxTabControl1.TabIndex of
       1:
         begin
@@ -318,8 +318,8 @@ begin
     Exit;
 //  if cxTabControl1.TabIndex <> 0 then
 //    Exit;
-  if Trim(canshu1) <> '����' then
-  begin
+//  if Trim(canshu1) <> '����' then
+//  begin
 
 //    with ADOQueryTemp do
 //    begin
@@ -342,7 +342,7 @@ begin
       Application.MessageBox('���ܲ������˵�����!', '��ʾ', 0);
       Exit;
     end;
-  end;
+//  end;
 //  with ADOQueryTemp do
 //  begin
 //    close;
@@ -378,14 +378,14 @@ begin
     Exit;
   if cxTabControl1.TabIndex <> 0 then
     Exit;
-  if canshu1 <> '����' then
+//  if canshu1 <> '����' then
+//  begin
+  if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
   begin
-    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
-    begin
-      Application.MessageBox('���ܲ������˵�����!', '��ʾ', 0);
-      Exit;
-    end;
+    Application.MessageBox('���ܲ������˵�����!', '��ʾ', 0);
+    Exit;
   end;
+//  end;
 
   with ADOQueryTemp do
   begin
diff --git a/E04梭织坯布仓库/testDll.res b/E04梭织坯布仓库/testDll.res
index 2465ca0..e116c48 100644
Binary files a/E04梭织坯布仓库/testDll.res and b/E04梭织坯布仓库/testDll.res differ
diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local
index 80bd266..c49ac22 100644
--- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local
+++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local
@@ -1,77 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj</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.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.791,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.270,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.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.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.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.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.791,=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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.270,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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="..\..\D10szXiangying"/>
+    <File Path="..\..\D10szXIANGYING"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache
index 65c8eaa..fe08070 100644
Binary files a/F01染色坯布仓库/DyeGreyClothStk.identcache and b/F01染色坯布仓库/DyeGreyClothStk.identcache differ
diff --git a/F01染色坯布仓库/DyeGreyClothStk.res b/F01染色坯布仓库/DyeGreyClothStk.res
index ad6eb9d..9042e0a 100644
Binary files a/F01染色坯布仓库/DyeGreyClothStk.res and b/F01染色坯布仓库/DyeGreyClothStk.res differ
diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
index 75b5895..84036fa 100644
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
@@ -369,6 +369,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
       Height = 235
       Align = alClient
       TabOrder = 1
+      ExplicitLeft = 2
       ExplicitTop = 45
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
@@ -503,6 +504,27 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
           HeaderAlignmentHorz = taCenter
           Width = 67
         end
+        object TV2C_MXSHWidth: TcxGridDBColumn
+          Caption = #25439#32791#38376#24133
+          DataBinding.FieldName = 'C_MXSHWidth'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
+        object TV2C_MXSHReason: TcxGridDBColumn
+          Caption = #25439#32791#21407#22240
+          DataBinding.FieldName = 'C_MXSHReason'
+          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxButtonEditProperties'
+          Properties.Buttons = <
+            item
+              Default = True
+              Kind = bkEllipsis
+            end>
+          Properties.OnButtonClick = TV2C_MXSHReasonPropertiesButtonClick
+          HeaderAlignmentHorz = taCenter
+          Width = 100
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = TV2
@@ -525,6 +547,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
       Height = 205
       Align = alClient
       TabOrder = 0
+      ExplicitTop = 45
       object TV3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
index 2eecd07..c450f5d 100644
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
@@ -79,6 +79,8 @@ type
     TV2Column6: TcxGridDBColumn;
     TV2Column2: TcxGridDBColumn;
     TV2Column7: TcxGridDBColumn;
+    TV2C_MXSHWidth: TcxGridDBColumn;
+    TV2C_MXSHReason: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -104,6 +106,8 @@ type
     procedure TV2Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TV2Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TV2Column6PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure TV2C_MXSHReasonPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -761,6 +765,28 @@ begin
   end;
 end;
 
+procedure TfrmDyeGreyClothInEdit.TV2C_MXSHReasonPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := 'C_MXSHReason';
+      flagname := '�ŷ����ԭ��';
+      if ShowModal = 1 then
+      begin
+        Self.CDS_2.Edit;
+        Self.CDS_2.FieldByName('C_MXSHReason').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+
+end;
+
 procedure TfrmDyeGreyClothInEdit.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
 begin
   try
diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.dfm b/F01染色坯布仓库/U_DyeGreyClothInList.dfm
index af42048..950a547 100644
--- a/F01染色坯布仓库/U_DyeGreyClothInList.dfm
+++ b/F01染色坯布仓库/U_DyeGreyClothInList.dfm
@@ -725,6 +725,20 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
         HeaderAlignmentHorz = taCenter
         Width = 68
       end
+      object TV2C_MXSHWidth: TcxGridDBColumn
+        Caption = #25439#32791#38376#24133
+        DataBinding.FieldName = 'C_MXSHWidth'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
+      object TV2C_MXSHReason: TcxGridDBColumn
+        Caption = #25439#32791#21407#22240
+        DataBinding.FieldName = 'C_MXSHReason'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = TV2
diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.pas b/F01染色坯布仓库/U_DyeGreyClothInList.pas
index 30bbced..37dc318 100644
--- a/F01染色坯布仓库/U_DyeGreyClothInList.pas
+++ b/F01染色坯布仓库/U_DyeGreyClothInList.pas
@@ -120,6 +120,8 @@ type
     ToolButton8: TToolButton;
     ToolButton9: TToolButton;
     TV2Column8: TcxGridDBColumn;
+    TV2C_MXSHWidth: TcxGridDBColumn;
+    TV2C_MXSHReason: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
diff --git a/F01染色坯布仓库/testDll.res b/F01染色坯布仓库/testDll.res
index 2465ca0..e116c48 100644
Binary files a/F01染色坯布仓库/testDll.res and b/F01染色坯布仓库/testDll.res differ