diff --git a/B04采购计划管理/ProjectGroup1.groupproj.local b/B04采购计划管理/ProjectGroup1.groupproj.local
index 585217b..3676032 100644
--- a/B04采购计划管理/ProjectGroup1.groupproj.local
+++ b/B04采购计划管理/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\PurchasePlan.dproj"/>
+		<Projects ActiveProject="D:\D10W\项目代码\D10myBiaoqi\B04采购计划管理\PurchasePlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/B04采购计划管理/PurchasePlan.dpr b/B04采购计划管理/PurchasePlan.dpr
index 7b6b7e6..43a936b 100644
--- a/B04采购计划管理/PurchasePlan.dpr
+++ b/B04采购计划管理/PurchasePlan.dpr
@@ -37,7 +37,8 @@ uses
   U_RSTradePlanSel in 'U_RSTradePlanSel.pas' {frmRSTradePlanSel},
   U_ClaimsList in 'U_ClaimsList.pas' {frmClaimsList},
   U_TradeDefectKCListSel in 'U_TradeDefectKCListSel.pas' {frmTradeDefectKCListSel},
-  U_CLNoteEdit in 'U_CLNoteEdit.pas' {frmCLNoteEdit};
+  U_CLNoteEdit in 'U_CLNoteEdit.pas' {frmCLNoteEdit},
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
 
diff --git a/B04采购计划管理/PurchasePlan.dproj b/B04采购计划管理/PurchasePlan.dproj
index 6f5dc62..8d169b4 100644
--- a/B04采购计划管理/PurchasePlan.dproj
+++ b/B04采购计划管理/PurchasePlan.dproj
@@ -80,7 +80,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10W\项目代码\D10myBiaoqi\B04采购计划管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -189,6 +189,7 @@
             <Form>frmCLNoteEdit</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local
index 834c5f1..10a022a 100644
--- a/B04采购计划管理/PurchasePlan.dproj.local
+++ b/B04采购计划管理/PurchasePlan.dproj.local
@@ -1,67 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.953,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.954,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.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.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.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.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.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.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.985,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_CLNoteEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.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.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.564,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_UserSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.606,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_TradeDefectKCListSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.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.961,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.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.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.564,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.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.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.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.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.953,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.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.954,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.059,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanPut.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.985,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_CLNoteEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.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.961,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.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.606,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_TradeDefectKCListSel.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.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.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.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>2026/05/18 15:54:55.800,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="..\..\D10zzbiaoqi"/>
+    <File Path="..\..\D10myBiaoqi"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
@@ -79,7 +80,7 @@
     <File Path="..\A00通用窗体\U_UserSel.dfm"/>
     <File Path="..\A00通用窗体\U_YarnInfoSel.pas"/>
     <File Path="..\A00通用窗体\U_YarnInfoSel.dfm"/>
-    <File Path="..\..\..\..\Dp10Repo"/>
+    <File Path="D:\D10W"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
     <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
@@ -98,6 +99,7 @@
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
+    <File Path="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
     <File Path="U_DataLink.pas"/>
     <File Path="U_DataLink.dfm"/>
     <File Path="U_GetDllForm.pas"/>
diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache
index db5d1d5..17edc05 100644
Binary files a/B04采购计划管理/PurchasePlan.identcache and b/B04采购计划管理/PurchasePlan.identcache differ
diff --git a/B04采购计划管理/U_ClothHJGPlanList.dfm b/B04采购计划管理/U_ClothHJGPlanList.dfm
index 94e2427..05ef982 100644
--- a/B04采购计划管理/U_ClothHJGPlanList.dfm
+++ b/B04采购计划管理/U_ClothHJGPlanList.dfm
@@ -6,6 +6,8 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -90
+  ExplicitTop = -105
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -89,16 +91,24 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       ImageIndex = 22
       OnClick = ToolButton5Click
     end
-    object TBPrint: TToolButton
+    object ToolButton3: TToolButton
       Left = 497
       Top = 0
       AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 21
+      OnClick = ToolButton3Click
+    end
+    object TBPrint: TToolButton
+      Left = 568
+      Top = 0
+      AutoSize = True
       Caption = #25171#21360
       ImageIndex = 21
       OnClick = TBPrintClick
     end
     object btnTijiao: TToolButton
-      Left = 568
+      Left = 639
       Top = 0
       AutoSize = True
       Caption = #25552#20132
@@ -106,7 +116,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = btnTijiaoClick
     end
     object btnCXTijiao: TToolButton
-      Left = 639
+      Left = 710
       Top = 0
       AutoSize = True
       Caption = #25764#38144#25552#20132
@@ -114,7 +124,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = btnCXTijiaoClick
     end
     object tchk: TToolButton
-      Left = 734
+      Left = 805
       Top = 0
       AutoSize = True
       Caption = #23457#26680
@@ -122,7 +132,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = tchkClick
     end
     object Tnochk: TToolButton
-      Left = 805
+      Left = 876
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
@@ -130,7 +140,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = TnochkClick
     end
     object btnWC: TToolButton
-      Left = 900
+      Left = 971
       Top = 0
       AutoSize = True
       Caption = #23436#25104
@@ -138,7 +148,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = btnWCClick
     end
     object btnWCCX: TToolButton
-      Left = 971
+      Left = 1042
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23436#25104
@@ -146,7 +156,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = btnWCCXClick
     end
     object Tqx: TToolButton
-      Left = 1066
+      Left = 1137
       Top = 0
       AutoSize = True
       Caption = #21512#21516#21462#28040
@@ -154,7 +164,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = TqxClick
     end
     object Tnoqx: TToolButton
-      Left = 1161
+      Left = 1232
       Top = 0
       AutoSize = True
       Caption = #25764#38144#21512#21516#21462#28040
@@ -162,7 +172,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = TnoqxClick
     end
     object ToolButton7: TToolButton
-      Left = 1280
+      Left = 1351
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -170,7 +180,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       OnClick = ToolButton7Click
     end
     object TBClose: TToolButton
-      Left = 1375
+      Left = 1446
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -186,6 +196,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitTop = 121
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -199,6 +210,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       DataController.Summary.FooterSummaryItems = <
         item
           Kind = skSum
+          Column = Tv1CGQty
         end
         item
           Kind = skSum
@@ -264,6 +276,30 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
         Styles.Header = DataLink_PurchasePlan.Default
         Width = 82
       end
+      object Tv1C_Name: TcxGridDBColumn
+        Caption = #21697#21517
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv1CGQty: TcxGridDBColumn
+        Caption = #21518#21152#24037#25968#37327
+        DataBinding.FieldName = 'CGQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv1qtyunit: TcxGridDBColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'qtyunit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
@@ -667,6 +703,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
         end
         item
           Kind = skSum
+          Column = TV2CGQty
         end
         item
           Kind = skSum
@@ -746,7 +783,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
         Options.Editing = False
         Width = 70
       end
-      object TV2Column6: TcxGridDBColumn
+      object TV2CGQty: TcxGridDBColumn
         Caption = #21518#21152#24037#25968#37327
         DataBinding.FieldName = 'CGQty'
         DataBinding.IsNullValueType = True
diff --git a/B04采购计划管理/U_ClothHJGPlanList.pas b/B04采购计划管理/U_ClothHJGPlanList.pas
index a478a6c..f63827e 100644
--- a/B04采购计划管理/U_ClothHJGPlanList.pas
+++ b/B04采购计划管理/U_ClothHJGPlanList.pas
@@ -111,12 +111,16 @@ type
     TV2Column3: TcxGridDBColumn;
     TV2Column4: TcxGridDBColumn;
     TV2Column5: TcxGridDBColumn;
-    TV2Column6: TcxGridDBColumn;
+    TV2CGQty: TcxGridDBColumn;
     Tv1Column1: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
     Label1: TLabel;
     BuyConNo: TEdit;
+    ToolButton3: TToolButton;
+    Tv1C_Name: TcxGridDBColumn;
+    Tv1CGQty: TcxGridDBColumn;
+    Tv1qtyunit: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -153,6 +157,7 @@ type
     procedure FormCreate(Sender: TObject);
     procedure N5Click(Sender: TObject);
     procedure N6Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
   private
     fFlileFlag: string;
     procedure InitGrid();
@@ -384,7 +389,7 @@ begin
       Close;
       sql.Clear;
 
-      sql.Add('select AA.* from (select DISTINCT A.*,C.BuyConNo,D.FOrdNo');
+      sql.Add('select AA.* from (select DISTINCT A.*,B.qtyunit,CGQty = (select sum(CGQty) from Pur_ClothPlan_Sub X where X.PurMId = A.PurMId),C.BuyConNo,C.C_Name,D.FOrdNo');
       sql.Add(',(Case A.Status when ''0'' then ''δ�ύ'' when ''1'' then ''���ύ''');
       sql.Add('when ''9'' then ''�����'' when ''10'' then ''�����'' ');
       SQL.Add('when ''-1'' then ''��ȡ��'' end) AS ZT');
@@ -606,6 +611,14 @@ begin
   end;
 end;
 
+procedure TfrmClothHJGPlanList.ToolButton3Click(Sender: TObject);
+begin
+  inherited;
+  if CDS_1.IsEmpty then
+    exit;
+  TcxGridToExcel(Self.Caption, cxGrid1);
+end;
+
 procedure TfrmClothHJGPlanList.btnWCClick(Sender: TObject);
 var
   MPurMIdS: string;
diff --git a/B04采购计划管理/U_ClothPurchasePlanList.dfm b/B04采购计划管理/U_ClothPurchasePlanList.dfm
index 20ee0f5..d544aef 100644
--- a/B04采购计划管理/U_ClothPurchasePlanList.dfm
+++ b/B04采购计划管理/U_ClothPurchasePlanList.dfm
@@ -6,7 +6,8 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -635
+  ExplicitLeft = -225
+  ExplicitTop = -105
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -195,7 +196,6 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
-    ExplicitTop = 121
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -209,6 +209,7 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
       DataController.Summary.FooterSummaryItems = <
         item
           Kind = skSum
+          Column = Tv1Column9
         end
         item
           Kind = skSum
diff --git a/B04采购计划管理/U_ClothRSPlanList.dfm b/B04采购计划管理/U_ClothRSPlanList.dfm
index 3764c2b..9b465c2 100644
--- a/B04采购计划管理/U_ClothRSPlanList.dfm
+++ b/B04采购计划管理/U_ClothRSPlanList.dfm
@@ -6,7 +6,6 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -499
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -195,7 +194,6 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
-    ExplicitTop = 121
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -665,6 +663,8 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
     Align = alBottom
     BorderStyle = cxcbsNone
     TabOrder = 5
+    ExplicitLeft = -79
+    ExplicitTop = 478
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/B04采购计划管理/testDll.identcache b/B04采购计划管理/testDll.identcache
index ab71f98..fe6ec77 100644
Binary files a/B04采购计划管理/testDll.identcache and b/B04采购计划管理/testDll.identcache differ