diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
index 81c52e9..58d361c 100644
--- a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
+++ b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
@@ -4,7 +4,7 @@
DjdMachineInsp.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -38,24 +28,6 @@
Base
true
-
- true
- Cfg_1
- true
- true
-
-
- true
- Cfg_1
- true
- true
-
-
- true
- Cfg_1
- true
- true
-
true
Cfg_1
@@ -67,24 +39,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -108,13 +62,6 @@
2052
CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=
-
- $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png
- 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
-
-
- $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png
-
System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
Debug
@@ -132,15 +79,6 @@
false
0
-
- Debug
-
-
- Debug
-
-
- Debug
-
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\testDll.exe
@@ -150,18 +88,9 @@
false
true
-
- Debug
-
-
- Debug
-
-
- Debug
-
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- D:\Dp10RepoV1\项目代码\D10djdzhuocanPack\项目代码\djdPack\G03贸易布匹检验\testDll.exe
+ D:\Dp10RepoV1\项目代码\D10DJzhuocan\项目代码\djdPack\G03贸易布匹检验\testDll.exe
@@ -328,10 +257,6 @@
- True
- True
- True
- True
True
False
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 99b2cf0..4a4e617 100644
--- a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -1,134 +1,106 @@
- 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
- 1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas
- 1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas
- 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
- 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm
- 1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
- 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas
- 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm
- 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
- 1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas
- 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
- 1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
- 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
- 1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj
- 1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=
- 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm
- 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
- 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
- 1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas
- 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
- 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas
- 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas
- 1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas
- 1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas
- 1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas
- 1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas
- 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=
- 1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm
- 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
- 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
- 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj
- 1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=
- 1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas
- 1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj
- 1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas
- 1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
- 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm
- 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
- 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
- 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
- 1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas
- 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas
- 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas
- 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas
- 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas
- 1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm
- 1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm
- 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
- 1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj
- 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
- 1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas
- 1899-12-30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelMapSet.pas
- 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
- 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm
- 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm
- 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm
- 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm
- 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm
- 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm
- 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=
- 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
- 1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas
- 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
- 1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas
- 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas
- 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas
- 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas
- 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
+ 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas
+ 1899/12/30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas
+ 1899/12/30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas
+ 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899/12/30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm
+ 1899/12/30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
+ 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm
+ 1899/12/30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas
+ 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
+ 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
+ 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
+ 1899/12/30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
+ 1899/12/30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj
+ 1899/12/30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas
+ 1899/12/30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas
+ 1899/12/30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=
+ 1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj
+ 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
+ 1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas
+ 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
+ 1899/12/30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas
+ 1899/12/30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas
+ 1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas
+ 1899/12/30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas
+ 1899/12/30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas
+ 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=
+ 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
+ 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
+ 1899/12/30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=
+ 1899/12/30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas
+ 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
+ 1899/12/30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas
+ 1899/12/30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj
+ 1899/12/30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm
+ 1899/12/30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm
+ 1899/12/30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm
+ 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
+ 1899/12/30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas
+ 1899/12/30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas
+ 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
+ 1899/12/30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm
+ 1899/12/30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm
+ 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas
+ 1899/12/30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelMapSet.pas
+ 1899/12/30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj
+ 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
+ 1899/12/30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
+ 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
+ 1899/12/30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas
+ 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
+ 1899/12/30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas
+ 1899/12/30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
+ 1899/12/30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas
+ 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899/12/30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
+ 1899/12/30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=
+ 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
+ 1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas
+ 1899/12/30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas
+ 1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm
+ 1899/12/30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm
+ 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
+ 1899/12/30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas
+ 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -148,7 +120,7 @@
-
+
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache
index e8ffc8a..5d430cd 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.res b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.res
index 1b34824..6c58c9e 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.res and b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.res differ
diff --git a/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local b/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local
index 1fc9d96..52fdbb0 100644
--- a/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local
+++ b/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local
@@ -1,6 +1,6 @@
-
+
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
index 5acd5b4..4e0694e 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
@@ -8,6 +8,9 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
+ OnKeyDown = FormKeyDown
+ OnKeyPress = FormKeyPress
+ ExplicitLeft = -120
ExplicitWidth = 1128
ExplicitHeight = 775
PixelsPerInch = 96
@@ -1665,8 +1668,6 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 311
Align = alClient
TabOrder = 0
- ExplicitTop = 121
- ExplicitHeight = 341
object Tv3: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
@@ -2456,7 +2457,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object MovePanel1: TMovePanel
Left = 80
- Top = -25
+ Top = -24
Width = 237
Height = 42
BevelOuter = bvNone
@@ -2669,8 +2670,8 @@ inherited frmMachRollMain: TfrmMachRollMain
object cxGridPopupMenu1: TcxGridPopupMenu
Grid = cxGrid3
PopupMenus = <>
- Left = 720
- Top = 104
+ Left = 616
+ Top = 136
end
object ADOQueryImage: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
index 13993a8..a06ac55 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
@@ -315,6 +315,8 @@ type
procedure customStrField5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure ToolButton1Click(Sender: TObject);
procedure ToolButton2Click(Sender: TObject);
+ procedure FormKeyPress(Sender: TObject; var Key: Char);
+ procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
private
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -372,8 +374,12 @@ type
function getCurPieceNO(mCcid: string): string;
procedure threadLoadform();
function getCurMaxPieceNo(): integer;
+ procedure AppIdleSetFocus(Sender: TObject; var Done: Boolean);
+ procedure AutoCloseMessage(const Msg: string; CloseTime: Integer = 2000);
+ procedure TimerCloseForm(Sender: TObject);
type
+
public
fmanage, canshu1: string;
fFlileFlag: string;
@@ -461,6 +467,7 @@ var
mvalue: double;
i: Integer;
begin
+
try
fCanAutoPost := false;
BTPrint.Enabled := false;
@@ -674,8 +681,11 @@ begin
ClearCom(MBDYDllName);
end;
+
finally
BTPrint.Enabled := true;
+
+ InputLen.SetFocus;
end;
end;
@@ -927,10 +937,31 @@ begin
frmMachRollMain := nil;
end;
+procedure TfrmMachRollMain.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+ if Key = VK_RETURN then // VK_RETURN ǻس
+ begin
+ ShowMessage('qq');
+ Key := 0; // ֹһ
+ end;
+end;
+
+procedure TfrmMachRollMain.FormKeyPress(Sender: TObject; var Key: Char);
+begin
+ ShowMessage('Key pressed: ' + IntToStr(Ord(Key)));
+ if Key = #13 then
+ begin
+ ShowMessage('qq');
+ end;
+
+end;
+
procedure TfrmMachRollMain.FormShow(Sender: TObject);
var
i: Integer;
begin
+
+// KeyPreview := True; // ȷԤ
try
// loadProcess.Visible:=true;
// loadProcess.Refresh;
@@ -1000,6 +1031,8 @@ begin
frameKeyBoard1.SpeedButton10.Visible := false;
end;
finally
+// // Ӧóʱý㣨ȷгʼɣ
+// Application.OnIdle := AppIdleSetFocus;
// loadProcess.Visible:=false;
end;
@@ -1013,6 +1046,76 @@ begin
//////
if dxLayoutItem_customStrField3.ActuallyVisible then
InitDevCombobox(ADOQueryBaseTemp, customStrField3, 'DOROLLZDY3');
+
+end;
+
+procedure TfrmMachRollMain.AppIdleSetFocus(Sender: TObject; var Done: Boolean);
+begin
+ // ȷִֻһ
+ Application.OnIdle := nil;
+
+ // õ
+ if Self.CanFocus then
+ begin
+ Self.SetFocus;
+// ѡϢ
+
+ AutoCloseMessage('ɹ', 1000); // 1Զر
+
+// ShowMessage('õ: ' + Self.Name);
+
+ end;
+
+ Done := True; // Ĭϴ
+end;
+
+procedure TfrmMachRollMain.AutoCloseMessage(const Msg: string; CloseTime: Integer = 2000);
+var
+ Form: TForm;
+ Label1: TLabel;
+ Timer: TTimer;
+begin
+ Form := TForm.Create(nil);
+ try
+ Form.BorderStyle := bsDialog;
+ Form.Caption := 'ʾ';
+ Form.Position := poScreenCenter;
+ Form.Width := 300;
+ Form.Height := 120;
+
+ Label1 := TLabel.Create(Form);
+ Label1.Parent := Form;
+ Label1.Caption := Msg + #13#10 + IntToStr(CloseTime div 1000) + 'Զر...';
+ Label1.Align := alClient;
+ Label1.Alignment := taCenter;
+ Label1.Layout := tlCenter;
+ Label1.WordWrap := True;
+
+ Timer := TTimer.Create(Form);
+ Timer.Interval := CloseTime;
+ Timer.OnTimer := TimerCloseForm; // ʹöķ
+
+ // Ҫ洢 Form Ա¼з
+ Tag := Integer(Form); // ʹ Tag 洢
+
+ Form.ShowModal;
+ finally
+ Form.Free;
+ end;
+end;
+
+// ļʱ¼
+procedure TfrmMachRollMain.TimerCloseForm(Sender: TObject);
+var
+ Form: TForm;
+begin
+ // Sender ȡ Timer
+ TTimer(Sender).Enabled := False;
+
+ // ȡ Form
+ Form := TForm(TTimer(Sender).Owner);
+ if Assigned(Form) then
+ Form.ModalResult := mrOk;
end;
procedure TfrmMachRollMain.frameBads1CIFBegDblClick(Sender: TObject);
@@ -1431,7 +1534,7 @@ begin
end
else
cds_params.fieldbyName('outPage').value := '';
- cds_params.fieldbyName('aixunpage').value := '';
+// cds_params.fieldbyName('aixunpage').value := '';
if fieldbyName('DecimalY').Value <> null then
cds_params.fieldbyName('Yplace').value := fieldbyName('DecimalY').AsInteger;
if fieldbyName('DecimalM').Value <> null then
@@ -1873,26 +1976,26 @@ procedure TfrmMachRollMain.setFocusCtrol(controlName: string);
var
i: Integer;
begin
- with FrameKeyBoard1.dxPanel1 do
- begin
- for i := 0 to ControlCount - 1 do
- begin
- if Controls[i] is TSpeedButton then
- begin
- TSpeedButton(Controls[i]).Hint := trim(controlName);
- if (trim(controlName) = 'edtScan') and (TSpeedButton(Controls[i]).Name = 'SpeedButton_dot') then
- begin
- TSpeedButton(Controls[i]).Caption := 'س';
- end
- else if (TSpeedButton(Controls[i]).Name = 'SpeedButton_dot') then
- begin
- TSpeedButton(Controls[i]).Caption := '.';
- end;
- end;
- end;
- end;
- cxGroupBox_keys.Left := Panel_right.Left + 5;
- cxGroupBox_keys.Visible := true;
+// with FrameKeyBoard1.dxPanel1 do
+// begin
+// for i := 0 to ControlCount - 1 do
+// begin
+// if Controls[i] is TSpeedButton then
+// begin
+// TSpeedButton(Controls[i]).Hint := trim(controlName);
+// if (trim(controlName) = 'edtScan') and (TSpeedButton(Controls[i]).Name = 'SpeedButton_dot') then
+// begin
+// TSpeedButton(Controls[i]).Caption := 'س';
+// end
+// else if (TSpeedButton(Controls[i]).Name = 'SpeedButton_dot') then
+// begin
+// TSpeedButton(Controls[i]).Caption := '.';
+// end;
+// end;
+// end;
+// end;
+// cxGroupBox_keys.Left := Panel_right.Left + 5;
+// cxGroupBox_keys.Visible := true;
end;
procedure TfrmMachRollMain.CIFEndChange(Sender: TObject);
@@ -2424,6 +2527,11 @@ begin
end;
free;
end;
+ cds_params.Edit;
+ cds_params.fieldByName('rollnoMake').Value := 'ֶ';
+ cds_params.fieldByName('weightRule').Value := 1;
+ cds_params.fieldByName('aixunpage').Value := '';
+ cds_params.Post;
end;
procedure TfrmMachRollMain.Edit_fixLenClick(Sender: TObject);
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.dfm b/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.dfm
index 6f02e47..0ffd28e 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.dfm
+++ b/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.dfm
@@ -60,6 +60,18 @@ object frmParamSet: TfrmParamSet
inherited Label34: TLabel
Visible = True
end
+ inherited edtMaBiao: TcxTextEdit
+ ExplicitHeight = 34
+ end
+ inherited edtMBDW: TcxTextEdit
+ ExplicitHeight = 34
+ end
+ inherited edtChen: TcxTextEdit
+ ExplicitHeight = 34
+ end
+ inherited outPage: TcxTextEdit
+ ExplicitHeight = 34
+ end
inherited labNumber: TComboBox
ItemIndex = 0
Text = '1'
@@ -71,12 +83,21 @@ object frmParamSet: TfrmParamSet
'5'
'6')
end
+ inherited AddwetPresent: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited AddLenPresent: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited presentNumFlag: TcxComboBox
+ ExplicitHeight = 27
+ end
inherited aixunpage: TcxTextEdit
Left = 527
Top = 57
- Text = ''
ExplicitLeft = 527
ExplicitTop = 57
+ ExplicitHeight = 34
end
end
inherited cxGroupBox2: TcxGroupBox
@@ -91,21 +112,46 @@ object frmParamSet: TfrmParamSet
Touch.TabletOptions = []
ExplicitLeft = 53
ExplicitTop = 27
+ ExplicitHeight = 27
+ end
+ inherited MaxLen: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited MinWeight: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited MaxWeight: TcxTextEdit
+ ExplicitHeight = 27
end
inherited BeginPieceNo: TcxTextEdit
Properties.OnChange = FrameParam1BeginPieceNoPropertiesChange
+ ExplicitHeight = 27
end
inherited EndPieceNo: TcxTextEdit
Properties.OnChange = FrameParam1EndPieceNoPropertiesChange
+ ExplicitHeight = 27
+ end
+ inherited BeginTXM: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited EndTXM: TcxTextEdit
+ ExplicitHeight = 27
end
end
inherited cxGroupBox3: TcxGroupBox
- ExplicitTop = 274
ExplicitWidth = 771
Width = 771
+ inherited MPlace: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited YPlace: TcxTextEdit
+ ExplicitHeight = 27
+ end
+ inherited KgPlace: TcxTextEdit
+ ExplicitHeight = 27
+ end
end
inherited cxGroupBox4: TcxGroupBox
- ExplicitTop = 400
ExplicitWidth = 771
ExplicitHeight = 133
Height = 133
@@ -115,10 +161,24 @@ object frmParamSet: TfrmParamSet
Style.IsFontAssigned = True
ExplicitHeight = 30
end
+ inherited packRolls: TcxTextEdit
+ ExplicitHeight = 27
+ end
inherited rollnoMake: TcxComboBox
+ Top = 35
Properties.DropDownListStyle = lsEditFixedList
Style.Font.Charset = GB2312_CHARSET
Style.IsFontAssigned = True
+ Text = #25163#21160
+ ExplicitTop = 35
+ ExplicitHeight = 27
+ end
+ inherited packNoMake: TcxComboBox
+ Left = 263
+ Top = 33
+ ExplicitLeft = 263
+ ExplicitTop = 33
+ ExplicitHeight = 27
end
inherited packPrintPreview: TCheckBox
Top = 74
@@ -138,8 +198,17 @@ object frmParamSet: TfrmParamSet
Style.Font.Charset = GB2312_CHARSET
Style.IsFontAssigned = True
end
+ inherited packPrintAction: TcxComboBox
+ ExplicitHeight = 27
+ end
end
end
+ inherited weightRule: TcxComboBox
+ Top = 88
+ Text = #20928#37325
+ ExplicitTop = 88
+ ExplicitHeight = 30
+ end
end
object dxPanel1: TdxPanel
Left = 0
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.pas b/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.pas
index e573b94..2d35a55 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.pas
+++ b/项目代码/djdPack/G03贸易布匹检验/U_ParamSet.pas
@@ -145,6 +145,7 @@ begin
//
weightRule.ItemIndex := cds_params.fieldByName('weightRule').AsInteger;
+ weightRule.ItemIndex := 1;
// ֽ
outPage.Text := Trim(cds_params.fieldByName('outPage').AsString);
@@ -194,8 +195,8 @@ begin
//
- rollnoMake.ItemIndex := rollnoMake.Properties.Items.IndexOf(cds_params.fieldByName('rollnoMake').AsString);
-
+// rollnoMake.ItemIndex := rollnoMake.Properties.Items.IndexOf(cds_params.fieldByName('rollnoMake').AsString);
+ rollnoMake.Text := 'ֶ';
if rollnoMake.ItemIndex = -1 then
rollnoMake.ItemIndex := 0;
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_ProductListHelp.pas b/项目代码/djdPack/G03贸易布匹检验/U_ProductListHelp.pas
index 553e169..1964869 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_ProductListHelp.pas
+++ b/项目代码/djdPack/G03贸易布匹检验/U_ProductListHelp.pas
@@ -178,10 +178,10 @@ begin
//sql.Add(',SumQty=(select Sum(X.Qty) from BS_Cloth_IO X where X.IOFlag='''' and X.fromSubID=A.SubID and isnull(X.STKNAME,'''')=' + Quotedstr(Trim(FSTKNAME)) + ')');
sql.Add('from V_Trade_Plan_Fty A ');
sql.add('where Status=''9'' ');
- if mBegDate<>'' then
- sql.Add('and filltime>='+QuotedStr(mBegDate));
- if mendDate<>'' then
- sql.Add('and filltime<'+QuotedStr(mendDate));
+// if mBegDate<>'' then
+// sql.Add('and filltime>='+QuotedStr(mBegDate));
+// if mendDate<>'' then
+// sql.Add('and filltime<'+QuotedStr(mendDate));
Open;
end;
SDofilter(ADOQueryMain, SLGetFilters(dxLayoutControl_query, 1, 2));
diff --git a/项目代码/djdPack/G03贸易布匹检验/testDll.dproj b/项目代码/djdPack/G03贸易布匹检验/testDll.dproj
index 916bb16..d22a2ef 100644
--- a/项目代码/djdPack/G03贸易布匹检验/testDll.dproj
+++ b/项目代码/djdPack/G03贸易布匹检验/testDll.dproj
@@ -4,7 +4,7 @@
testDll.dpr
True
Debug
- 38017
+ 1
Application
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -49,24 +39,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -87,13 +59,6 @@
2052
CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=
-
- $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png
- 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
-
-
- $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png
-
System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
Debug
@@ -126,20 +91,11 @@
false
true
-
- Debug
-
-
- Debug
-
-
- Debug
-
true
PerMonitorV2
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- D:\Dp10RepoV1\项目代码\D10djdzhuocanPack\项目代码\djdPack\G03贸易布匹检验\testDll.exe
+ D:\Dp10RepoV1\项目代码\D10DJzhuocan\项目代码\djdPack\G03贸易布匹检验\testDll.exe
@@ -170,10 +126,6 @@
- True
- True
- True
- True
True
False
diff --git a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache
index 765713b..b5534ba 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache and b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache differ
diff --git a/项目代码/djdPack/G03贸易布匹检验/testDll.res b/项目代码/djdPack/G03贸易布匹检验/testDll.res
index 2465ca0..e116c48 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/testDll.res and b/项目代码/djdPack/G03贸易布匹检验/testDll.res differ