diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
index 58d361c..e6e2ef6 100644
--- a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
+++ b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj
@@ -90,7 +90,7 @@
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\项目代码\D10DJzhuocan\项目代码\djdPack\G03贸易布匹检验\testDll.exe
+ E:\rtgit\trade\D10DJzhuocan\项目代码\djdPack\G03贸易布匹检验\testDll.exe
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 35d8da7..b74bfac 100644
--- a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -1,104 +1,104 @@
- 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj
+ 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.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.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.717,=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.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.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.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.233,=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.448,=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.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
+ 1899-12-30 00:00:00.000.739,=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.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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贸易布匹检验\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.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 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.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.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.950,=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.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.990,=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.053,=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
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache
index 716d704..702feeb 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj b/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj
index a53c15a..71f502c 100644
--- a/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj
+++ b/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj
@@ -3,10 +3,10 @@
{1441F76D-063C-4B6E-8E51-E7E2BD9D2B49}
-
+
-
+
@@ -17,15 +17,6 @@
-
-
-
-
-
-
-
-
-
@@ -35,14 +26,23 @@
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local b/项目代码/djdPack/G03贸易布匹检验/ProjectGroup1.groupproj.local
index 52fdbb0..193c659 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 93fe95f..778c525 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
@@ -53,8 +53,8 @@ inherited frmMachRollMain: TfrmMachRollMain
OnClick = Button_setClick
end
object Piece: TcxTextEdit
- Left = 241
- Top = 134
+ Left = 240
+ Top = 148
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -62,8 +62,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 164
end
object Qty: TcxTextEdit
- Left = 78
- Top = 134
+ Left = 77
+ Top = 148
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -71,8 +71,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 117
end
object FtyPCId: TcxTextEdit
- Left = 78
- Top = 109
+ Left = 77
+ Top = 117
Properties.ReadOnly = False
Style.HotTrack = False
Style.TransparentBorder = False
@@ -81,8 +81,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 117
end
object Color: TcxTextEdit
- Left = 241
- Top = 84
+ Left = 240
+ Top = 86
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -90,8 +90,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 164
end
object ColorNo: TcxTextEdit
- Left = 78
- Top = 84
+ Left = 77
+ Top = 86
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -99,8 +99,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 117
end
object CodeName: TcxTextEdit
- Left = 241
- Top = 59
+ Left = 240
+ Top = 55
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -108,8 +108,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 164
end
object OrderNo: TcxTextEdit
- Left = 78
- Top = 59
+ Left = 77
+ Top = 55
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -117,8 +117,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 117
end
object BCIOID: TcxTextEdit
- Left = 241
- Top = 109
+ Left = 240
+ Top = 117
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -127,8 +127,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object InputLen: TcxTextEdit
Tag = 999
- Left = 78
- Top = 236
+ Left = 77
+ Top = 254
AutoSize = False
ParentFont = False
Properties.ReadOnly = False
@@ -148,8 +148,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 133
end
object BTPrint: TButton
- Left = 259
- Top = 283
+ Left = 258
+ Top = 301
Width = 140
Height = 59
Caption = #25552' '#20132
@@ -194,8 +194,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object Edit_pieceOrder: TcxTextEdit
Tag = 999
- Left = 270
- Top = 182
+ Left = 269
+ Top = 201
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -214,8 +214,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object Edit_fixLen: TcxTextEdit
Tag = 999
- Left = 343
- Top = 182
+ Left = 342
+ Top = 201
AutoSize = False
ParentFont = False
Properties.ReadOnly = False
@@ -234,8 +234,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object Tare: TcxTextEdit
Tag = 999
- Left = 158
- Top = 283
+ Left = 157
+ Top = 301
AutoSize = False
ParentFont = False
Properties.OnChange = InputLenPropertiesChange
@@ -255,8 +255,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object Coefficient: TcxTextEdit
Tag = 999
- Left = 78
- Top = 351
+ Left = 77
+ Top = 369
AutoSize = False
ParentFont = False
Properties.ReadOnly = False
@@ -276,8 +276,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object InputWeight: TcxTextEdit
Tag = 999
- Left = 78
- Top = 283
+ Left = 77
+ Top = 301
AutoSize = False
ParentFont = False
Properties.OnChange = InputLenPropertiesChange
@@ -296,8 +296,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 71
end
object BatchNO: TcxTextEdit
- Left = 78
- Top = 182
+ Left = 77
+ Top = 201
AutoSize = False
Properties.ReadOnly = False
Style.HotTrack = False
@@ -309,8 +309,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 57
end
object PieceNo: TcxTextEdit
- Left = 183
- Top = 182
+ Left = 182
+ Top = 201
AutoSize = False
Properties.ReadOnly = False
Style.HotTrack = False
@@ -344,8 +344,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 191
end
object edtPacketNo: TcxTextEdit
- Left = 409
- Top = 182
+ Left = 408
+ Top = 201
AutoSize = False
ParentFont = False
Style.Font.Charset = ANSI_CHARSET
@@ -364,7 +364,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object AOrdDefNote1: TcxRichEdit
Left = 0
- Top = 405
+ Top = 427
ParentFont = False
Properties.ReadOnly = True
Properties.ScrollBars = ssBoth
@@ -398,8 +398,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 280
end
object grade: TcxComboBox
- Left = 304
- Top = 236
+ Left = 303
+ Top = 254
AutoSize = False
ParentFont = False
Properties.DropDownListStyle = lsEditFixedList
@@ -452,8 +452,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object lblRuleConversion: TcxComboBox
Tag = 2
- Left = 140
- Top = 351
+ Left = 139
+ Top = 369
AutoSize = False
ParentFont = False
Properties.DropDownListStyle = lsEditFixedList
@@ -475,6 +475,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
+ StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 25
Text = #26080#38656#36716#25442
Height = 37
@@ -483,7 +484,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object packnote: TcxMemo
Tag = 999
Left = 190
- Top = 405
+ Top = 427
ParentFont = False
Properties.ReadOnly = True
Properties.ScrollBars = ssVertical
@@ -521,6 +522,8 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.Kind = lfUltraFlat
StyleHot.LookAndFeel.SkinName = 'WXI'
+ StyleReadOnly.LookAndFeel.Kind = lfUltraFlat
+ StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 0
OnClick = edtScanEnter
OnDblClick = edtScanDblClick
@@ -571,8 +574,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 168
end
object packPostBtn: TButton
- Left = 251
- Top = 351
+ Left = 250
+ Top = 369
Width = 148
Height = 37
Caption = #25171#21253#25552#20132
@@ -882,7 +885,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AllowRemove = False
CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=12]'#25195#25551#26465#30721'[/SIZE][/COLOR][/B]'
Control = edtScan
- ControlOptions.OriginalHeight = 28
+ ControlOptions.OriginalHeight = 34
ControlOptions.OriginalWidth = 149
ControlOptions.ShowBorder = False
OnCaptionClick = dxLayoutItem1CaptionClick
@@ -907,7 +910,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AllowRemove = False
CaptionOptions.Text = #25351#31034#21333
Control = OrderNo
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 0
@@ -930,7 +933,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Parent = dxLayoutGroup_plan_1
CaptionOptions.Text = #26579#21378#32568#21495
Control = FtyPCId
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 2
@@ -939,7 +942,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Parent = dxLayoutGroup_plan_1
CaptionOptions.Text = #33394#21495
Control = ColorNo
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 1
@@ -949,7 +952,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AllowRemove = False
CaptionOptions.Text = #25968#37327
Control = Qty
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 3
@@ -987,7 +990,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AllowRemove = False
CaptionOptions.Text = #21697#21517
Control = CodeName
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 0
@@ -997,7 +1000,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AllowRemove = False
CaptionOptions.Text = #39068#33394
Control = Color
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 1
@@ -1006,7 +1009,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Parent = dxLayoutGroup_plan_2
CaptionOptions.Text = #21305#25968
Control = Piece
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 3
@@ -1015,7 +1018,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Parent = dxLayoutGroup_plan_2
CaptionOptions.Text = #21345#21495
Control = BCIOID
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 144
ControlOptions.ShowBorder = False
Index = 2
@@ -1453,7 +1456,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_Pattern: TdxLayoutItem
CaptionOptions.Text = #33457#22411
Control = C_Pattern
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 124
ControlOptions.ShowBorder = False
Index = -1
@@ -1469,7 +1472,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_StyleNo: TdxLayoutItem
CaptionOptions.Text = #27454#21495
Control = C_StyleNo
- ControlOptions.OriginalHeight = 19
+ ControlOptions.OriginalHeight = 25
ControlOptions.OriginalWidth = 168
ControlOptions.ShowBorder = False
Index = -1
@@ -1491,7 +1494,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField1: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041#36755#20837'1'
Control = customStrField1
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1499,7 +1502,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField2: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041#36755#20837'2'
Control = customStrField2
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1507,7 +1510,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_width: TdxLayoutItem
CaptionOptions.Text = #38376#24133
Control = C_Width
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1515,7 +1518,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_gram: TdxLayoutItem
CaptionOptions.Text = #20811#37325
Control = C_GramWeight
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1523,7 +1526,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_addlen: TdxLayoutItem
CaptionOptions.Text = #21152#38271
Control = addLen
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1531,7 +1534,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_addwet: TdxLayoutItem
CaptionOptions.Text = #21152#37325
Control = addWet
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1548,7 +1551,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_presentLen: TdxLayoutItem
CaptionOptions.Text = #36192#36865#38271#24230
Control = presentLen
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1556,7 +1559,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_presentWeight: TdxLayoutItem
CaptionOptions.Text = #36192#36865#37325#37327
Control = presentWeight
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1564,7 +1567,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_unitPieces: TdxLayoutItem
CaptionOptions.Text = #25340#21305
Control = unitPieces
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1573,7 +1576,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.Width = 190
CaptionOptions.Text = #23458#25143
Control = custName
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 164
ControlOptions.ShowBorder = False
Index = -1
@@ -1581,7 +1584,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField3: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'3'
Control = customStrField3
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 145
ControlOptions.ShowBorder = False
Index = -1
@@ -1589,7 +1592,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_ecolor: TdxLayoutItem
CaptionOptions.Text = #33521#25991#39068#33394
Control = c_ecolor
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 164
ControlOptions.ShowBorder = False
Index = -1
@@ -1605,7 +1608,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField4: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'4'
Control = customStrField4
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1613,7 +1616,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField8: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'8'
Control = customStrField8
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1621,7 +1624,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField7: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'7'
Control = customStrField7
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1629,7 +1632,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField6: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'6'
Control = customStrField6
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1637,7 +1640,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem_customStrField5: TdxLayoutItem
CaptionOptions.Text = #33258#23450#20041'5'
Control = customStrField5
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1645,7 +1648,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object dxLayoutItem12: TdxLayoutItem
CaptionOptions.Text = #26465#24418#30721
Control = TXM
- ControlOptions.OriginalHeight = 25
+ ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = -1
@@ -1666,6 +1669,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 250
Height = 268
Align = alClient
+ PopupMenu = PopupMenu1
TabOrder = 0
object Tv3: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
@@ -1737,6 +1741,13 @@ inherited frmMachRollMain: TfrmMachRollMain
DataController.Summary.SummaryGroups = <>
OptionsView.Footer = True
OptionsView.GroupByBox = False
+ object Tv3ssel: TcxGridDBColumn
+ Caption = #36873#25321
+ DataBinding.FieldName = 'ssel'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeft
+ HeaderAlignmentHorz = taCenter
+ end
object v3PieceNo: TcxGridDBColumn
Caption = #21367#21495
DataBinding.FieldName = 'PieceNo'
@@ -1905,9 +1916,10 @@ inherited frmMachRollMain: TfrmMachRollMain
TabOrder = 1
Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
- ClientRectBottom = 273
- ClientRectRight = 250
- ClientRectTop = 32
+ ClientRectBottom = 272
+ ClientRectLeft = 1
+ ClientRectRight = 249
+ ClientRectTop = 35
object cxTabSheet1: TcxTabSheet
Caption = #24405#20837
ImageIndex = 0
@@ -1915,8 +1927,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Tag = 999
Left = 0
Top = 0
- Width = 250
- Height = 241
+ Width = 248
+ Height = 237
Align = alClient
TabOrder = 0
object Tv2: TcxGridDBTableView
@@ -2037,8 +2049,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Tag = 999
Left = 0
Top = 0
- Width = 250
- Height = 241
+ Width = 248
+ Height = 237
Align = alClient
TabOrder = 0
object TV1: TcxGridDBTableView
@@ -2185,10 +2197,19 @@ inherited frmMachRollMain: TfrmMachRollMain
ImageIndex = 21
OnClick = TprintPackClick
end
- object Trolldel: TToolButton
+ object Tedit: TToolButton
Left = 158
Top = 0
AutoSize = True
+ Caption = #20462#25913
+ ImageIndex = 3
+ Wrap = True
+ OnClick = TeditClick
+ end
+ object Trolldel: TToolButton
+ Left = 0
+ Top = 30
+ AutoSize = True
Caption = #21024#38500
ImageIndex = 5
Wrap = True
@@ -2196,23 +2217,14 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object ToolButton4: TToolButton
Left = 0
- Top = 30
+ Top = 60
AutoSize = True
Caption = #30133#28857#31649#29702
ImageIndex = 2
OnClick = ToolButton4Click
end
- object Tedit: TToolButton
- Left = 103
- Top = 30
- AutoSize = True
- Caption = #20462#25913
- ImageIndex = 3
- Wrap = True
- OnClick = TeditClick
- end
object ToolButton7: TToolButton
- Left = 0
+ Left = 103
Top = 60
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -2220,7 +2232,7 @@ inherited frmMachRollMain: TfrmMachRollMain
OnClick = ToolButton7Click
end
object Tlog: TToolButton
- Left = 103
+ Left = 206
Top = 60
AutoSize = True
Caption = #26085#24535
@@ -2359,8 +2371,8 @@ inherited frmMachRollMain: TfrmMachRollMain
OnEnter = edtScanEnter
end
inherited IsSubtract: TcxCheckBox
- ExplicitWidth = 60
- Width = 60
+ ExplicitWidth = 43
+ Width = 43
end
inherited SubtractQty: TcxTextEdit
Properties.OnEditValueChanged = nil
@@ -2404,10 +2416,10 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 245
Width = 319
inline FrameKeyBoard1: TFrameKeyBoard
- Left = 2
- Top = 24
- Width = 315
- Height = 219
+ Left = 4
+ Top = 21
+ Width = 311
+ Height = 208
Align = alClient
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
@@ -2416,15 +2428,15 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Style = []
ParentFont = False
TabOrder = 0
- ExplicitLeft = 2
- ExplicitTop = 24
- ExplicitWidth = 315
- ExplicitHeight = 219
+ ExplicitLeft = 4
+ ExplicitTop = 21
+ ExplicitWidth = 311
+ ExplicitHeight = 208
inherited dxPanel1: TdxPanel
- Width = 315
- Height = 219
- ExplicitWidth = 315
- ExplicitHeight = 219
+ Width = 311
+ Height = 208
+ ExplicitWidth = 311
+ ExplicitHeight = 208
inherited SpeedButton1: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click
end
@@ -2710,4 +2722,16 @@ inherited frmMachRollMain: TfrmMachRollMain
Left = 600
Top = 176
end
+ object PopupMenu1: TPopupMenu
+ Left = 784
+ Top = 392
+ object N1: TMenuItem
+ Caption = #20840#36873
+ OnClick = N1Click
+ end
+ object N2: TMenuItem
+ Caption = #20840#24323
+ OnClick = N2Click
+ end
+ end
end
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
index 56de329..a4ab286 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
@@ -18,7 +18,7 @@ uses
cxGeometry, dxFramedControl, dxPanel, U_KeyBoard, cxGroupBox,
cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar,
cxCurrencyEdit, Xml.XMLDoc, Xml.xmldom, Xml.XMLIntf, cxDateUtils,
- System.DateUtils;
+ System.DateUtils, dxCoreGraphics;
type
TfrmMachRollMain = class(TfrmBaseList)
@@ -270,6 +270,10 @@ type
Panel1: TPanel;
FtyPCIDSX: TcxTextEdit;
Label1: TLabel;
+ Tv3ssel: TcxGridDBColumn;
+ PopupMenu1: TPopupMenu;
+ N1: TMenuItem;
+ N2: TMenuItem;
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Button_badClick(Sender: TObject);
@@ -321,6 +325,8 @@ type
procedure FormKeyPress(Sender: TObject; var Key: Char);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FtyPCIDSXKeyPress(Sender: TObject; var Key: Char);
+ procedure N1Click(Sender: TObject);
+ procedure N2Click(Sender: TObject);
private
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -383,6 +389,7 @@ type
procedure TimerCloseForm(Sender: TObject);
type
+
public
fmanage, canshu1: string;
fFlileFlag: string;
@@ -1675,6 +1682,18 @@ begin
QuantityConversion();
end;
+procedure TfrmMachRollMain.N1Click(Sender: TObject);
+begin
+ inherited;
+ SelOKNo(CDS_3, true);
+end;
+
+procedure TfrmMachRollMain.N2Click(Sender: TObject);
+begin
+ inherited;
+ SelOKNo(CDS_3, false);
+end;
+
procedure TfrmMachRollMain.SetUnit(MUnit: string);
begin
// lblLenUnit.Caption := MUnit;
@@ -1789,11 +1808,34 @@ begin
// PrtData(cds_3.fieldbyName('CIID').AsString);
if trim(cds_params.fieldbyName('outPage').AsString) = '' then
begin
- PrtData(cds_3.fieldbyName('CIID').AsString);
+ with cds_3 do
+ begin
+ First;
+ while not eof do
+ begin
+ if FieldByName('ssel').AsBoolean then
+ begin
+ PrtData(cds_3.fieldbyName('CIID').AsString);
+ end;
+
+ Next;
+ end;
+ end;
end;
if trim(cds_params.fieldbyName('aixunpage').AsString) = '' then
begin
- PrtaixunData(cds_3.fieldbyName('CIID').AsString);
+ with cds_3 do
+ begin
+ First;
+ while not eof do
+ begin
+ if FieldByName('ssel').AsBoolean then
+ begin
+ PrtaixunData(cds_3.fieldbyName('CIID').AsString);
+ end;
+ Next;
+ end;
+ end;
end;
end;
@@ -3156,7 +3198,13 @@ begin
xmlNode.ChildNodes.Add(xml.CreateNode(Trim(ADOQueryPrint.FieldByName('Meter').AsString), ntText)); //
xmlNode := xml.DocumentElement.AddChild('ProductUnit');
- xmlNode.ChildNodes.Add(xml.CreateNode('', ntText)); //λ
+ if LowerCase(FOrdUnit) = 'kg' then
+ xmlNode.ChildNodes.Add(xml.CreateNode('KG', ntText)) //λ
+ else if (LowerCase(FOrdUnit) = 'm') or (FOrdUnit = '') then
+ xmlNode.ChildNodes.Add(xml.CreateNode('M', ntText)) //λ
+ else
+ xmlNode.ChildNodes.Add(xml.CreateNode('M', ntText)); //λ
+
xmlNode := xml.DocumentElement.AddChild('VolumeNumber');
xmlNode.ChildNodes.Add(xml.CreateNode(Trim(ADOQueryPrint.FieldByName('PieceNo').AsString), ntText)); //
diff --git a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache
index e699970..943373f 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache and b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache differ