From 1edd96460b16f9fe99ed689b5607d64eddf8a262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”>
Date: Mon, 26 May 2025 13:31:49 +0800
Subject: [PATCH] 111

---
 D01针织生产计划/KnitPlan.dproj.local | 82 ++++++++++++++--------------
 D01针织生产计划/U_KnitPlanList.pas   | 16 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/D01针织生产计划/KnitPlan.dproj.local b/D01针织生产计划/KnitPlan.dproj.local
index 6b29889..e321b83 100644
--- a/D01针织生产计划/KnitPlan.dproj.local
+++ b/D01针织生产计划/KnitPlan.dproj.local
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.904,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.dfm=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.496,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.pas=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.951,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.904,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelInput.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.089,=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet2.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.030,D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.dfm=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.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.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.756,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.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.496,D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.pas=D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.830,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_PlanCardOFF.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.383,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.938,=D:\Dp10Repo\项目代码\D10gmXinHua\D01针织生产计划\U_LCKInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.dfm=D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas=D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.756,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.898,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_LCKQuery.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.dfm=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_TradeSalesContractSel.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.913,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_TradeInspSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.496,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.dfm=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.238,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.pas=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.938,=D:\Dp10Repo\项目代码\D10gmXinHua\D01针织生产计划\U_LCKInput.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.496,D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.dfm=D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.pas=D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.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.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.030,D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.dfm=D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\public10\ThreeFun\Fun\U_printPdf.pas=D:\Dp10Repo\项目代码\D10gmBitao\A00通用窗体\U_printPdf.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.814,=D:\Dp10Repo\public10\ThreeFun\Fun\U_printPdf.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.170,=D:\Dp10Repo\项目代码\D10gmBitao\A00通用窗体\U_LabelPrint2.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.914,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_testdll.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.227,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelAdd.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.pas=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.pas=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.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.914,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_testdll.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.175,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_KnitPlanCard.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>2025-05-24 13:35:58.170,=D:\Dp10Repo\项目代码\D10gmBitao\A00通用窗体\U_LabelPrint2.pas</Transaction>
-    <Transaction>2025-05-24 13:38:16.814,=D:\Dp10Repo\public10\ThreeFun\Fun\U_printPdf.pas</Transaction>
-    <Transaction>2025-05-24 13:43:17.868,D:\Dp10Repo\项目代码\D10gmBitao\A00通用窗体\U_printPdf.pas=D:\Dp10Repo\public10\ThreeFun\Fun\U_printPdf.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.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.dfm=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.913,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_TradeInspSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.pas=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.238,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_TradeSalesContractSel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas
index d21bd43..ff725aa 100644
--- a/D01针织生产计划/U_KnitPlanList.pas
+++ b/D01针织生产计划/U_KnitPlanList.pas
@@ -234,8 +234,8 @@ type
 implementation
 
 uses
-  U_DataLink, U_KnitPlanInPut, U_RTFun, U_ZDYHelp, U_LabelPrint2, U_KnitCardInPut,
-  U_TradeInspSet, U_LCKInput, U_KnitPlanImport, U_LabelPrint;
+  U_DataLink, U_KnitPlanInPut, U_RTFun, U_ZDYHelp, U_LabelPrint2,
+  U_KnitCardInPut, U_TradeInspSet, U_LCKInput, U_KnitPlanImport, U_LabelPrint;
 
 {$R *.dfm}
 
@@ -601,8 +601,8 @@ begin
   CDS_1.Locate('SSel', True, []);
   CDS_1.EnableControls;
   try
-    frmLabelPrint := TfrmLabelPrint.Create(Application);
-    with frmLabelPrint do
+    frmLabelPrint2 := TfrmLabelPrint2.Create(Application);
+    with frmLabelPrint2 do
     begin
       FLMType := 'ZZDYD';
       FFiltration1 := WSql;
@@ -621,7 +621,7 @@ begin
       end;
     end;
   finally
-    frmLabelPrint.Free;
+    frmLabelPrint2.Free;
   end;
 end;
 
@@ -1280,8 +1280,8 @@ end;
 procedure TfrmKnitPlanList.SCPrintClick(Sender: TObject);
 begin
   try
-    frmLabelPrint := TfrmLabelPrint.Create(Application);
-    with frmLabelPrint do
+    frmLabelPrint2 := TfrmLabelPrint2.Create(Application);
+    with frmLabelPrint2 do
     begin
       FLMType := 'ZZSCD';
       FFiltration1 := CDS_1.FieldByName('MAINID').AsString;
@@ -1291,7 +1291,7 @@ begin
       end;
     end;
   finally
-    frmLabelPrint.Free;
+    frmLabelPrint2.Free;
   end;
 end;