diff --git a/F02染色计划单/DyePlan.dproj.local b/F02染色计划单/DyePlan.dproj.local
index 45eb20a..ca11e01 100644
--- a/F02染色计划单/DyePlan.dproj.local
+++ b/F02染色计划单/DyePlan.dproj.local
@@ -1,62 +1,62 @@
 <?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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.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.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.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.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.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.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.577,=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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.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.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.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.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.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.571,=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.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.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.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.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.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.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.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
   </Transactions>
diff --git a/F02染色计划单/DyePlan.identcache b/F02染色计划单/DyePlan.identcache
index 850df03..bd75939 100644
Binary files a/F02染色计划单/DyePlan.identcache and b/F02染色计划单/DyePlan.identcache differ
diff --git a/F05染色检验/DyeInsp.dproj.local b/F05染色检验/DyeInsp.dproj.local
index 2ef37ca..5a3fc26 100644
--- a/F05染色检验/DyeInsp.dproj.local
+++ b/F05染色检验/DyeInsp.dproj.local
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.664,=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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.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.743,=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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.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.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.958,=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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
diff --git a/F05染色检验/DyeInsp.identcache b/F05染色检验/DyeInsp.identcache
index f228705..6d3105f 100644
Binary files a/F05染色检验/DyeInsp.identcache and b/F05染色检验/DyeInsp.identcache differ
diff --git a/F05染色检验/DyeInspLogin.dproj.local b/F05染色检验/DyeInspLogin.dproj.local
index 8a45a34..e2843ae 100644
--- a/F05染色检验/DyeInspLogin.dproj.local
+++ b/F05染色检验/DyeInspLogin.dproj.local
@@ -21,6 +21,6 @@
     <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.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/F05染色检验/DyeInspLogin.identcache b/F05染色检验/DyeInspLogin.identcache
index 1d1a05f..da5bc7b 100644
Binary files a/F05染色检验/DyeInspLogin.identcache and b/F05染色检验/DyeInspLogin.identcache differ
diff --git a/F05染色检验/U_DyeMachInsp.dfm b/F05染色检验/U_DyeMachInsp.dfm
index 027d037..23e38ca 100644
--- a/F05染色检验/U_DyeMachInsp.dfm
+++ b/F05染色检验/U_DyeMachInsp.dfm
@@ -3,11 +3,12 @@
   Top = 20
   Caption = #25104#21697#26816#39564
   ClientHeight = 820
-  ClientWidth = 1924
+  ClientWidth = 1540
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitWidth = 1940
+  ExplicitLeft = -689
+  ExplicitWidth = 1556
   ExplicitHeight = 859
   PixelsPerInch = 96
   TextHeight = 12
@@ -67,7 +68,7 @@
       object Label5: TLabel
         Left = 3
         Top = 48
-        Width = 62
+        Width = 60
         Height = 34
         Caption = #38271#24230
         Font.Charset = ANSI_CHARSET
@@ -80,7 +81,7 @@
       object Label11: TLabel
         Left = 3
         Top = 104
-        Width = 62
+        Width = 60
         Height = 34
         Caption = #37325#37327
         Font.Charset = ANSI_CHARSET
@@ -107,7 +108,7 @@
       object Label10: TLabel
         Left = 60
         Top = 186
-        Width = 42
+        Width = 40
         Height = 24
         Caption = #27491#21697
         Font.Charset = ANSI_CHARSET
@@ -120,7 +121,7 @@
       object Label12: TLabel
         Left = 168
         Top = 186
-        Width = 42
+        Width = 40
         Height = 24
         Caption = #27425#21697
         Font.Charset = ANSI_CHARSET
@@ -133,7 +134,7 @@
       object Label3: TLabel
         Left = 30
         Top = 11
-        Width = 62
+        Width = 58
         Height = 23
         Caption = #31995'    '#25968
         Font.Charset = ANSI_CHARSET
@@ -146,7 +147,7 @@
       object lblRuleConversion: TLabel
         Left = 181
         Top = 10
-        Width = 84
+        Width = 80
         Height = 24
         Caption = #31859#36716#20844#26020
         Font.Charset = ANSI_CHARSET
@@ -324,7 +325,7 @@
       object Label22: TLabel
         Left = 20
         Top = 135
-        Width = 89
+        Width = 84
         Height = 19
         Caption = #24320#21345' '#25968#37327#65306
         Font.Charset = ANSI_CHARSET
@@ -337,7 +338,7 @@
       object Label13: TLabel
         Left = 225
         Top = 135
-        Width = 89
+        Width = 84
         Height = 19
         Caption = #24320#21345' '#21305#25968#65306
         Font.Charset = ANSI_CHARSET
@@ -350,7 +351,7 @@
       object Label14: TLabel
         Left = 20
         Top = 47
-        Width = 51
+        Width = 48
         Height = 19
         Caption = #21345#21495#65306
         Font.Charset = ANSI_CHARSET
@@ -363,7 +364,7 @@
       object Label23: TLabel
         Left = 220
         Top = 104
-        Width = 51
+        Width = 48
         Height = 19
         Caption = #39068#33394#65306
         Font.Charset = ANSI_CHARSET
@@ -376,7 +377,7 @@
       object Label24: TLabel
         Left = 20
         Top = 104
-        Width = 51
+        Width = 48
         Height = 19
         Caption = #33394#21495#65306
         Font.Charset = ANSI_CHARSET
@@ -389,7 +390,7 @@
       object Label25: TLabel
         Left = 20
         Top = 77
-        Width = 51
+        Width = 48
         Height = 19
         Caption = #21697#21517#65306
         Font.Charset = ANSI_CHARSET
@@ -402,7 +403,7 @@
       object Label1: TLabel
         Left = 18
         Top = 7
-        Width = 84
+        Width = 80
         Height = 24
         Caption = #25195#25551#20837#21475
         Font.Charset = ANSI_CHARSET
@@ -1852,18 +1853,20 @@
   object Panel4: TPanel [3]
     Left = 1319
     Top = 0
-    Width = 605
+    Width = 221
     Height = 820
     Align = alClient
     Caption = 'Panel4'
     TabOrder = 2
     object cxGrid3: TcxGrid
       Left = 1
-      Top = 39
-      Width = 603
-      Height = 587
+      Top = 115
+      Width = 219
+      Height = 511
       Align = alClient
       TabOrder = 0
+      ExplicitLeft = 0
+      ExplicitTop = 109
       object Tv3: TcxGridDBTableView
         OnMouseDown = Tv3MouseDown
         Navigator.Buttons.CustomButtons = <>
@@ -1983,7 +1986,7 @@
     object cxPageControl1: TcxPageControl
       Left = 1
       Top = 626
-      Width = 603
+      Width = 219
       Height = 193
       Align = alBottom
       TabOrder = 1
@@ -1991,7 +1994,7 @@
       Properties.CustomButtons.Buttons = <>
       ClientRectBottom = 191
       ClientRectLeft = 2
-      ClientRectRight = 601
+      ClientRectRight = 217
       ClientRectTop = 22
       object cxTabSheet1: TcxTabSheet
         Caption = #24405#20837
@@ -1999,7 +2002,7 @@
         object cxGrid2: TcxGrid
           Left = 0
           Top = 0
-          Width = 599
+          Width = 215
           Height = 169
           Align = alClient
           TabOrder = 0
@@ -2113,14 +2116,10 @@
       object 查看: TcxTabSheet
         Caption = #26597#30475
         ImageIndex = 1
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object cxGrid1: TcxGrid
           Left = 0
           Top = 0
-          Width = 599
+          Width = 215
           Height = 169
           Align = alClient
           TabOrder = 0
@@ -2235,8 +2234,8 @@
       Tag = 1
       Left = 1
       Top = 1
-      Width = 603
-      Height = 38
+      Width = 219
+      Height = 114
       AutoSize = True
       ButtonHeight = 38
       ButtonWidth = 91
@@ -2269,35 +2268,37 @@
         AutoSize = True
         Caption = #21024#38500
         ImageIndex = 5
+        Wrap = True
         OnClick = btnDelClick
       end
       object ToolButton6: TToolButton
-        Left = 142
-        Top = 0
+        Left = 0
+        Top = 38
         AutoSize = True
         Caption = #20462#25913
         ImageIndex = 3
         OnClick = ToolButton6Click
       end
       object ToolButton4: TToolButton
-        Left = 213
-        Top = 0
+        Left = 71
+        Top = 38
         AutoSize = True
         Caption = #30133#28857#31649#29702
         ImageIndex = 2
+        Wrap = True
         OnClick = ToolButton4Click
       end
       object ToolButton7: TToolButton
-        Left = 308
-        Top = 0
+        Left = 0
+        Top = 76
         AutoSize = True
         Caption = #20445#23384#26684#24335
         ImageIndex = 16
         OnClick = ToolButton7Click
       end
       object ToolButton8: TToolButton
-        Left = 403
-        Top = 0
+        Left = 95
+        Top = 76
         AutoSize = True
         Caption = #20851#38381
         ImageIndex = 7
@@ -2513,7 +2514,7 @@
     object Label35: TLabel
       Left = 27
       Top = 55
-      Width = 21
+      Width = 19
       Height = 23
       Caption = #31204
       Font.Charset = ANSI_CHARSET
@@ -2526,7 +2527,7 @@
     object Label16: TLabel
       Left = 6
       Top = 15
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #30721#34920
       Font.Charset = ANSI_CHARSET
@@ -2539,7 +2540,7 @@
     object Label26: TLabel
       Left = 6
       Top = 94
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #20986#32440
       Font.Charset = ANSI_CHARSET
@@ -2552,7 +2553,7 @@
     object Label6: TLabel
       Left = 90
       Top = 94
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #20221#25968
       Font.Charset = ANSI_CHARSET
@@ -2565,7 +2566,7 @@
     object Label7: TLabel
       Left = 90
       Top = 15
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #21333#20301
       Font.Charset = ANSI_CHARSET
@@ -2578,7 +2579,7 @@
     object Label9: TLabel
       Left = 6
       Top = 136
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #38271#24230
       Font.Charset = ANSI_CHARSET
@@ -2591,7 +2592,7 @@
     object Label15: TLabel
       Left = 6
       Top = 178
-      Width = 42
+      Width = 38
       Height = 23
       Caption = #37325#37327
       Font.Charset = ANSI_CHARSET
@@ -2604,7 +2605,7 @@
     object Label19: TLabel
       Left = 6
       Top = 224
-      Width = 84
+      Width = 76
       Height = 23
       Caption = #31859#25968#20445#30041
       Font.Charset = ANSI_CHARSET
@@ -2617,7 +2618,7 @@
     object Label20: TLabel
       Left = 161
       Top = 224
-      Width = 21
+      Width = 19
       Height = 23
       Caption = #20301
       Font.Charset = ANSI_CHARSET
@@ -2630,7 +2631,7 @@
     object Label21: TLabel
       Left = 6
       Top = 255
-      Width = 84
+      Width = 76
       Height = 23
       Caption = #30721#25968#20445#30041
       Font.Charset = ANSI_CHARSET
@@ -2643,7 +2644,7 @@
     object Label27: TLabel
       Left = 161
       Top = 255
-      Width = 21
+      Width = 19
       Height = 23
       Caption = #20301
       Font.Charset = ANSI_CHARSET
@@ -2656,7 +2657,7 @@
     object Label28: TLabel
       Left = 161
       Top = 286
-      Width = 21
+      Width = 19
       Height = 23
       Caption = #20301
       Font.Charset = ANSI_CHARSET
@@ -2669,7 +2670,7 @@
     object Label33: TLabel
       Left = 6
       Top = 286
-      Width = 84
+      Width = 76
       Height = 23
       Caption = #37325#37327#20445#30041
       Font.Charset = ANSI_CHARSET
@@ -2682,7 +2683,7 @@
     object Label34: TLabel
       Left = 6
       Top = 355
-      Width = 84
+      Width = 76
       Height = 23
       Caption = #29233#36805#26631#31614
       Font.Charset = ANSI_CHARSET
diff --git a/F05染色检验/U_DyeMachInsp.pas b/F05染色检验/U_DyeMachInsp.pas
index 6a0347f..7ef373e 100644
--- a/F05染色检验/U_DyeMachInsp.pas
+++ b/F05染色检验/U_DyeMachInsp.pas
@@ -355,7 +355,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_iniParam;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_iniParam, U_LabelPrint;
 
 {$R *.dfm}
 procedure TfrmDyeMachInsp.PrtMD(MInNo: string);
@@ -1651,26 +1651,60 @@ end;
 procedure TfrmDyeMachInsp.ToolButton2Click(Sender: TObject);
 begin
   if CDS_3.IsEmpty then
-    exit;
-  if Application.MessageBox('ȷ��Ҫ���´�ӡ��', '��ʾ', 32 + 4) <> IDYES then
     Exit;
+//  if Application.MessageBox('ȷ��Ҫ���´�ӡ��', '��ʾ', 32 + 4) <> IDYES then
+//    Exit;
+
+  CDS_3.DisableControls;
+  with ADOTmp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select * from Dye_Cloth_IO A where IOFlag=''���''  ');
+    SQL.Add(' and A.StkId=''' + trim(CDS_3.fieldbyName('CIID').AsString) + '''');
+    Open;
+  end;
+  CDS_3.EnableControls;
+
   try
-    with ADOTmp do
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
     begin
-      Close;
-      SQL.Clear;
-      sql.Add(' select * from Dye_Cloth_IO A where IOFlag=''���''  ');
-      SQL.Add(' and A.StkId=''' + trim(CDS_3.fieldbyName('CIID').AsString) + '''');
-      Open;
+      FLMType := 'DyeMachInspPrint1';
+      FFiltration1 := ADOTmp.fieldbyName('IONo').AsString;
+      if ShowModal = 1 then
+      begin
+//        Self.InitGrid();
+      end;
     end;
-
-    PrtMD(ADOTmp.fieldbyName('IONo').AsString);
-
-  except
-    application.MessageBox('���´�ӡʧ��!', '��ʾ��Ϣ', MB_ICONERROR);
+  finally
+    frmLabelPrint.Free;
   end;
 end;
 
+
+//begin
+//  if CDS_3.IsEmpty then
+//    exit;
+//  if Application.MessageBox('ȷ��Ҫ���´�ӡ��', '��ʾ', 32 + 4) <> IDYES then
+//    Exit;
+//  try
+//    with ADOTmp do
+//    begin
+//      Close;
+//      SQL.Clear;
+//      sql.Add(' select * from Dye_Cloth_IO A where IOFlag=''���''  ');
+//      SQL.Add(' and A.StkId=''' + trim(CDS_3.fieldbyName('CIID').AsString) + '''');
+//      Open;
+//    end;
+//
+//    PrtMD(ADOTmp.fieldbyName('IONo').AsString);
+//
+//  except
+//    application.MessageBox('���´�ӡʧ��!', '��ʾ��Ϣ', MB_ICONERROR);
+//  end;
+//end;
+
 procedure TfrmDyeMachInsp.edtScanKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
diff --git a/F05染色检验/U_GetDllForm.pas b/F05染色检验/U_GetDllForm.pas
index 2efe09a..ab086c6 100644
--- a/F05染色检验/U_GetDllForm.pas
+++ b/F05染色检验/U_GetDllForm.pas
@@ -71,10 +71,10 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-    server := '101.132.143.144,7781';
-    dtbase := 'yilaibuyiData';
-    user := 'rtsa';
-    pswd := 'rightsoft@5740';
+    server := '112.14.44.145';
+    dtbase := 'yilanbuyidata';
+    user := 'yilansa';
+    pswd := 'yilanbuyi@123';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //   DParameters1:='��Ȩ��';
   end
diff --git a/F05染色检验/testDll.identcache b/F05染色检验/testDll.identcache
index 9988363..131539d 100644
Binary files a/F05染色检验/testDll.identcache and b/F05染色检验/testDll.identcache differ