From 860e4df725defb7f313e320b281d613733fa74b8 Mon Sep 17 00:00:00 2001
From: "LAPTOP-8NOV8MVQ\\cai" <caiyuhang12@outlook.com>
Date: Tue, 3 Mar 2026 16:04:32 +0800
Subject: [PATCH] 3-3

---
 .../G01贸易生产计划/U_TradePlanMgeList.dfm    |   9 +-
 .../wenshangkm/G01贸易生产计划/djdPackPlan.dproj |  77 +-----
 .../G01贸易生产计划/djdPackPlan.dproj.local   |  46 +---
 .../G01贸易生产计划/djdPackPlan.identcache    | Bin 3904 -> 3904 bytes
 .../wenshangkm/G01贸易生产计划/djdPackPlan.res | Bin 1496 -> 1496 bytes
 .../wenshangkm/G01贸易生产计划/testDll.res    | Bin 3308 -> 3308 bytes
 .../G03贸易布匹检验/DjdMachineInsp.dproj      |  77 +-----
 .../G03贸易布匹检验/DjdMachineInsp.dproj.local | 224 ++++++++----------
 .../G03贸易布匹检验/DjdMachineInsp.identcache | Bin 5093 -> 5093 bytes
 .../wenshangkm/G03贸易布匹检验/DjdMachineInsp.res | Bin 1520 -> 1520 bytes
 .../wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm |  29 ++-
 .../wenshangkm/G03贸易布匹检验/U_MachRollMain.pas |  20 +-
 .../G03贸易布匹检验/U_TradeClothInspList.dfm  |  74 +++---
 .../wenshangkm/G03贸易布匹检验/testDll.res    | Bin 3308 -> 3308 bytes
 14 files changed, 175 insertions(+), 381 deletions(-)

diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
index 88e72a3..f14027d 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -118,6 +118,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       AutoSize = True
       Caption = #23548#20837#35746#21333
       ImageIndex = 28
+      Visible = False
       OnClick = ToolButton1Click
     end
     object TBCK: TToolButton
@@ -365,7 +366,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       SizeOptions.SizableHorz = True
       SizeOptions.SizableVert = True
       Hidden = True
-      ItemIndex = 1
+      ItemIndex = 7
       LayoutDirection = ldHorizontal
       Padding.Bottom = -5
       Padding.Top = -5
@@ -493,8 +494,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Caption = #27719#24635#35270#22270
       ImageIndex = 0
       object cxGrid1: TcxGrid
-        Left = 17
-        Top = 3
+        Left = 21
+        Top = 1
         Width = 1040
         Height = 246
         TabOrder = 0
@@ -633,7 +634,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
             FixedKind = fkLeftDynamic
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 67
+            Width = 87
           end
           object v1ZQty: TcxGridDBColumn
             Caption = #35746#21333#25968#37327
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
index 6720f6f..e7612dd 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
+++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj
@@ -4,7 +4,7 @@
         <MainSource>djdPackPlan.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -38,24 +28,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
-        <Cfg_1_Android64>true</Cfg_1_Android64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
-        <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
-        <Cfg_1_OSX64>true</Cfg_1_OSX64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
         <Cfg_1_Win32>true</Cfg_1_Win32>
         <CfgParent>Cfg_1</CfgParent>
@@ -67,24 +39,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -104,13 +58,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -128,15 +75,6 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
@@ -145,15 +83,6 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </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:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
@@ -290,10 +219,6 @@
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
index 2bb0bc3..6edbed4 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\wenshangkm"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
@@ -99,14 +71,14 @@
     <File Path="U_UptPlanDataToRoll.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.720,=D:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\A00通用窗体\U_MdPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.720,=D:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\A00通用窗体\U_MdPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache
index 7106d654c1834d4d0e319f498b90b681b97dcde2..2dee007ba4d7dfa6f8067660e13f238c3cc3c6cf 100644
GIT binary patch
delta 33
pcmX>gcR+4K58LEJ+_jr~*kV{FE3mjvUdJsm`2|<~W_un+W&q&q3*`U+

delta 37
tcmX>gcR+4K58LEEF8|FD?7S?K4{+B{R$y_TyoOt3at~YWW_un+W&j1g40!+m

diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.res b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.res
index 9a6a468a824ad9545b4854b90f9752cd4627d572..ddf1bc4861202faa59115581ffd9dd707756bca2 100644
GIT binary patch
delta 12
Tcmcb?eS>?$6;>8T1_lNI9{K}S

delta 12
Tcmcb?eS>?$6;_tUDGUq%BDMr+

diff --git a/项目代码/wenshangkm/G01贸易生产计划/testDll.res b/项目代码/wenshangkm/G01贸易生产计划/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/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
index 5f8c5f1..47b354e 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj
@@ -4,7 +4,7 @@
         <MainSource>DjdMachineInsp.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -38,24 +28,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
-        <Cfg_1_Android64>true</Cfg_1_Android64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
-        <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
-        <Cfg_1_OSX64>true</Cfg_1_OSX64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
         <Cfg_1_Win32>true</Cfg_1_Win32>
         <CfgParent>Cfg_1</CfgParent>
@@ -67,24 +39,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -108,13 +62,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -132,15 +79,6 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_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:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
@@ -150,15 +88,6 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </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:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
@@ -328,10 +257,6 @@
                 </Source>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 56b87df..5498a6c 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -1,134 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.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.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.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.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.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.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.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.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\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.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.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.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.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.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.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.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.673,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.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.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.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.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\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.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.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.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\wenshangkm"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache
index b4060542b0ee5b38ba882aba6b8b002c28483752..854e90a81f8ca4392fc45755a09004cdb0617603 100644
GIT binary patch
delta 60
zcmV-C0K@;~C*>!wz5}xz1hEH`z5`#gNeoK?lU@*hvy=_W0+am_db8XRApw(50!fp=
S5)zXs3?P#o1Y5Jx5)%Q|b`{<L

delta 76
zcmV-S0JHz)C*>!wz5|nQ3tzLo1F;8_PXbAkz!DOZR}vtz&I?NcvzHCZ0+VVFVUv0d
i9kbgIApw(K31O440tJ)D5EPTX16z~-3<a~-5)J`*N*rMT

diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.res b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.res
index 1b3482477b27797055d1069f70b4ebef87193aef..6c58c9e46db2b159b7cbc54cf5496a2f6137b01b 100644
GIT binary patch
delta 12
Tcmeys{egSK8&(!Z1_lNIA+iIV

delta 12
Tcmeys{egSK8&;OaDGUq%C2j<<

diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
index 878122f..45b3823 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
@@ -539,8 +539,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 124
     end
     object RuleYardstick: TcxTextEdit
-      Left = 5099
-      Top = 9853
+      Left = 10000
+      Top = 10000
       AutoSize = False
       ParentFont = False
       Properties.ReadOnly = True
@@ -587,8 +587,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       OnClick = packPostBtnClick
     end
     object customStrField1: TcxTextEdit
-      Left = 5099
-      Top = 9853
+      Left = 10000
+      Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 47
@@ -597,12 +597,11 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 121
     end
     object customStrField2: TcxTextEdit
-      Left = 5099
-      Top = 9853
+      Left = 10000
+      Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 48
-      Visible = False
       OnClick = edtScanEnter
       Width = 121
     end
@@ -762,8 +761,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 121
     end
     object customStrField8: TcxButtonEdit
-      Left = 5099
-      Top = 9853
+      Left = 10000
+      Top = 10000
       Hint = 'customStrField8/'#33258#23450#20041'8'
       Properties.Buttons = <
         item
@@ -779,8 +778,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 121
     end
     object customStrField7: TcxButtonEdit
-      Left = 5099
-      Top = 9853
+      Left = 10000
+      Top = 10000
       Hint = 'customStrField7/'#33258#23450#20041'7'
       Properties.Buttons = <
         item
@@ -851,8 +850,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 63
     end
     object topLen: TcxTextEdit
-      Left = 8030
-      Top = 9914
+      Left = 10000
+      Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 69
@@ -920,8 +919,8 @@ inherited frmMachRollMain: TfrmMachRollMain
       Width = 121
     end
     object BanciqtyC: TcxTextEdit
-      Left = 7499
-      Top = 9914
+      Left = 10000
+      Top = 10000
       AutoSize = False
       Style.HotTrack = False
       Style.TransparentBorder = False
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
index 64f8c1b..fed46a9 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
@@ -428,6 +428,7 @@ type
     function getCurMaxPieceNo(): integer;
     type
 
+
   public
     fmanage, FCINote: string;
     fFlileFlag: string;
@@ -547,7 +548,8 @@ begin
       exit;
 //    Panel_msg.Visible := not Panel_msg.Visible;
     cxgrid3.Enabled := not cxgrid3.Enabled;
-    InitJTM(cds_3.fieldbyName('CIID').AsString);
+//    InitJTM(cds_3.fieldbyName('CIID').AsString);
+    InitJTM(FCIID);
 //    initEditPiece();
     BTPrint.Caption := '�޸��ύ';
     //�޸��ύ
@@ -3080,14 +3082,14 @@ begin
       fieldbyName('AddLenPresent').value := abs(mPresentLen0);
       //  cds_params.fieldbyName('AddLenPresent').AsFloat;
       //�Զ�������1
-      fieldbyName('customStrField1').value := trim(customStrField1.Text);
-      fieldbyName('customStrField2').value := trim(customStrField2.Text);
-      fieldbyName('customStrField3').value := trim(customStrField3.Text);
-      fieldbyName('customStrField4').value := trim(customStrField4.Text);
-      fieldbyName('customStrField5').value := trim(customStrField5.Text);
-      fieldbyName('customStrField6').value := trim(customStrField6.Text);
-      fieldbyName('customStrField7').value := trim(customStrField7.Text);
-      fieldbyName('customStrField8').value := trim(customStrField8.Text);
+//      fieldbyName('customStrField1').value := trim(customStrField1.Text);
+//      fieldbyName('customStrField2').value := trim(customStrField2.Text);
+//      fieldbyName('customStrField3').value := trim(customStrField3.Text);
+//      fieldbyName('customStrField4').value := trim(customStrField4.Text);
+//      fieldbyName('customStrField5').value := trim(customStrField5.Text);
+//      fieldbyName('customStrField6').value := trim(customStrField6.Text);
+//      fieldbyName('customStrField7').value := trim(customStrField7.Text);
+//      fieldbyName('customStrField8').value := trim(customStrField8.Text);
 
 
       //ƴƥ
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
index 46e08a8..91e4802 100644
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
@@ -7,20 +7,20 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
   Color = clBtnFace
   Font.Height = -16
   Position = poDefault
+  ExplicitLeft = -126
   ExplicitWidth = 1369
   ExplicitHeight = 726
   PixelsPerInch = 96
   TextHeight = 21
   object Panel6: TPanel [0]
     Left = 0
-    Top = 130
+    Top = 146
     Width = 1353
     Height = 40
     Align = alTop
     AutoSize = True
     BevelInner = bvLowered
     TabOrder = 3
-    ExplicitTop = 146
     DesignSize = (
       1353
       40)
@@ -425,7 +425,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 64
       end
       object v1Column40: TcxGridDBColumn
         Caption = #33457#22411
@@ -557,10 +557,10 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     Left = 0
     Top = 0
     Width = 1353
-    Height = 60
+    Height = 76
     AutoSize = True
-    ButtonHeight = 30
-    ButtonWidth = 131
+    ButtonHeight = 38
+    ButtonWidth = 169
     Caption = 'ToolBar1'
     Color = clWhite
     DoubleBuffered = False
@@ -580,7 +580,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TBRafreshClick
     end
     object btnJBQ: TToolButton
-      Left = 63
+      Left = 71
       Top = 0
       AutoSize = True
       Caption = #25171#21360#21367#26631#31614
@@ -591,7 +591,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnJBQClick
     end
     object ToolButton3: TToolButton
-      Left = 179
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -600,7 +600,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton3Click
     end
     object btnEdit: TToolButton
-      Left = 278
+      Left = 332
       Top = 0
       AutoSize = True
       Caption = #32534#36753
@@ -608,7 +608,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnEditClick
     end
     object ToolButton6: TToolButton
-      Left = 341
+      Left = 403
       Top = 0
       AutoSize = True
       Caption = #20462#25913#24179#22343#26102#38388
@@ -616,7 +616,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton6Click
     end
     object ToolButton2: TToolButton
-      Left = 452
+      Left = 538
       Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913
@@ -625,7 +625,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Style = tbsDropDown
     end
     object TBZF: TToolButton
-      Left = 556
+      Left = 664
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -633,7 +633,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = TBZFClick
     end
     object Tout: TToolButton
-      Left = 619
+      Left = 735
       Top = 0
       AutoSize = True
       Caption = #20986#24211
@@ -644,7 +644,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToutClick
     end
     object Tunout: TToolButton
-      Left = 699
+      Left = 829
       Top = 0
       AutoSize = True
       Caption = #25764#38144#20986#24211
@@ -655,7 +655,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object ToolButton4: TToolButton
       Left = 0
-      Top = 30
+      Top = 38
       AutoSize = True
       Caption = #25171#21253
       ImageIndex = 34
@@ -663,8 +663,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = ToolButton4Click
     end
     object btnJYBG: TToolButton
-      Left = 63
-      Top = 30
+      Left = 71
+      Top = 38
       AutoSize = True
       Caption = #26816#39564#25253#21578
       ImageIndex = 21
@@ -672,55 +672,55 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       OnClick = btnJYBGClick
     end
     object Tprintmd: TToolButton
-      Left = 150
-      Top = 30
+      Left = 174
+      Top = 38
       AutoSize = True
       Caption = #25171#21360#30721#21333
       ImageIndex = 21
       OnClick = TprintmdClick
     end
     object ToolButton7: TToolButton
-      Left = 237
-      Top = 30
+      Left = 277
+      Top = 38
       AutoSize = True
       Caption = #23548#20986#39564#36135#20998#26512#25253#21578
       ImageIndex = 21
       OnClick = ToolButton7Click
     end
     object btn1: TToolButton
-      Left = 372
-      Top = 30
+      Left = 444
+      Top = 38
       Caption = #25171#21360#39564#36135#20998#26512#25253#21578
       ImageIndex = 21
       OnClick = btn1Click
     end
     object TBExport: TToolButton
-      Left = 503
-      Top = 30
+      Left = 613
+      Top = 38
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 20
       OnClick = TBExportClick
     end
     object ToolButton5: TToolButton
-      Left = 566
-      Top = 30
+      Left = 684
+      Top = 38
       AutoSize = True
       Caption = #26085#24535
       ImageIndex = 9
       OnClick = ToolButton5Click
     end
     object ToolButton1: TToolButton
-      Left = 629
-      Top = 30
+      Left = 755
+      Top = 38
       AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 716
-      Top = 30
+      Left = 858
+      Top = 38
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
@@ -746,14 +746,13 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
   end
   object dxLayoutControl_query: TdxLayoutControl [4]
     Left = 0
-    Top = 60
+    Top = 76
     Width = 1353
     Height = 70
     Align = alTop
     TabOrder = 4
     AutoSize = True
     LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
-    ExplicitTop = 76
     object OrderNo: TcxTextEdit
       Tag = 2
       Left = 491
@@ -1099,7 +1098,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object dxLayoutItem7: TdxLayoutItem
       Parent = dxLayoutGroup1
-      Visible = False
       SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert]
       SizeOptions.SizableHorz = True
       SizeOptions.SizableVert = True
@@ -1413,11 +1411,11 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     ExplicitTop = 233
   end
   inherited cxProgressBar2: TcxProgressBar
-    Left = 324
-    Top = 184
+    Left = 334
+    Top = 198
     TabOrder = 7
-    ExplicitLeft = 324
-    ExplicitTop = 184
+    ExplicitLeft = 334
+    ExplicitTop = 198
     ExplicitHeight = 29
   end
   inherited ADOQueryBaseCmd: TADOQuery
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/testDll.res b/项目代码/wenshangkm/G03贸易布匹检验/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5

delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl