From 4bce73776a6d8e35c13f985f249e8d472a3d9a95 Mon Sep 17 00:00:00 2001
From: funa <1559646174@qq.com>
Date: Tue, 19 May 2026 17:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=20=E9=87=87=E8=B4=AD=20?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=20=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 A09财务通用管理/Financial.dpr                 |   2 +-
 A09财务通用管理/Financial.dproj               |   6 +-
 A09财务通用管理/Financial.dproj.local         | 164 +++++++++---------
 A09财务通用管理/Financial.identcache          | Bin 3115 -> 3119 bytes
 A09财务通用管理/ProjectGroup1.groupproj.local |   2 +-
 A09财务通用管理/U_BatchEditUnit.dfm           |  62 +++++++
 A09财务通用管理/U_BatchEditUnit.pas           |  95 ++++++++++
 A09财务通用管理/U_ZDPrice.dfm                 |  21 ++-
 A09财务通用管理/U_ZDPrice.pas                 |  91 +++++++++-
 A09财务通用管理/testDll.identcache            | Bin 164 -> 164 bytes
 A09财务通用管理/testDll.res                   | Bin 3308 -> 3308 bytes
 B04采购计划管理/PurchasePlan.dproj.local      |   6 +-
 B04采购计划管理/PurchasePlan.identcache       | Bin 2479 -> 2479 bytes
 B04采购计划管理/U_ClothRSPlanList.dfm         |   4 +-
 B04采购计划管理/U_GXSel.dfm                   |   5 +
 B04采购计划管理/U_GXSel.pas                   |   3 +-
 T02贸易汇总仓库/ProjectGroup1.groupproj.local |   2 +-
 T02贸易汇总仓库/TradeTotalClothStk.dpr        |   3 +-
 T02贸易汇总仓库/TradeTotalClothStk.dproj      |   3 +-
 .../TradeTotalClothStk.dproj.local            |  86 ++++-----
 T02贸易汇总仓库/TradeTotalClothStk.identcache | Bin 2118 -> 1941 bytes
 T02贸易汇总仓库/U_TradeFinishClothInEdit.pas  | 155 +++++++++++++++++
 T02贸易汇总仓库/U_TradeFtyClothInEdit.dfm     |  27 +++
 T02贸易汇总仓库/U_TradeFtyClothInEdit.pas     |   2 +-
 T02贸易汇总仓库/U_TradeFtyClothInList.dfm     |  32 ++++
 T02贸易汇总仓库/U_TradeFtyClothInList.pas     |   3 +-
 T02贸易汇总仓库/U_TradeFtyClothOutEdit.dfm    |  27 +++
 T02贸易汇总仓库/U_TradeFtyClothOutEdit.pas    |   2 +-
 T02贸易汇总仓库/U_TradeFtyClothStkSel.dfm     |  19 ++
 T02贸易汇总仓库/U_TradeFtyClothStkSel.pas     |   2 +-
 T02贸易汇总仓库/testDll.identcache            | Bin 182 -> 164 bytes
 T04贸易明细仓库/ProjectGroup1.groupproj.local |   2 +-
 T04贸易明细仓库/TradeClothStk.dpr             |   3 +-
 T04贸易明细仓库/TradeClothStk.dproj           |   3 +-
 T04贸易明细仓库/TradeClothStk.dproj.local     | 110 ++++++------
 T04贸易明细仓库/TradeClothStk.identcache      | Bin 2558 -> 2345 bytes
 T04贸易明细仓库/U_TradeDeliveryRequest.dfm    |  42 +++++
 T04贸易明细仓库/U_TradeDeliveryRequest.pas    |  37 +++-
 .../U_TradeDeliveryRequestInPut.pas           |  54 ++++++
 T04贸易明细仓库/testDll.identcache            | Bin 182 -> 164 bytes
 40 files changed, 868 insertions(+), 207 deletions(-)
 create mode 100644 A09财务通用管理/U_BatchEditUnit.dfm
 create mode 100644 A09财务通用管理/U_BatchEditUnit.pas

diff --git a/A09财务通用管理/Financial.dpr b/A09财务通用管理/Financial.dpr
index 1c18912..284a6b1 100644
--- a/A09财务通用管理/Financial.dpr
+++ b/A09财务通用管理/Financial.dpr
@@ -43,7 +43,7 @@ uses
   U_TaxInput in 'U_TaxInput.pas' {frmTaxInput},
   U_TaxList in 'U_TaxList.pas' {frmTaxList},
   U_ZDPrice in 'U_ZDPrice.pas' {frmZDPrice},
-  U_BatchEdit in 'U_BatchEdit.pas' {frmBatchEdit},
+  U_BatchEditUnit in 'U_BatchEditUnit.pas' {frmBatchEditUnit},
   U_PlanProfitDetails in 'U_PlanProfitDetails.pas' {frmPlanProfitDetails},
   U_TaxSet in 'U_TaxSet.pas' {frmTaxSet},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj
index 20ab346..123dc75 100644
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.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>D:\D10W\项目代码\D10zzbiaoqi\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -210,8 +210,8 @@
             <Form>frmZDPrice</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="U_BatchEdit.pas">
-            <Form>frmBatchEdit</Form>
+        <DCCReference Include="U_BatchEditUnit.pas">
+            <Form>frmBatchEditUnit</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="U_PlanProfitDetails.pas">
diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local
index 4beec3f..c31dada 100644
--- a/A09财务通用管理/Financial.dproj.local
+++ b/A09财务通用管理/Financial.dproj.local
@@ -1,86 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.759,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.297,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.684,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.531,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.659,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.889,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.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.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj</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.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.014,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_BatchEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.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.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.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.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.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.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.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\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.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.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.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.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.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.256,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPrice.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.433,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FtyFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.297,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.684,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.889,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.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.759,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.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.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.014,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_BatchEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.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.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.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.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.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.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.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.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.256,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPrice.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.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.433,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FtyFileUp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.687,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxInput.pas</Transaction>
+    <Transaction>2026/05/19 09:55:17.000.113,D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\U_BatchEdit.dfm=D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\U_BatchEditUnit.dfm</Transaction>
+    <Transaction>2026/05/19 09:55:17.000.113,D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\U_BatchEdit.pas=D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\U_BatchEditUnit.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"/>
@@ -120,9 +122,9 @@
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.dfm"/>
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
+    <File Path="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
     <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"/>
@@ -155,11 +157,11 @@
     <File Path="U_TaxList.dfm"/>
     <File Path="U_ZDPrice.pas"/>
     <File Path="U_ZDPrice.dfm"/>
-    <File Path="U_BatchEdit.pas"/>
-    <File Path="U_BatchEdit.dfm"/>
     <File Path="U_PlanProfitDetails.pas"/>
     <File Path="U_PlanProfitDetails.dfm"/>
     <File Path="U_TaxSet.pas"/>
     <File Path="U_TaxSet.dfm"/>
+    <File Path="U_BatchEditUnit.pas"/>
+    <File Path="U_BatchEditUnit.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>
diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache
index 9fc2a29e35db3f79a7636f3d4c995293ff2b82b5..e157f335fd93e0f45085391dc71732c3c8bf06e6 100644
GIT binary patch
delta 519
zcmZ22v0j2vbMgTW8Rpzdr^ypIBqo37keV24JlTO=5-cRhDmVEqi^SwLObC7htIXtH
z#;nQjIT2#lSf$|nja(L!!?+=G6F7_~+c3h^$xLo$lbpPR(|mF=lHR$T(r`5(CloNs
zPG(}Zp8N{x29TH>hxlXz7Ar=ti4!GY4&!x7EJ@CAP01_?&C4vA{G3q}CNuFA&tzLB
z5xA*>tfrHDnPIMwn|z#E63K-Ule@U3QG8s>C4r(|h({9cJCJLXxfCXwa@bFtfG|>v
zO%aJZ@st(JEt6Fl#V0?2S`N}&$Si|mnK!2doDY&OVV6U4xZLDxY~mAH;1*4^lb@W$
zVhO}DlUca~Cr?5|)I>Y3$=BFLCdSH7KEf>mkFpa?R&e`4(J93uhUC)8-AsxA`tO$`

delta 503
zcmZ24v08#rbMit?8Rn|0q=^gVCg0<fpZuFkeqy1><Op_2nCM$}D;U#*Lws@{6If>Q
zLpF)Y^O<EQ=W|I<_F(j%e3=EVgO^nS*#JHs#mRcy5M5r}R+INITThPXK$tR_LuPUv
zD_r*uR!NvN$Wi;a#U?wkSWW)RX*pSe4XVlv<_wUEbXIYg`5>+!qs-*jjBw*FGD;yk
zW)iz1La)r^V@#5hbrE*=a*884g~KVaBss%1C3Erz4lPg^fIV%>DK~jB7u@`NoLrNi
zbBRp;&I}d;E74{VpDf94KiM8BtcsbWCqjY<q-3In6v8)hlV5U3OcsL}0P;crv-ITq
tOy)3e05w=3tBwK&J(3SqnWTWBBQrUOD-gv-RyJv1bQ&XhX!061NdV;}sR951

diff --git a/A09财务通用管理/ProjectGroup1.groupproj.local b/A09财务通用管理/ProjectGroup1.groupproj.local
index 7858088..9e3fed5 100644
--- a/A09财务通用管理/ProjectGroup1.groupproj.local
+++ b/A09财务通用管理/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\D10W\项目代码\D10zzbiaoqi\A09财务通用管理\Financial.dproj"/>
+		<Projects ActiveProject="D:\D10W\项目代码\D10myBiaoqi\A09财务通用管理\Financial.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/A09财务通用管理/U_BatchEditUnit.dfm b/A09财务通用管理/U_BatchEditUnit.dfm
new file mode 100644
index 0000000..92aa814
--- /dev/null
+++ b/A09财务通用管理/U_BatchEditUnit.dfm
@@ -0,0 +1,62 @@
+object frmBatchEditUnit: TfrmBatchEditUnit
+  Left = 0
+  Top = 0
+  BorderStyle = bsDialog
+  Caption = #20215#26684#20462#25913
+  ClientHeight = 120
+  ClientWidth = 381
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poScreenCenter
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 13
+  object btnOK: TcxButton
+    Left = 72
+    Top = 64
+    Width = 75
+    Height = 25
+    Caption = #20445#23384
+    ModalResult = 1
+    TabOrder = 0
+    OnClick = btnOKClick
+  end
+  object btnCancel: TcxButton
+    Left = 195
+    Top = 64
+    Width = 75
+    Height = 25
+    Caption = #21462#28040
+    ModalResult = 2
+    TabOrder = 1
+    OnClick = btnCancelClick
+  end
+  object cxLabel2: TcxLabel
+    Left = 96
+    Top = 25
+    Caption = #21333#20301
+  end
+  object QtyUnit: TcxComboBox
+    Left = 149
+    Top = 24
+    Properties.Items.Strings = (
+      'M'
+      'Kg')
+    TabOrder = 3
+    Width = 121
+  end
+  object ADOConnection1: TADOConnection
+    Left = 312
+  end
+  object ADOQuery1: TADOQuery
+    Connection = ADOConnection1
+    Parameters = <>
+    Left = 312
+    Top = 64
+  end
+end
diff --git a/A09财务通用管理/U_BatchEditUnit.pas b/A09财务通用管理/U_BatchEditUnit.pas
new file mode 100644
index 0000000..470228f
--- /dev/null
+++ b/A09财务通用管理/U_BatchEditUnit.pas
@@ -0,0 +1,95 @@
+unit U_BatchEditUnit;
+
+interface
+
+uses
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
+  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
+  Vcl.Menus, Vcl.StdCtrls, cxButtons, cxLabel, cxTextEdit, cxMaskEdit,
+  cxDropDownEdit, dxSkinsCore, dxSkinWXI, Data.DB, Data.Win.ADODB, U_BaseInput;
+
+type
+  TfrmBatchEditUnit = class(TfrmBaseInput)
+    btnOK: TcxButton;
+    btnCancel: TcxButton;
+    cxLabel2: TcxLabel;
+    ADOConnection1: TADOConnection;
+    ADOQuery1: TADOQuery;
+    QtyUnit: TcxComboBox;
+    procedure btnCancelClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure btnOKClick(Sender: TObject);
+  private
+    { Private declarations }
+
+  public
+    FDRSIDList: string;
+    Fflag: Integer;
+    { Public declarations }
+  end;
+
+var
+  frmBatchEditUnit: TfrmBatchEditUnit;
+
+implementation
+
+uses
+  U_DataLink;
+{$R *.dfm}
+
+procedure TfrmBatchEditUnit.btnCancelClick(Sender: TObject);
+begin
+  close;
+end;
+
+procedure TfrmBatchEditUnit.btnOKClick(Sender: TObject);
+begin
+  inherited;
+  if Trim(QtyUnit.Text) = '' then
+  begin
+    Application.MessageBox('�����뵥λ', '��ʾ��Ϣ', 0);
+    Exit;
+  end;
+
+  if FDRSIDList = '' then
+    Exit;
+
+  // ֻ���� Tab=2 ����������� Trade_Cloth_DR_Sub �� QtyUnit��
+  if Fflag = 2 then
+  begin
+    try
+      with ADOQuery1 do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('update Trade_Cloth_DR_Sub set QtyUnit = ' + QuotedStr(QtyUnit.Text) +
+                ' where DRSID in (' + FDRSIDList + ')');
+        ExecSQL;
+      end;
+    finally
+      ModalResult := mrOk;
+    end;
+  end;
+end;
+
+procedure TfrmBatchEditUnit.FormShow(Sender: TObject);
+begin
+  try
+    with ADOConnection1 do
+    begin
+      if not Connected then
+      begin
+        Connected := false;
+        ConnectionString := DConString;
+        LoginPrompt := false;
+        Connected := true;
+      end;
+    end;
+  except
+    application.MessageBox('���ݿ�����ʧ�ܣ�', '����', mb_Ok + MB_ICONERROR);
+  end;
+end;
+
+end.
+
diff --git a/A09财务通用管理/U_ZDPrice.dfm b/A09财务通用管理/U_ZDPrice.dfm
index 2d2c6bc..d279817 100644
--- a/A09财务通用管理/U_ZDPrice.dfm
+++ b/A09财务通用管理/U_ZDPrice.dfm
@@ -51,15 +51,24 @@ inherited frmZDPrice: TfrmZDPrice
       ImageIndex = 3
       OnClick = ToolButton3Click
     end
-    object ToolButton4: TToolButton
+    object ToolButton7: TToolButton
       Left = 213
       Top = 0
+      AutoSize = True
+      Caption = #26356#26032#21333#20301
+      ImageIndex = 3
+      Visible = False
+      OnClick = ToolButton7Click
+    end
+    object ToolButton4: TToolButton
+      Left = 300
+      Top = 0
       Caption = #26597#30475#26126#32454
       ImageIndex = 8
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 296
+      Left = 383
       Top = 0
       AutoSize = True
       Caption = #23457#26680
@@ -67,7 +76,7 @@ inherited frmZDPrice: TfrmZDPrice
       OnClick = ToolButton5Click
     end
     object ToolButton6: TToolButton
-      Left = 359
+      Left = 446
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
@@ -75,7 +84,7 @@ inherited frmZDPrice: TfrmZDPrice
       OnClick = ToolButton6Click
     end
     object ToolButton1: TToolButton
-      Left = 446
+      Left = 533
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -83,7 +92,7 @@ inherited frmZDPrice: TfrmZDPrice
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 533
+      Left = 620
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -826,7 +835,7 @@ inherited frmZDPrice: TfrmZDPrice
     TabOrder = 3
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 2
-    Properties.TabIndex = 0
+    Properties.TabIndex = 2
     Properties.Tabs.Strings = (
       #22383#24067
       #24453#26816#24067
diff --git a/A09财务通用管理/U_ZDPrice.pas b/A09财务通用管理/U_ZDPrice.pas
index 01b5a29..eb68759 100644
--- a/A09财务通用管理/U_ZDPrice.pas
+++ b/A09财务通用管理/U_ZDPrice.pas
@@ -121,6 +121,7 @@ type
     Tv3Column20: TcxGridDBColumn;
     Tv4Column19: TcxGridDBColumn;
     Tv4Column20: TcxGridDBColumn;
+    ToolButton7: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -140,6 +141,7 @@ type
     procedure ToolButton6Click(Sender: TObject);
     procedure Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure Tv4CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure ToolButton7Click(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -152,7 +154,7 @@ type
 implementation
 
 uses
-  U_DataLink, U_RtFun, U_BatchEdit, U_ZDPriceDetails, U_PlanProfitDetails;
+  U_DataLink, U_RtFun, U_BatchEdit, U_ZDPriceDetails, U_PlanProfitDetails,U_BatchEditUnit;
 
 
 {$R *.dfm}
@@ -914,6 +916,92 @@ begin
   end;
 end;
 
+procedure TfrmZDPrice.ToolButton7Click(Sender: TObject);
+var
+  PDRSID, POrderNo: string;
+  Bookmark: TBookmark;
+begin
+  inherited;
+
+  if cxTabControl1.TabIndex <> 2 then
+    Exit;
+
+  Bookmark := CDS_2.GetBookmark;
+  PDRSID := '';
+  POrderNo := '';
+
+  if not CDS_2.Locate('ssel', True, []) then
+  begin
+    Application.MessageBox('请选择数据', '提示信息', 0);
+    Exit;
+  end;
+
+  CDS_2.DisableControls;
+  Tv3.BeginUpdate;
+  try
+    with CDS_2 do
+    begin
+      First;
+      while not Eof do
+      begin
+        if FieldByName('ssel').AsBoolean then
+        begin
+          if PDRSID = '' then
+            PDRSID := '''' + FieldByName('DRSID').AsString + ''''
+          else
+            PDRSID := PDRSID + ',''' + FieldByName('DRSID').AsString + '''';
+
+          if POrderNo = '' then
+            POrderNo := '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + ''''
+          else
+            POrderNo := POrderNo + ',''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
+        end;
+        Next;
+      end;
+    end;
+  finally
+    CDS_2.EnableControls;
+    Tv3.EndUpdate;
+  end;
+
+  if PDRSID = '' then
+  begin
+    Application.MessageBox('请选择数据', '提示信息', 0);
+    Exit;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select * from Trade_Plan_Main where OrderNo in (' + POrderNo + ') and status in(''10'',''12'')');
+    Open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    Application.MessageBox('计划单已完成或已清算，无法修改', '提示', 0);
+    Exit;
+  end;
+
+  try
+    frmBatchEditUnit := TfrmBatchEditUnit.Create(Application);
+    with frmBatchEditUnit do
+    begin
+      FDRSIDList := PDRSID;
+      Fflag := 2;
+      if ShowModal = mrOk then
+      begin
+        Self.InitGrid();
+      end;
+      if CDS_2.BookmarkValid(Bookmark) then
+        CDS_2.GotoBookmark(Bookmark);
+    end;
+  finally
+    frmBatchEditUnit.Free;
+  end;
+end;
+
 procedure TfrmZDPrice.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
   mColumn: TcxGridDBColumn;
@@ -978,6 +1066,7 @@ end;
 
 procedure TfrmZDPrice.cxTabControl1Change(Sender: TObject);
 begin
+  ToolButton7.Visible := (cxTabControl1.TabIndex = 2);
   InitGrid();
 end;
 
diff --git a/A09财务通用管理/testDll.identcache b/A09财务通用管理/testDll.identcache
index 8859c673a7a44e8c3f42686a2a1adf57ad338038..0a66907cf0a2379ef89efc73bd80fce481edf77f 100644
GIT binary patch
delta 29
gcmZ3&xP+0BX<~p3b8e;6L<O0N-I5boBq1DQ0D2Y(H2?qr

delta 53
zcmZ3&xP(!GiGhK^$;B$h#n2!;=H<ej&u6cDvU~CK1&tt)s;Z=kg~k(EB$>f1nTa-%
E01L1bH2?qr

diff --git a/A09财务通用管理/testDll.res b/A09财务通用管理/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5

delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl

diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local
index 10a022a..1ac8ace 100644
--- a/B04采购计划管理/PurchasePlan.dproj.local
+++ b/B04采购计划管理/PurchasePlan.dproj.local
@@ -12,9 +12,9 @@
     <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.422,=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>
@@ -50,8 +50,8 @@
     <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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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>
@@ -59,7 +59,7 @@
     <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>
+    <Transaction>2026/05/18 15:54:55.000.800,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10myBiaoqi"/>
diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache
index 17edc05ac0b5fe396fdd09344a785649652e8947..118816b5e43619af741b49e1a373339187852ff2 100644
GIT binary patch
delta 202
zcmZ24yk2;M`Q$ndrODikViV8GOf-+1yoXVG@&YE7$q(5@C$}-0O@7H@HF-X>{NxXe
zQIoA1y(fDySp&uFCvRY5oBWqaWU?Bk71RWY$==LTllL+EO-|rcn*4xSXtEZEG@M<}
zB0c#eo7LpiY;qG{T1~ED&6&&tH0A~C;mOSGITK$7P0nWzo@~J;GdYn%7U&8Sps68~
gTbYU`>oc)W)@K!l*up9`nU7NfXsSQl<Z~?2093m|_W%F@

delta 170
zcmZ24yk2;M`NZzH$@0t=6Z2&zpJof1%*NzBS(edk@=A7-$!i#+CI>QEPh^pw9KaDg
zc^(Vf<WGzuK-D3Wdzh>y_cF>)u4OZsyqsBTaxAO;WC0fc$qAhPKso!#i#eo###v4N
z$dWU84(s8`Gg;&&$Fo>Xj%Ul6EXy7|@udk+xyj_O%+iw!*e!uZDoy^+ZUm&QCVvNN
TeF`*QfJJGtJ-ftYZ%$DF8Z0<V

diff --git a/B04采购计划管理/U_ClothRSPlanList.dfm b/B04采购计划管理/U_ClothRSPlanList.dfm
index 9b465c2..aa6669f 100644
--- a/B04采购计划管理/U_ClothRSPlanList.dfm
+++ b/B04采购计划管理/U_ClothRSPlanList.dfm
@@ -283,7 +283,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         Width = 104
       end
       object Tv1Column9: TcxGridDBColumn
-        Caption = #23454#38469#37319#36141#25968#37327
+        Caption = #23454#38469#26579#33394#25968#37327
         DataBinding.FieldName = 'SCGQty'
         DataBinding.IsNullValueType = True
         GroupSummaryAlignment = taCenter
@@ -663,8 +663,6 @@ 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采购计划管理/U_GXSel.dfm b/B04采购计划管理/U_GXSel.dfm
index 0ad89ff..3f9dada 100644
--- a/B04采购计划管理/U_GXSel.dfm
+++ b/B04采购计划管理/U_GXSel.dfm
@@ -25,6 +25,7 @@ inherited frmGXSel: TfrmGXSel
     object TV1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <>
@@ -39,12 +40,14 @@ inherited frmGXSel: TfrmGXSel
       object TV1Column3: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'GlideIdx'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 41
       end
       object TV1Column1: TcxGridDBColumn
         Caption = #24037#24207#21495
         DataBinding.FieldName = 'ProcessNO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 151
@@ -52,6 +55,7 @@ inherited frmGXSel: TfrmGXSel
       object TV1Column2: TcxGridDBColumn
         Caption = #24037#24207
         DataBinding.FieldName = 'ProcessName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 227
@@ -59,6 +63,7 @@ inherited frmGXSel: TfrmGXSel
       object TV1Column4: TcxGridDBColumn
         Caption = #24037#24207#31867#22411
         DataBinding.FieldName = 'ProcessTypeName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 169
       end
diff --git a/B04采购计划管理/U_GXSel.pas b/B04采购计划管理/U_GXSel.pas
index f803951..e7635c2 100644
--- a/B04采购计划管理/U_GXSel.pas
+++ b/B04采购计划管理/U_GXSel.pas
@@ -10,7 +10,8 @@ uses
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
-  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput;
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmGXSel = class(TfrmBaseHelp)
diff --git a/T02贸易汇总仓库/ProjectGroup1.groupproj.local b/T02贸易汇总仓库/ProjectGroup1.groupproj.local
index fbd9772..13bb048 100644
--- a/T02贸易汇总仓库/ProjectGroup1.groupproj.local
+++ b/T02贸易汇总仓库/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T02贸易汇总仓库\TradeTotalClothStk.dproj"/>
+		<Projects ActiveProject="D:\D10W\项目代码\D10myBiaoqi\T02贸易汇总仓库\TradeTotalClothStk.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dpr b/T02贸易汇总仓库/TradeTotalClothStk.dpr
index 0023451..1c77108 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dpr
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dpr
@@ -31,7 +31,8 @@ uses
   U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
   U_SLT in '..\A02������Ʒ����\U_SLT.pas' {frmSLT: TFrame},
   U_ClothTotalFileUp in 'U_ClothTotalFileUp.pas' {frmClothTotalFileUp},
-  U_LabelPrintPV in 'U_LabelPrintPV.pas' {frmLabelPrintPV};
+  U_LabelPrintPV in 'U_LabelPrintPV.pas' {frmLabelPrintPV},
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
 
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj b/T02贸易汇总仓库/TradeTotalClothStk.dproj
index 93cb54f..e633754 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj
+++ b/T02贸易汇总仓库/TradeTotalClothStk.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\T02贸易汇总仓库\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10W\项目代码\D10myBiaoqi\T02贸易汇总仓库\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -167,6 +167,7 @@
             <Form>frmLabelPrintPV</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/T02贸易汇总仓库/TradeTotalClothStk.dproj.local b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
index 4d890d3..41aa1ef 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.719,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T02贸易汇总仓库\U_LabelPrintPV.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.217,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.475,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.147,D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.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.974,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\D10myBiaoqi\A02基础产品管理\U_SLT.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.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.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.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.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.478,=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.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.295,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.699,=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.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.719,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T02贸易汇总仓库\U_LabelPrintPV.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.475,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.147,D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.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.295,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.974,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.111,=D:\Dp10Repo\项目代码\D10myBiaoqi\A02基础产品管理\U_SLT.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.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.478,=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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.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.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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>2026/05/19 10:49:12.956,=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"/>
@@ -65,7 +66,7 @@
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
     <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.pas"/>
     <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.dfm"/>
-    <File Path="..\..\..\..\Dp10Repo"/>
+    <File Path="D:\D10W"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
     <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
@@ -84,6 +85,7 @@
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.dfm"/>
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
+    <File Path="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
     <File Path="U_DataLink.pas"/>
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.identcache b/T02贸易汇总仓库/TradeTotalClothStk.identcache
index 9798fe7b07e28f26304cb05d567d21a3f3e1a001..86c198687bd860034ef537012abaf6988f7d7493 100644
GIT binary patch
literal 1941
zcmbVNL5tHs814V?t|(fvJ$kZDw%tm1Et_-~mq3{|<967|Oq`jZy>&0^Rj8ooL5l~)
z!-C*JTl_a|<NgcNltem{X{3RW5O|OGy?Niutx~B}wH~_Go^k5lOnyZluIIDQ(WlGR
z7k^kofIdfV)i7>G@1r+gqi=8LzsGK;Yf?V|WN1TN4gilyvg>xr7KA;F`g?}!L5|Kz
z45|SR4<HU?$erzwCJ90zV;U(&E7~zCe}4R2z8f#UzgmuF^VxVYT}f|1VPRaS%$GUu
zrkt5{XTTt=hs0goo$j#{KV{UT6s1*CH7bjb(`Yi9Proe2m(lekdVLks*)2yV+b<;3
zjfDtm0|u0#?xl>`P#foA0RdWwT*yMode|u<9(}PgaLpt`ALya|mkowIGvtE$Cg(Ep
zzJlC1fY3fWIO;yOpB%}+W(w4vfzGxT=t10Oh=}%y%zC&ptBI)?I8*>!M;LaL#McU$
z)s;(>9)iGz$};RK)M3DbiOfW>EiTGlz_L}2Uy8dyXROm!$KE~Nx|mi{BeQgGBxYSy
z404Vr$=O{qg==%8o<m|)lRTq2<+m-s@xH`6e`Y<+tH5HPRU!YPD+hO%c<uWErb7sG
zraCTk$uW#|*Gj*MBw#kckeieU2Kpk0eoOtIW7-4w1TcBR;`&$pstN)610NF6iAM#V
Y%vtc~Y9X#H-v9K@7H8TRkQ_t)0vzVkP5=M^

literal 2118
zcmb_dL2uJA813)iM~t)xkl-|ubrb@MnxqJbRJn~=tvR-_UBPzhE^tK(5(o}ZaR70c
zgv0?_@o(CO{R`4e$|T#F8kL-K`QG>Zp5OD8Mx$|W?^YyX!Xk$?tuACVI-CB^KAtY-
zU$W09k<+w}j|T|Q=P25>th337?CrPg`@6-TGz$AJ7(ncCMC1+wB1bE~``f_oB@ELe
z2z`iE+^ZTc8xJrVHmxXz0v(W?)g2(9i-g9>+Hkf**jO9hbn#t?nM%5=Ew0o!u&lp7
zf34o9iqZiGG4wDX22FZ(;9KYLs~@jdllfwvE@x>}fCp3pY-1`%zC7HC885xef39mQ
zO4)-Ehp;^+QJeB4SO1Cg*rY*?dlpzGl3_paLQUF-8nH{HHNzr;JitMsy4KR54QI~J
z9rn9Hetvb_)y6BC>A@;|=#XdBVD}9Txa3tvVEA&Mqu3q`NfTQLmD^V7EJFVPFdu3m
zxwZkdbvhj&fs4qY%FEN{YiPDBB^ZtpNMxAT2Z&YhP95;p^3yDvP8PGT%k(5Won~)d
z<wpB%prYQ?P<1yRArjLU>wKIWq+<MsOI)Ss*4+^Hi@R8~LmOeJNAPyF0vFv-<iw^4
z<4_1hi6JmG%&%&QeJCA_*Fvij*Q#K1Ph329UQdPJ<Y_s;bO3M<aCNvwH5!^C*A$Q=
aLr*-_e5nl6rLT?;FcdZ=l7pc%?D+==`YC$=

diff --git a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
index ad52c0d..2b80455 100644
--- a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
+++ b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
@@ -78,6 +78,8 @@ type
   private
     { Private declarations }
     function SaveCKData(): Boolean;
+
+    function ValidateInData(ARow: Integer): Boolean;
   public
     { Public declarations }
     FBCId, canshu3, FSTKName, FKHName: string;
@@ -93,6 +95,138 @@ uses
 
 {$R *.dfm}
 
+function TfrmTradeFinishClothInEdit.ValidateInData(ARow: Integer): Boolean;
+var
+  IOType, FromSubId, FromOrdNo, C_Code: string;
+  HasPlan, HasProcess, HasOutRecord: Boolean;
+  MaxGlideIdx: Integer;
+  LastProcessName: string;
+begin
+  Result := True;
+
+  IOType := Trim(CDS_Sub.FieldByName('IOType').AsString);
+  FromSubId := Trim(CDS_Sub.FieldByName('FromSubId').AsString);
+  FromOrdNo := Trim(CDS_Sub.FieldByName('FromOrdNo').AsString);
+  C_Code := Trim(CDS_Sub.FieldByName('C_Code').AsString);
+
+  if IOType = '�ɹ����' then
+  begin
+    if FromSubId = '' then
+    begin
+      Application.MessageBox(PChar('��' + IntToStr(ARow) + '�У��ɹ�����������ɹ��ƻ�����'), PChar('��֤ʧ��'), MB_ICONERROR);
+      Result := False;
+      Exit;
+    end;
+
+    with ADOQueryTemp do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('SELECT 1 FROM Pur_ClothPlan_sub WHERE SubId = :SubId');
+      Parameters.ParamByName('SubId').Value := FromSubId;
+      Open;
+      HasPlan := not IsEmpty;
+      Close;
+    end;
+
+    if not HasPlan then
+    begin
+      Application.MessageBox(PChar('��' + IntToStr(ARow) + '�У������IJɹ��ƻ��������ڣ�'), PChar('��֤ʧ��'), MB_ICONERROR);
+      Result := False;
+      Exit;
+    end;
+  end
+  else if IOType = '�ӹ����' then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('SELECT TOP 1 GlideIdx, ProcessName');
+      SQL.Add('FROM BS_Cloth_Glide g');
+      SQL.Add('INNER JOIN Bs_Cloth_Info i ON g.BCIID = i.BCIID');
+      SQL.Add('WHERE i.C_Code = :C_Code');
+      SQL.Add('ORDER BY GlideIdx DESC');
+      Parameters.ParamByName('C_Code').Value := C_Code;
+      Open;
+
+      HasProcess := not IsEmpty;
+      if HasProcess then
+      begin
+        MaxGlideIdx := FieldByName('GlideIdx').AsInteger;
+        LastProcessName := Trim(FieldByName('ProcessName').AsString);
+      end;
+      Close;
+    end;
+
+    if not HasProcess then
+    begin
+      if FromOrdNo = '' then
+      begin
+        Application.MessageBox(PChar('��' + IntToStr(ARow) + '�У��ӹ���������������ţ�'), PChar('��֤ʧ��'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('SELECT 1 FROM BS_Cloth_IO');
+        SQL.Add('WHERE FromOrdNO = :FromOrdNo');
+        SQL.Add('AND ioFlag = ''����''');
+        SQL.Add('AND ISNULL(stkName, '''') = ''ó�׳�Ʒ''');
+        Parameters.ParamByName('FromOrdNo').Value := FromOrdNo;
+        Open;
+        HasOutRecord := not IsEmpty;
+        Close;
+      end;
+
+      if not HasOutRecord then
+      begin
+        Application.MessageBox(PChar('��' + IntToStr(ARow) + '�У��ò�Ʒ�޹��չ��򣬱����ж�Ӧ��ó�׳�Ʒ�����¼������⣡'), PChar('��֤ʧ��'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+    end
+    else
+    begin
+      if FromSubId = '' then
+      begin
+        Application.MessageBox(PChar('��' + IntToStr(ARow) + '�У��ӹ�����������ɹ��ƻ�����'), PChar('��֤ʧ��'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('SELECT 1 FROM Pur_ClothPlan_sub s');
+        SQL.Add('INNER JOIN Pur_ClothPlan_Main m ON s.PurMId = m.PurMId');
+        SQL.Add('INNER JOIN BS_Cloth_IO io ON io.FromOrdNO = m.PurNo');
+        SQL.Add('WHERE s.SubId = :SubId');
+        SQL.Add('AND m.GX = :GX');
+        SQL.Add('AND io.stkname = ''ó����ӹ���''');
+        SQL.Add('AND io.ioFlag = ''����''');
+        Parameters.ParamByName('SubId').Value := FromSubId;
+        Parameters.ParamByName('GX').Value := LastProcessName;
+        Open;
+        HasOutRecord := not IsEmpty;
+        Close;
+      end;
+
+      if not HasOutRecord then
+      begin
+        Application.MessageBox(PChar(Format('��%d�У��ò�Ʒ��%d�����򣬱��������һ������"%s"��Ӧ��ó����ӹ��������¼������⣡',
+          [ARow, MaxGlideIdx, LastProcessName])), PChar('��֤ʧ��'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+    end;
+  end;
+end;
+
 procedure TfrmTradeFinishClothInEdit.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -337,6 +471,8 @@ begin
 end;
 
 procedure TfrmTradeFinishClothInEdit.TBSaveClick(Sender: TObject);
+var
+  RowIndex: Integer;
 begin
   if CDS_Sub.IsEmpty then
     Exit;
@@ -383,6 +519,25 @@ begin
     Exit;
   end;
 
+  CDS_Sub.DisableControls;
+  try
+    CDS_Sub.First;
+    RowIndex := 1;
+    while not CDS_Sub.Eof do
+    begin
+      if not ValidateInData(RowIndex) then
+      begin
+        // ��֤ʧ�ܣ���λ�������в��˳�
+        Tv1.DataController.FocusedRowIndex := RowIndex - 1;
+        Exit;
+      end;
+      CDS_Sub.Next;
+      Inc(RowIndex);
+    end;
+  finally
+    CDS_Sub.EnableControls;
+  end;
+
   if SaveCKData() then
   begin
     Application.MessageBox('����ɹ�!', '��ʾ', 0);
diff --git a/T02贸易汇总仓库/U_TradeFtyClothInEdit.dfm b/T02贸易汇总仓库/U_TradeFtyClothInEdit.dfm
index 76629cd..1bbe677 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothInEdit.dfm
+++ b/T02贸易汇总仓库/U_TradeFtyClothInEdit.dfm
@@ -24,6 +24,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
     TabOrder = 0
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource3
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -55,6 +56,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column6: TcxGridDBColumn
         Caption = #20837#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 83
@@ -62,6 +64,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column2: TcxGridDBColumn
         Caption = #20837#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -71,6 +74,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column4: TcxGridDBColumn
         Caption = #20837#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.DropDownRows = 20
@@ -86,6 +90,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1FactoryName: TcxGridDBColumn
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -101,6 +106,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object Tv1Column1: TcxGridDBColumn
         Caption = #23384#25918#21333#20301
         DataBinding.FieldName = 'StkCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -115,6 +121,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object Tv1Column4: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -129,6 +136,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object Tv1Column8: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -141,6 +149,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1SPName: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -154,6 +163,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1SPSpec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -168,24 +178,28 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1SPMF: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 75
       end
       object v1Column8: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 73
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object v1Column1: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         VisibleForCustomization = False
         Width = 92
@@ -193,6 +207,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column9: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 68
@@ -200,6 +215,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v2Column6: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 92
@@ -207,6 +223,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1QtyUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -219,6 +236,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column5: TcxGridDBColumn
         Caption = #24211#20301
         DataBinding.FieldName = 'StkPosition'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -233,6 +251,7 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column7: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -244,48 +263,56 @@ inherited frmTradeFtyClothInEdit: TfrmTradeFtyClothInEdit
       object v1Column12: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column5: TcxGridDBColumn
         Caption = #30721#23610
         DataBinding.FieldName = 'Yardstick'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 68
       end
       object Tv1Column6: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 67
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column11: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
diff --git a/T02贸易汇总仓库/U_TradeFtyClothInEdit.pas b/T02贸易汇总仓库/U_TradeFtyClothInEdit.pas
index f005ac9..8dc193f 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothInEdit.pas
+++ b/T02贸易汇总仓库/U_TradeFtyClothInEdit.pas
@@ -11,7 +11,7 @@ uses
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput,
-  System.ImageList, Vcl.ImgList;
+  System.ImageList, Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeFtyClothInEdit = class(TfrmBaseInput)
diff --git a/T02贸易汇总仓库/U_TradeFtyClothInList.dfm b/T02贸易汇总仓库/U_TradeFtyClothInList.dfm
index 54f0d3c..51761bf 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothInList.dfm
+++ b/T02贸易汇总仓库/U_TradeFtyClothInList.dfm
@@ -267,6 +267,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <
         item
@@ -307,6 +308,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column7: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'ssel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -315,6 +317,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object v1Column6: TcxGridDBColumn
         Caption = #20837#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 83
@@ -323,6 +326,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #20837#24211#26102#38388
         DataBinding.FieldName = 'ioTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -333,6 +337,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #20837#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -346,6 +351,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -361,6 +367,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -374,6 +381,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 79
@@ -381,6 +389,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         VisibleForCustomization = False
         Width = 89
@@ -388,12 +397,14 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column4: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
       object v1Column13: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 67
@@ -401,6 +412,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object v1Column11: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -408,6 +420,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column6: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 75
@@ -415,6 +428,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object v1Column15: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 65
@@ -423,6 +437,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 85
@@ -431,6 +446,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -444,6 +460,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #24211#20301
         DataBinding.FieldName = 'StkPosition'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -457,6 +474,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object v1Column19: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 79
@@ -465,12 +483,14 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
         Tag = 2
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 79
       end
       object v1Column20: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 63
@@ -478,6 +498,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -485,6 +506,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column5: TcxGridDBColumn
         Caption = #30721#23610
         DataBinding.FieldName = 'Yardstick'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -492,6 +514,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column1: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -499,12 +522,14 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column2: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 67
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -512,6 +537,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -519,6 +545,7 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column9: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -526,28 +553,33 @@ inherited frmTradeFtyClothInList: TfrmTradeFtyClothInList
       object Tv1Column11: TcxGridDBColumn
         Caption = #25351#31034#21333#21495
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #23384#25918#24037#21378
         DataBinding.FieldName = 'StkCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
       object Tv1Column13: TcxGridDBColumn
         Caption = #21046#21333#21592
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column14: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column15: TcxGridDBColumn
         Caption = #22797#21333#21495
         DataBinding.FieldName = 'FOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
     end
diff --git a/T02贸易汇总仓库/U_TradeFtyClothInList.pas b/T02贸易汇总仓库/U_TradeFtyClothInList.pas
index 3b9af84..3208da9 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothInList.pas
+++ b/T02贸易汇总仓库/U_TradeFtyClothInList.pas
@@ -12,7 +12,8 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeFtyClothInList = class(TfrmBaseList)
diff --git a/T02贸易汇总仓库/U_TradeFtyClothOutEdit.dfm b/T02贸易汇总仓库/U_TradeFtyClothOutEdit.dfm
index 6b96169..18fe536 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothOutEdit.dfm
+++ b/T02贸易汇总仓库/U_TradeFtyClothOutEdit.dfm
@@ -87,6 +87,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource3
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -121,6 +122,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column13: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'ToOrdNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -134,6 +136,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column6: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 91
@@ -141,6 +144,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column2: TcxGridDBColumn
         Caption = #20986#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -150,6 +154,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1CRType: TcxGridDBColumn
         Caption = #20986#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.DropDownRows = 20
@@ -167,6 +172,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column1: TcxGridDBColumn
         Caption = #37319#36141#21152#24037#21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -183,6 +189,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column2: TcxGridDBColumn
         Caption = #20986#21040#21333#20301
         DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -197,6 +204,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column3: TcxGridDBColumn
         Caption = #23384#25918#21333#20301
         DataBinding.FieldName = 'StkCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -204,6 +212,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column5: TcxGridDBColumn
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -211,6 +220,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v2Column1: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -224,6 +234,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column8: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -232,6 +243,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column10: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 67
@@ -239,12 +251,14 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column7: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 57
       end
       object v1Column11: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -252,6 +266,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column7: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -259,6 +274,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1CheJian: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         HeaderAlignmentHorz = taCenter
         Width = 69
@@ -266,12 +282,14 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column14: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object v2Column6: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 85
@@ -279,6 +297,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column3: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -286,17 +305,20 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object v1Column12: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         Width = 79
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -304,6 +326,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -311,12 +334,14 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column6: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -324,6 +349,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column9: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -331,6 +357,7 @@ inherited frmTradeFtyClothOutEdit: TfrmTradeFtyClothOutEdit
       object Tv1Column10: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
diff --git a/T02贸易汇总仓库/U_TradeFtyClothOutEdit.pas b/T02贸易汇总仓库/U_TradeFtyClothOutEdit.pas
index 44152c6..f594587 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothOutEdit.pas
+++ b/T02贸易汇总仓库/U_TradeFtyClothOutEdit.pas
@@ -11,7 +11,7 @@ uses
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit,
   StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseInput, System.ImageList, Vcl.ImgList;
+  U_BaseInput, System.ImageList, Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeFtyClothOutEdit = class(TfrmBaseInput)
diff --git a/T02贸易汇总仓库/U_TradeFtyClothStkSel.dfm b/T02贸易汇总仓库/U_TradeFtyClothStkSel.dfm
index ba5cd24..5c9b27c 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothStkSel.dfm
+++ b/T02贸易汇总仓库/U_TradeFtyClothStkSel.dfm
@@ -180,6 +180,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <
         item
@@ -249,6 +250,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column17: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -258,6 +260,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column11: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -265,6 +268,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column6: TcxGridDBColumn
         Caption = #20837#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 87
@@ -273,6 +277,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -289,6 +294,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -303,6 +309,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -311,6 +318,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column4: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -318,6 +326,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column5: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -325,6 +334,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 124
@@ -332,6 +342,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column7: TcxGridDBColumn
         Caption = #20837#24211#21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 62
@@ -339,6 +350,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object v1Column9: TcxGridDBColumn
         Caption = #20837#24211#25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 63
@@ -347,12 +359,14 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #21305#37325
         DataBinding.FieldName = 'PieceWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
       object v1Column1: TcxGridDBColumn
         Caption = #24211#23384#21305#25968
         DataBinding.FieldName = 'StkPiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -361,6 +375,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #24211#23384#25968#37327
         DataBinding.FieldName = 'STYQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -370,6 +385,7 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -383,18 +399,21 @@ inherited frmTradeFtyClothStkSel: TfrmTradeFtyClothStkSel
       object Tv1Column2: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
diff --git a/T02贸易汇总仓库/U_TradeFtyClothStkSel.pas b/T02贸易汇总仓库/U_TradeFtyClothStkSel.pas
index 50a312e..d9d3a70 100644
--- a/T02贸易汇总仓库/U_TradeFtyClothStkSel.pas
+++ b/T02贸易汇总仓库/U_TradeFtyClothStkSel.pas
@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList,
-  Vcl.ImgList;
+  Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeFtyClothStkSel = class(TfrmBaseHelp)
diff --git a/T02贸易汇总仓库/testDll.identcache b/T02贸易汇总仓库/testDll.identcache
index e96d4e6d063688871706827580103fc903c00b0e..1ad8770c60ab5e434450830edf14c02bd79b5f16 100644
GIT binary patch
delta 75
zcmdnSxP(!GiGhK^#l<Sd#n2!;=H<ej&u6cDvU~CK1&tt)+)Ag3jixeAc;#g#x{3n;
DY&jpZ

delta 93
zcmZ3&xQ$VhiGhK^+tn(jBsI4n#-+f}ASksUKj!7aozG{ld$N1+^97ADE`|nGRY?;I
Oja7Y#Qz$dhMiKzb1}BaH

diff --git a/T04贸易明细仓库/ProjectGroup1.groupproj.local b/T04贸易明细仓库/ProjectGroup1.groupproj.local
index dcea94b..0ad5aa1 100644
--- a/T04贸易明细仓库/ProjectGroup1.groupproj.local
+++ b/T04贸易明细仓库/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T04贸易明细仓库\TradeClothStk.dproj"/>
+		<Projects ActiveProject="D:\D10W\项目代码\D10myBiaoqi\T04贸易明细仓库\TradeClothStk.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/T04贸易明细仓库/TradeClothStk.dpr b/T04贸易明细仓库/TradeClothStk.dpr
index 4b4cb0b..7c12d9d 100644
--- a/T04贸易明细仓库/TradeClothStk.dpr
+++ b/T04贸易明细仓库/TradeClothStk.dpr
@@ -35,7 +35,8 @@ uses
   U_TradeKCListSel in 'U_TradeKCListSel.pas' {frmTradeKCListSel},
   U_DeliTradePlanSel in 'U_DeliTradePlanSel.pas' {frmDeliTradePlanSel},
   U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
-  U_TradeClothSplitWeight in 'U_TradeClothSplitWeight.pas' {frmTradeClothSplitWeight};
+  U_TradeClothSplitWeight in 'U_TradeClothSplitWeight.pas' {frmTradeClothSplitWeight},
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
 
diff --git a/T04贸易明细仓库/TradeClothStk.dproj b/T04贸易明细仓库/TradeClothStk.dproj
index 6a0917b..f270667 100644
--- a/T04贸易明细仓库/TradeClothStk.dproj
+++ b/T04贸易明细仓库/TradeClothStk.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\T04贸易明细仓库\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10W\项目代码\D10myBiaoqi\T04贸易明细仓库\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -181,6 +181,7 @@
             <Form>frmTradeClothSplitWeight</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/T04贸易明细仓库/TradeClothStk.dproj.local b/T04贸易明细仓库/TradeClothStk.dproj.local
index ea971a6..b79e2a1 100644
--- a/T04贸易明细仓库/TradeClothStk.dproj.local
+++ b/T04贸易明细仓库/TradeClothStk.dproj.local
@@ -1,61 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.684,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\TradeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\InformationBase.dproj</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.059,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.890,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothInListNew.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.355,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeKCListSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.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.296,=D:\Dp10Repo\项目代码\D10myBiaoqi\T04贸易明细仓库\U_TradeClothSplitWeight.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.527,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_DeliTradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.760,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.733,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeStockListSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.808,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\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.097,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.900,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.903,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothStkListNew.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_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.434,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.793,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.997,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothOutEdit.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.868,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothWaitStorage.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.370,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\Unit1.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.163,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.520,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothOutListNew.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.882,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T04贸易明细仓库\U_TradeClothInspList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.406,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T04贸易明细仓库\U_TradeClothInspList.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.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.684,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\TradeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\InformationBase.dproj</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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.890,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothInListNew.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.355,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeKCListSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.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.296,=D:\Dp10Repo\项目代码\D10myBiaoqi\T04贸易明细仓库\U_TradeClothSplitWeight.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.527,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_DeliTradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.760,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.733,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeStockListSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.808,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.059,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.097,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.900,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.434,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.497,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothStkListNew.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_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.903,=D:\Dp10Repo\项目代码\华府\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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.793,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothOutEdit.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.868,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothWaitStorage.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.370,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\Unit1.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.163,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.520,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothOutListNew.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.882,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T04贸易明细仓库\U_TradeClothInspList.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.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.406,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T04贸易明细仓库\U_TradeClothInspList.pas</Transaction>
+    <Transaction>2026/05/19 13:48:09.988,=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"/>
@@ -74,7 +75,7 @@
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
     <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.pas"/>
     <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.dfm"/>
-    <File Path="..\..\..\..\Dp10Repo"/>
+    <File Path="D:\D10W"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
     <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
@@ -93,6 +94,7 @@
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.dfm"/>
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
+    <File Path="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
     <File Path="U_DataLink.pas"/>
diff --git a/T04贸易明细仓库/TradeClothStk.identcache b/T04贸易明细仓库/TradeClothStk.identcache
index a94a8d2172d6d631578082b896448b05813e39b2..26268ea7e190baf9fc04f01f0e79616928f64c65 100644
GIT binary patch
literal 2345
zcmb_eL66cv80DXM(`b}*jVEu=vVhC7xCM!uCgg*TFxlx$otb9krWcQ1Fma<7jThs=
zlLwXfZ*Xz{g)OA4JDpN!XwtNYzL)pC?|t9&Mxju+X+3nTJ)`URL7(8kp5eGi;30K7
zy)p<?L&PuoAi^(K*RA!CI`spoVs0le?GZ<4KcG%@cY4R|@TsB>W7OrRpYspjX4B8}
zkFO%R-nfi`J;zSlc<}f8kBjrk#rd20^!02y`SWWM(piY$HU}5A2v8dlmAR6i86-3?
zJ>4B6rnm(hJeBcItWn<@D@DlT7`C-(3&Tvp<mf1n4J>36ovEUVF?&)}7gLv=?KAEz
zBcwvBF?4HTRU|D!B4(BIUd)-4Gk8(u*fj$onP&>2BJU=U*Af}nC$(npk$u!ufd?^g
z>oOMp9+;7{nn;#1c}s?I`SShz?U(u2ceCG7%uVL`K*t)kat^kN=My$YNJDp=NtZT>
zSE1?xmbPRZhDi1FeoVh=<F#fi3*|@%%&2Bhm@z!HB^v9ZoY(0yrm1#aHo_2w#-CVE
zb*nLt>ka55atOYS5?eD*Bo=fnj%k9emFZG;59>5#FKiMJW4Wr83@-v=13|)MRB{;T
zhGQ2?&6cMr;@6yLL&Ew%o&Z-P+uVVh;hL?uIMJx=MVX9qNlF-uJVa$D9Aa=)xf$nt
wWQ+=_<*e{(;zP%auFqG04&h6E1JX4)Njc6pNuT~l;XkoH!Lp0+aFlT3ADrWUg#Z8m

literal 2558
zcmcIlO>fgc5X~>)ClrTI2~NdMOK2z|b{e%<iZ=0(tg_x+)*JQX1Q(86f<y%u5EsOO
z69*vT--L$#3+z;K>5d&@x#VO;+BfgLnR#=iQmJg!?)Vx)={vG&wLl90^uzc0yDzip
z$NBpgzEic1j(U`cXVhP}tkdUj=dVA_Kfjs%ocQf-gY<wsB+>=FCP@^-rN0MdaBUGv
z!Vg_wChScFE5|)X`&G;Lh6-R~%>50a!kFBivwI(yG!dR4gj~U%b>sKfZzso-ljB$O
z>C4%4^6N(;+fyU}n+ZL1C8N3nbTC8)Tt#(KrU68Bz+<3$B!VoCrJ7O;B@>4L8SXts
zoC<3HOSvAc1yZH`jz27fjuj7>=n=L<l-ZV59w&Cyxf~;}w^8MSy4qcbXwsm3Wb*2i
zhdwv$(OB04is<iNW{o;;&`58?zNw^HzRD(Ohp}Y8Oz>5wJ>h1)-6>DZ0Y(=#HyPm>
zgI_9*7Ae<Mlq2TX5c726&(kPQq;|LE#mQs}zl5=+oHmIfs2_z=&N@puBit8$x`aVw
z3$7LE>kMNH)%jPNb_mt37K#kOw5q`H;xo0bHR%sS;JO`0BMD6KJ=Dg+@o{0ta~AMA
zDw9sjg^Q3EMJ@Dx3C$%v&DoL0>hRd&#Wk$+ry^rU?jqn+x3MM3-B%DrRPc;-xs{KT
z`qw|$R5Y;1krtsHMgO(at{&xd+Cxm2bZW^~Y}rYH3`=jL0;#2`6&=b0v7dzX*<Yp?
Fe*lZf<c9zN

diff --git a/T04贸易明细仓库/U_TradeDeliveryRequest.dfm b/T04贸易明细仓库/U_TradeDeliveryRequest.dfm
index d1ce557..5de9e21 100644
--- a/T04贸易明细仓库/U_TradeDeliveryRequest.dfm
+++ b/T04贸易明细仓库/U_TradeDeliveryRequest.dfm
@@ -333,6 +333,7 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest
         Caption = #21457#36135#21305#25968
         DataBinding.FieldName = 'DlyPiece'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 72
@@ -341,10 +342,35 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest
         Caption = #21457#36135#25968#37327
         DataBinding.FieldName = 'DlyQty'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 86
       end
+      object Tv1TotalIOCount: TcxGridDBColumn
+        Caption = #21457#36135#21305#25968
+        DataBinding.FieldName = 'TotalIOCount'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv1TotalMeter: TcxGridDBColumn
+        Caption = #21457#36135#31859#25968
+        DataBinding.FieldName = 'TotalMeter'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv1TotalNetWeight: TcxGridDBColumn
+        Caption = #21457#36135#20928#37325
+        DataBinding.FieldName = 'TotalNetWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -446,6 +472,13 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest
       Font.Style = []
       ParentFont = False
     end
+    object Label5: TLabel
+      Left = 824
+      Top = 15
+      Width = 60
+      Height = 12
+      Caption = #21407#35745#21010#21333#21495
+    end
     object BegDate: TDateTimePicker
       Left = 76
       Top = 11
@@ -530,6 +563,15 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest
       TabOrder = 8
       OnChange = ToCoNameChange
     end
+    object MergedOrderNos: TEdit
+      Tag = 2
+      Left = 890
+      Top = 12
+      Width = 121
+      Height = 20
+      TabOrder = 9
+      OnChange = ToCoNameChange
+    end
   end
   object cxTabControl1: TcxTabControl [3]
     Left = 0
diff --git a/T04贸易明细仓库/U_TradeDeliveryRequest.pas b/T04贸易明细仓库/U_TradeDeliveryRequest.pas
index c7d910a..bf112a1 100644
--- a/T04贸易明细仓库/U_TradeDeliveryRequest.pas
+++ b/T04贸易明细仓库/U_TradeDeliveryRequest.pas
@@ -104,6 +104,11 @@ type
     TV3Column4: TcxGridDBColumn;
     DS_3: TDataSource;
     ClientDataSet3: TClientDataSet;
+    Tv1TotalMeter: TcxGridDBColumn;
+    Tv1TotalNetWeight: TcxGridDBColumn;
+    Tv1TotalIOCount: TcxGridDBColumn;
+    MergedOrderNos: TEdit;
+    Label5: TLabel;
     //RMllPDFExport1: TRMllPDFExport;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -227,6 +232,7 @@ begin
       sql.Add(',ISNULL(Case when B.DlyPiece=0 then C.Piece else B.DlyPiece end,0) DlyPiece');
       sql.Add(',ISNULL(Case when B.DlyQty<>0 then B.DlyQty else');
       sql.Add('(case when B.QtyUnit=''Kg'' then C.GrossWeight when B.QtyUnit=''M'' then C.Meter else C.Yardage end) end,0) DlyQty');
+      sql.Add(',D.TotalMeter,D.TotalNetWeight,D.TotalIOCount,D.MergedOrderNos');
       sql.Add(' from Trade_Cloth_DR_Main A ');
       sql.Add('left join (select DRMID,OrderNo,SUM(Piece) Piece,SUM(Qty) Qty,QtyUnit');
       sql.Add(',SUM(ISNULL(DlyPiece, 0)) DlyPiece,SUM(ISNULL(DlyQty, 0)) DlyQty ');
@@ -234,7 +240,36 @@ begin
       sql.Add('left join Trade_Plan_Main M on M.OrderNo=B.OrderNo');
       sql.Add('left join (select IONO,SUM(GrossWeight) GrossWeight,SUM(Meter) Meter');
       sql.Add(' ,COUNT(IOID) Piece,SUM(Yardage) Yardage');
-      sql.Add('from Trade_Cloth_IO GROUP BY IoNo ) C on C.IoNO=A.DRMID where 1=1');
+      sql.Add('from Trade_Cloth_IO GROUP BY IoNo ) C on C.IoNO=A.DRMID');
+      sql.Add('outer apply (');
+      sql.Add('    select ');
+      sql.Add('        ISNULL(SUM(AIO.Meter), 0) as TotalMeter,');
+      sql.Add('        ISNULL(SUM(AIO.NetWeight), 0) as TotalNetWeight,');
+      sql.Add('        ISNULL(COUNT(AIO.IOID), 0) as TotalIOCount,');
+      sql.Add('        STUFF((');
+      sql.Add('            select distinct '','' + ISNULL(ZD.OrderNo, STK.OrderNo)');
+      sql.Add('            from Trade_Cloth_IO AIO2');
+      sql.Add('            left join Trade_Cloth_Stock_ZD ZD on AIO2.StkID = ZD.StkId and ZD.ZDMainID = M.MainId');
+      sql.Add('            left join Trade_Cloth_Stock STK on AIO2.StkID = STK.StkId');
+      sql.Add('            where AIO2.IONO = A.DRMID');
+      sql.Add('            and (');
+      sql.Add('                (A.OutType = ''ת������'' and ZD.StkId is not null and ZD.OrderNo is not null)');
+      sql.Add('                or ');
+      sql.Add('                (A.OutType <> ''ת������'' and STK.StkId is not null and STK.OrderNo is not null)');
+      sql.Add('            )');
+      sql.Add('            for XML path('''')');
+      sql.Add('        ), 1, 1, '''') as MergedOrderNos');
+      sql.Add('    from Trade_Cloth_IO AIO');
+      sql.Add('    left join Trade_Cloth_Stock_ZD ZD on AIO.StkID = ZD.StkId and ZD.ZDMainID = M.MainId');
+      sql.Add('    left join Trade_Cloth_Stock STK on AIO.StkID = STK.StkId');
+      sql.Add('    where AIO.IONO = A.DRMID');
+      sql.Add('    and (');
+      sql.Add('        (A.OutType = ''ת������'' and ZD.StkId is not null)');
+      sql.Add('        or ');
+      sql.Add('        (A.OutType <> ''ת������'' and STK.StkId is not null)');
+      sql.Add('    )');
+      sql.Add(') D');
+      sql.Add(' where 1=1');
       if CheckBox1.Checked then
       begin
         sql.Add(' and A.Filltime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
diff --git a/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas b/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
index 726b31a..dd530f7 100644
--- a/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
+++ b/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
@@ -73,6 +73,7 @@ type
     fuserName: string;
     procedure InitData();
     function SaveData(): Boolean;
+    function CheckHasPostProcessPlan(const AOrderNo: string): Boolean;
     { Private declarations }
   public
     PState, CopyInt: Integer;
@@ -92,6 +93,31 @@ uses
 
 {$R *.dfm}
 
+function TfrmTradeDeliveryRequestInPut.CheckHasPostProcessPlan(const AOrderNo: string): Boolean;
+begin
+  Result := False;
+  if Trim(AOrderNo) = '' then Exit;
+
+  with ADOTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('SELECT TOP 1 1');
+    SQL.Add('FROM Pur_ClothPlan_Main A');
+    SQL.Add('INNER JOIN Pur_ClothPlan_Sub B ON A.PurMid = B.PurMid');
+    SQL.Add('INNER JOIN Trade_Plan_Sub C ON B.SubId = C.SubId');
+    SQL.Add('INNER JOIN Trade_Plan_Main D ON C.MainId = D.MainId');
+    SQL.Add('WHERE A.PurType = ''��ӹ�''');
+    SQL.Add('  AND A.Status <> ''-1''');
+    SQL.Add('  AND D.OrderNo = :OrderNo');
+    Parameters.ParamByName('OrderNo').Value := Trim(AOrderNo);
+    Open;
+
+    Result := not IsEmpty;
+    Close;
+  end;
+end;
+
 procedure TfrmTradeDeliveryRequestInPut.TBCloseClick(Sender: TObject);
 begin
   Close;
@@ -266,6 +292,7 @@ end;
 procedure TfrmTradeDeliveryRequestInPut.TBSaveClick(Sender: TObject);
 var
   Freal: Double;
+  FOrderNo: string;
 begin
   ToolBar1.SetFocus;
 
@@ -295,6 +322,33 @@ begin
     Exit;
   end;
 
+  if Trim(OutType.Text) = '�ӹ�����' then
+  begin
+    Order_Sub.DisableControls;
+    try
+      Order_Sub.First;
+      while not Order_Sub.Eof do
+      begin
+        FOrderNo := Trim(Order_Sub.FieldByName('OrderNo').AsString);
+        if FOrderNo = '' then
+        begin
+          Application.MessageBox('���ڿյļƻ����ţ��޷����мӹ����⣡', '��ʾ', 0);
+          Exit;
+        end;
+
+        if not CheckHasPostProcessPlan(FOrderNo) then
+        begin
+          Application.MessageBox(PChar('�ƻ����š�' + FOrderNo + '��δ������ӹ��ƻ������������ӹ����⣡'), '��ʾ', 0);
+          Exit;
+        end;
+
+        Order_Sub.Next;
+      end;
+    finally
+      Order_Sub.EnableControls;
+    end;
+  end;
+
   if SaveData() then
   begin
     Application.MessageBox('����ɹ���', '��ʾ', 0);
diff --git a/T04贸易明细仓库/testDll.identcache b/T04贸易明细仓库/testDll.identcache
index 4db1c4e4858fb670ad70e6e4ff74e585a5c607a8..3ec2f11ab41510edcaa2a88b7b32ec6d25afdd61 100644
GIT binary patch
delta 75
zcmdnSxP(!GiGhK^#l<Sd#n2!;=H<ej&u6cDvU~CK1&tt)+)Ag3jixeAc;#g#x{3n;
DY&jpZ

delta 93
zcmZ3&xQ$VhiGhK^+tn(jBsI4n#-+f}ASksUKj!7aozG{ld$N1+^97ADE`|nGRY?;I
Oja7Y#Qz$dhMiKzb1}BaH