diff --git a/T03贸易布匹检验/DjdMachineInsp.dproj.local b/T03贸易布匹检验/DjdMachineInsp.dproj.local
index c75a9f7..cb85505 100644
--- a/T03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/T03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -1,100 +1,100 @@
 <?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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</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.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.137,=D:\Dp10RepoV1\项目代码\D10myOukai\T00贸易通用窗体\U_TradePlanSel.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.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\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.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.137,=D:\Dp10RepoV1\项目代码\D10myOukai\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</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.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj</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.294,=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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.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.507,=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.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.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.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.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.294,=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.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm</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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.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.447,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.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.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm</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.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj</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.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</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.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.233,=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.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.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm</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.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_printPdf.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.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.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.679,=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.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.706,=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.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm</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.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj</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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.447,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_printPdf.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm</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.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.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.739,=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.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
diff --git a/T03贸易布匹检验/DjdMachineInsp.identcache b/T03贸易布匹检验/DjdMachineInsp.identcache
index 415d003..3f8fe41 100644
Binary files a/T03贸易布匹检验/DjdMachineInsp.identcache and b/T03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/T03贸易布匹检验/TradeInspFile.INI b/T03贸易布匹检验/TradeInspFile.INI
index 8063b4a..fa5e75f 100644
--- a/T03贸易布匹检验/TradeInspFile.INI
+++ b/T03贸易布匹检验/TradeInspFile.INI
@@ -13,8 +13,8 @@
 ��������=100
 ��������=0
 ��������=222
-����С��λ=0
-����С��λ=2
+����С��λ=1
+����С��λ=1
 ����С��λ=1
 �Զ�����ĸ��1=A
 �Զ�����ĸ��2=-
diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm
index 48b469d..2fc0ec6 100644
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@@ -114,7 +114,7 @@
     object InputLen: TcxTextEdit
       Tag = 999
       Left = 74
-      Top = 251
+      Top = 278
       AutoSize = False
       ParentFont = False
       Properties.ReadOnly = False
@@ -127,7 +127,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 20
+      TabOrder = 21
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
       Height = 38
@@ -135,7 +135,7 @@
     end
     object BTPrint: TButton
       Left = 259
-      Top = 298
+      Top = 325
       Width = 335
       Height = 59
       Caption = #25552'  '#20132
@@ -145,7 +145,7 @@
       Font.Name = #24494#36719#38597#40657
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 24
+      TabOrder = 25
       OnClick = BTPrintClick
     end
     object Button_bad: TButton
@@ -181,7 +181,7 @@
     object Edit_pieceOrder: TcxTextEdit
       Tag = 999
       Left = 262
-      Top = 201
+      Top = 228
       AutoSize = False
       ParentFont = False
       Properties.ReadOnly = True
@@ -193,7 +193,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 16
+      TabOrder = 17
       OnClick = Edit_pieceOrderClick
       Height = 27
       Width = 20
@@ -201,7 +201,7 @@
     object Edit_fixLen: TcxTextEdit
       Tag = 999
       Left = 329
-      Top = 201
+      Top = 228
       AutoSize = False
       ParentFont = False
       Properties.ReadOnly = False
@@ -213,7 +213,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 17
+      TabOrder = 18
       OnClick = edtScanEnter
       Height = 27
       Width = 25
@@ -221,7 +221,49 @@
     object Tare: TcxTextEdit
       Tag = 999
       Left = 158
-      Top = 298
+      Top = 325
+      AutoSize = False
+      ParentFont = False
+      Properties.OnChange = InputLenPropertiesChange
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -21
+      Style.Font.Name = #24494#36719#38597#40657
+      Style.Font.Style = [fsBold]
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      Style.IsFontAssigned = True
+      TabOrder = 24
+      OnClick = edtScanEnter
+      OnKeyPress = InputLenKeyPress
+      Height = 59
+      Width = 57
+    end
+    object Coefficient: TcxTextEdit
+      Tag = 999
+      Left = 74
+      Top = 393
+      AutoSize = False
+      ParentFont = False
+      Properties.ReadOnly = False
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -19
+      Style.Font.Name = #24494#36719#38597#40657
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      Style.IsFontAssigned = True
+      TabOrder = 26
+      OnClick = edtScanEnter
+      OnKeyPress = InputLenKeyPress
+      Height = 37
+      Width = 57
+    end
+    object InputWeight: TcxTextEdit
+      Tag = 999
+      Left = 74
+      Top = 325
       AutoSize = False
       ParentFont = False
       Properties.OnChange = InputLenPropertiesChange
@@ -237,53 +279,11 @@
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
       Height = 59
-      Width = 57
-    end
-    object Coefficient: TcxTextEdit
-      Tag = 999
-      Left = 74
-      Top = 366
-      AutoSize = False
-      ParentFont = False
-      Properties.ReadOnly = False
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -19
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      Style.IsFontAssigned = True
-      TabOrder = 25
-      OnClick = edtScanEnter
-      OnKeyPress = InputLenKeyPress
-      Height = 37
-      Width = 57
-    end
-    object InputWeight: TcxTextEdit
-      Tag = 999
-      Left = 74
-      Top = 298
-      AutoSize = False
-      ParentFont = False
-      Properties.OnChange = InputLenPropertiesChange
-      Style.Font.Charset = ANSI_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -21
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = [fsBold]
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      Style.IsFontAssigned = True
-      TabOrder = 22
-      OnClick = edtScanEnter
-      OnKeyPress = InputLenKeyPress
-      Height = 59
       Width = 75
     end
     object BatchNO: TcxTextEdit
       Left = 74
-      Top = 201
+      Top = 228
       AutoSize = False
       ParentFont = False
       Properties.ReadOnly = False
@@ -295,7 +295,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 14
+      TabOrder = 15
       OnClick = edtScanEnter
       OnExit = BatchNOExit
       OnKeyPress = InputLenKeyPress
@@ -304,12 +304,12 @@
     end
     object PieceNo: TcxTextEdit
       Left = 173
-      Top = 201
+      Top = 228
       AutoSize = False
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 15
+      TabOrder = 16
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
       Height = 27
@@ -329,7 +329,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 34
+      TabOrder = 35
       Visible = False
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
@@ -338,7 +338,7 @@
     end
     object edtPacketNo: TcxTextEdit
       Left = 400
-      Top = 201
+      Top = 228
       AutoSize = False
       ParentFont = False
       Style.Font.Charset = ANSI_CHARSET
@@ -349,7 +349,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 18
+      TabOrder = 19
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
       Height = 27
@@ -357,7 +357,7 @@
     end
     object AOrdDefNote1: TcxRichEdit
       Left = 0
-      Top = 456
+      Top = 483
       ParentFont = False
       Properties.ReadOnly = True
       Properties.ScrollBars = ssBoth
@@ -369,7 +369,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 32
+      TabOrder = 33
       Height = 206
       Width = 181
     end
@@ -385,14 +385,14 @@
       Properties.ShowFocusRect = False
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 35
+      TabOrder = 36
       Visible = False
       Height = 122
       Width = 280
     end
     object grade: TcxComboBox
       Left = 304
-      Top = 251
+      Top = 278
       AutoSize = False
       ParentFont = False
       Properties.DropDownListStyle = lsEditFixedList
@@ -407,7 +407,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 21
+      TabOrder = 22
       Text = #27491#21697
       OnKeyPress = InputLenKeyPress
       Height = 38
@@ -446,7 +446,7 @@
     object lblRuleConversion: TcxComboBox
       Tag = 2
       Left = 140
-      Top = 366
+      Top = 393
       AutoSize = False
       ParentFont = False
       Properties.DropDownListStyle = lsEditFixedList
@@ -469,7 +469,7 @@
       StyleDisabled.LookAndFeel.SkinName = 'WXI'
       StyleFocused.LookAndFeel.SkinName = 'WXI'
       StyleHot.LookAndFeel.SkinName = 'WXI'
-      TabOrder = 27
+      TabOrder = 28
       Text = #26080#38656#36716#25442
       Height = 37
       Width = 158
@@ -477,7 +477,7 @@
     object packnote: TcxMemo
       Tag = 999
       Left = 190
-      Top = 456
+      Top = 483
       ParentFont = False
       Properties.ReadOnly = True
       Properties.ScrollBars = ssVertical
@@ -489,7 +489,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 33
+      TabOrder = 34
       Height = 206
       Width = 199
     end
@@ -546,7 +546,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 39
+      TabOrder = 40
       Text = '100'
       Visible = False
       OnClick = edtScanEnter
@@ -554,19 +554,9 @@
       Height = 29
       Width = 69
     end
-    object C_StyleNo: TcxTextEdit
-      Left = 8561
-      Top = 10000
-      Properties.ReadOnly = True
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 40
-      Visible = False
-      Width = 168
-    end
     object packPostBtn: TButton
       Left = 307
-      Top = 366
+      Top = 393
       Width = 158
       Height = 37
       Caption = #25171#21253#25552#20132
@@ -576,7 +566,7 @@
       Font.Name = #24494#36719#38597#40657
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 29
+      TabOrder = 30
       OnClick = packPostBtnClick
     end
     object customStrField1: TcxTextEdit
@@ -690,7 +680,7 @@
     end
     object BAN: TSpeedButton
       Left = 474
-      Top = 366
+      Top = 393
       Width = 120
       Height = 37
       Caption = #25171#26495#26631#31614
@@ -704,10 +694,10 @@
     end
     object PlateNo: TcxTextEdit
       Left = 481
-      Top = 201
+      Top = 228
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 19
+      TabOrder = 20
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
       Width = 35
@@ -724,41 +714,41 @@
     end
     object edtChen: TcxTextEdit
       Left = 74
-      Top = 412
+      Top = 439
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 26
+      TabOrder = 27
       Text = #8730
       OnClick = edtChenClick
       Width = 57
     end
     object edtMaBiao: TcxTextEdit
       Left = 177
-      Top = 412
+      Top = 439
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 28
+      TabOrder = 29
       Text = #8730
       OnClick = edtMaBiaoClick
       Width = 121
     end
     object outPage: TcxTextEdit
       Left = 344
-      Top = 412
+      Top = 439
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 30
+      TabOrder = 31
       Text = #8730
       OnClick = outPageClick
       Width = 121
     end
     object labNumber: TComboBox
       Left = 511
-      Top = 412
+      Top = 439
       Width = 83
       Height = 27
       ItemIndex = 0
-      TabOrder = 31
+      TabOrder = 32
       Text = '1'
       OnChange = labNumberChange
       Items.Strings = (
@@ -769,6 +759,15 @@
         '5'
         '6')
     end
+    object C_StyleNo: TcxComboBox
+      Left = 71
+      Top = 185
+      Properties.OnChange = C_StyleNoPropertiesChange
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 14
+      Width = 674
+    end
     object dxLayoutControl_packGroup_Root: TdxLayoutGroup
       AlignHorz = ahClient
       AlignVert = avTop
@@ -779,7 +778,7 @@
       SizeOptions.SizableVert = True
       AllowRemove = False
       Hidden = True
-      ItemIndex = 2
+      ItemIndex = 4
       Padding.Left = -15
       Padding.Top = -5
       Padding.AssignedValues = [lpavLeft, lpavTop]
@@ -854,6 +853,7 @@
       SizeOptions.Height = 141
       SizeOptions.Width = 721
       AllowRemove = False
+      ItemIndex = 1
       LayoutDirection = ldHorizontal
       Padding.Bottom = -10
       Padding.Left = -15
@@ -905,7 +905,7 @@
       SizeOptions.SizableVert = True
       SizeOptions.Width = 201
       Hidden = True
-      ItemIndex = 2
+      ItemIndex = 3
       ShowBorder = False
       UseIndent = False
       Index = 1
@@ -987,7 +987,7 @@
       Padding.Left = -10
       Padding.Top = -10
       Padding.AssignedValues = [lpavBottom, lpavLeft, lpavRight, lpavTop]
-      Index = 3
+      Index = 4
     end
     object dxLayoutItem13: TdxLayoutItem
       Parent = dxLayoutGroup_do1
@@ -1044,7 +1044,7 @@
       Padding.Left = -10
       Padding.Top = -10
       Padding.AssignedValues = [lpavLeft, lpavTop]
-      Index = 4
+      Index = 5
     end
     object dxLayoutItem15: TdxLayoutItem
       Parent = dxLayoutAutoCreatedGroup5
@@ -1271,7 +1271,7 @@
       ItemIndex = 1
       LayoutDirection = ldHorizontal
       ShowBorder = False
-      Index = 5
+      Index = 6
     end
     object dxLayoutItem_zhfield: TdxLayoutItem
       Parent = dxLayoutGroup2
@@ -1397,14 +1397,6 @@
       ControlOptions.ShowBorder = False
       Index = -1
     end
-    object dxLayoutItem_StyleNo: TdxLayoutItem
-      CaptionOptions.Text = #27454#21495
-      Control = C_StyleNo
-      ControlOptions.OriginalHeight = 27
-      ControlOptions.OriginalWidth = 168
-      ControlOptions.ShowBorder = False
-      Index = -1
-    end
     object dxLayoutItem_packpost: TdxLayoutItem
       Parent = dxLayoutAutoCreatedGroup10
       AlignHorz = ahClient
@@ -1593,6 +1585,15 @@
       AlignHorz = ahClient
       Index = 2
     end
+    object dxLayoutItem_StyleNo: TdxLayoutItem
+      Parent = dxLayoutControl_packGroup_Root
+      CaptionOptions.Text = #27454#21495
+      Control = C_StyleNo
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 121
+      ControlOptions.ShowBorder = False
+      Index = 3
+    end
   end
   object Panel_right: TPanel [1]
     Left = 1037
@@ -1978,6 +1979,10 @@
       object 查看: TcxTabSheet
         Caption = #26597#30475
         ImageIndex = 1
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object cxGrid1: TcxGrid
           Tag = 999
           Left = 0
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 50af2dc..47e9189 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -18,7 +18,8 @@ uses
   U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel,
   RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, dxSkinWXI, frxBarcode,
   frxOLE, frxRich, frxClass, frxDBSet, frxTableObject, frxExportPPTX,
-  frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask, cxSplitter;
+  frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask, cxSplitter,
+  Vcl.DBCtrls;
 
 type
   TfrmMachRollMain = class(TfrmBaseList)
@@ -198,8 +199,6 @@ type
     dxLayoutItem_RuleYardstick: TdxLayoutItem;
     cds_paramsAddwetPresent: TFloatField;
     cds_paramsAddLenPresent: TFloatField;
-    C_StyleNo: TcxTextEdit;
-    dxLayoutItem_StyleNo: TdxLayoutItem;
     Tv3AddwetPresent: TcxGridDBColumn;
     Tv3AddLenPresent: TcxGridDBColumn;
     cxGridPopupMenu1: TcxGridPopupMenu;
@@ -272,6 +271,8 @@ type
     dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup;
+    C_StyleNo: TcxComboBox;
+    dxLayoutItem_StyleNo: TdxLayoutItem;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button_badClick(Sender: TObject);
@@ -324,6 +325,9 @@ type
     procedure edtMaBiaoClick(Sender: TObject);
     procedure outPageClick(Sender: TObject);
     procedure labNumberChange(Sender: TObject);
+    procedure C_StyleNoChange(Sender: TObject);
+    procedure C_StyleNoDropDown(Sender: TObject);
+    procedure C_StyleNoPropertiesChange(Sender: TObject);
   private
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -370,15 +374,17 @@ type
     procedure GetRulePacketNo();
     procedure CheckRulePacketNo();
     procedure getPlanImage(MSubID: string);
+    procedure loadstyleno();
     function deletePack(packId: string): boolean;
     function checkPicecNo(): boolean;
     function getCurPieceNO(mCcid: string): string;
     function InitDevComboboxG(ADOQueryTmp: TADOQuery; combobox: TcxCombobox; mFlag: string; selFlag: Boolean = true): Boolean;
     type
 
+
   public
     fmanage: string;
-    fFlileFlag: string;
+    fFlileFlag, FFsubid, FFactoryname: string;
   end;
 
 var
@@ -443,11 +449,11 @@ begin
       SQL.Add(' and A.FromSubId=''' + trim(Fsubid) + '''');
       Open;
     end;
-    if ADOCmd.IsEmpty then
-    begin
-      Application.MessageBox('����ɫδ�ڴ��첼�ֿ⣬�����Լ������ɫ��', '��ʾ��Ϣ', MB_ICONERROR);
-      exit;
-    end;
+//    if ADOCmd.IsEmpty then
+//    begin
+//      Application.MessageBox('����ɫδ�ڴ��첼�ֿ⣬�����Լ������ɫ��', '��ʾ��Ϣ', MB_ICONERROR);
+//      exit;
+//    end;
     if ((trim(Coefficient.text) = '') and ((trim(lblRuleConversion.text) = '����ת��') or (trim(lblRuleConversion.text) = ''))) or (trim(C_Width.text) = '') or (trim(C_GramWeight.text) = '') then
     begin
       with ADOCmd do
@@ -1024,6 +1030,7 @@ begin
     WriteINIFile;
   GetINIFile();
   setFormCtrol();
+
   if trim(fmanage) <> '��Ȩ��' then
   begin
     if trim(DZCDYDllName) <> '' then
@@ -1060,6 +1067,32 @@ begin
 
 end;
 
+procedure TfrmMachRollMain.loadstyleno;
+begin
+  C_StyleNo.Properties.Items.Clear;
+//  ShowMessage(fFsubid);
+
+  with ADOQuery1 do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('SELECT c_styleno FROM trade_plan_sub_style WHERE subid = ''' + Trim(FFsubid) + '''');
+//    ShowMessage(SQL.Text);
+    Open;
+
+    while not Eof do
+    begin
+      C_StyleNo.Properties.Items.Add(FieldByName('c_styleno').AsString);
+      Next;
+    end;
+  end;
+  if C_StyleNo.Text = '' then
+  begin
+    if C_StyleNo.Properties.Items.Count > 0 then
+      C_StyleNo.ItemIndex := 0;
+  end;
+end;
+
 procedure TfrmMachRollMain.frameBads1CIFBegDblClick(Sender: TObject);
 begin
   inherited;
@@ -1384,6 +1417,7 @@ begin
       // FC_ColorDepth := Trim(ADOTmp.fieldbyname('C_ColorDepth').AsString);
       // FWorkshop := Trim(ADOTmp.fieldbyname('Workshop').AsString);
       FC_StyleNo := trim(fieldbyName('C_StyleNo').AsString);
+//      C_StyleNo.Text := FC_StyleNo;
       FC_Composition := trim(fieldbyName('C_Composition').AsString);
       FC_Code := trim(fieldbyName('C_Code').AsString);
       FC_Name := trim(fieldbyName('C_Name').AsString);
@@ -1474,7 +1508,8 @@ begin
       Color.Text := FC_Color;
       FtyPCId.Text := FFtyPCId;
       BCIOID.Text := FBCIOID;
-      C_StyleNo.Text := FC_StyleNo;
+//      C_StyleNo.Text := FC_StyleNo;
+
       Piece.Text := trim(fieldbyName('ordPiece').AsString);
       Qty.Text := trim(fieldbyName('ordQty').AsString) + trim(fieldbyName('ordUnit').AsString);
       //
@@ -2459,6 +2494,40 @@ begin
   cxPageControl1.ActivePageIndex := 0;
 end;
 
+procedure TfrmMachRollMain.C_StyleNoChange(Sender: TObject);
+var
+  FFactoryname: string;
+begin
+
+end;
+
+procedure TfrmMachRollMain.C_StyleNoDropDown(Sender: TObject);
+begin
+  inherited;
+//  C_StyleNoChange(Sender);
+end;
+
+procedure TfrmMachRollMain.C_StyleNoPropertiesChange(Sender: TObject);
+begin
+  with ADOQueryBaseTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select factoryname from trade_plan_sub_style ' + 'where subid = ''' + FFSubId + ''' ' +       // ע�������
+      'and c_styleno = ''' + Trim(C_StyleNo.Text) + '''');  // ͬ��������
+    Open;
+
+    if not IsEmpty then
+      FFactoryname := FieldByName('factoryname').AsString
+    else
+      FFactoryname := '';  // û�鵽ʱ�ÿ�
+  end;
+//
+//   �����������ɾ��
+//  ShowMessage('��������: ' + FFactoryname);
+
+end;
+
 procedure TfrmMachRollMain.edtChenClick(Sender: TObject);
 begin
   inherited;
@@ -2607,15 +2676,21 @@ begin
       exit;
     if trim(edtScan.Text) = FBCIOID then
       exit;
+    FFsubid := edtScan.Text;
+
     ClearGlobal();
     FOperationStatus := '������';
     // InitLCK(edtScan.Text);
     InitPlan(edtScan.Text);
+    C_StyleNo.Text := FC_StyleNo;
+    loadstyleno();
+//    C_StyleNo.ItemIndex := 0;
     frameBads1cxCheckBox_readLenPropertiesChange(frameBads1.IsSubtract);
     // �Ƿ�����ȹ�ѡ
     if trim(OrderNo.Text) <> '' then
       InputLen.SetFocus;
     cxGroupBox_keys.Visible := false;
+
   end;
 end;
 
@@ -2684,6 +2759,8 @@ begin
       end;
       // ϵ��
       fieldbyName('Coefficient').value := strtofloatdef(trim(Coefficient.Text), 0); // ϵ��
+      fieldbyname('Factoryname').Value := FFactoryname;
+      fieldbyname('c_styleno').value := C_StyleNo.Text;
       /// //////////////////////           ��������         /////////////////////////
       if cds_params.fieldbyName('weightRule').AsInteger = 0 then
       // InputWeight  �         OutPutWeight   ����
@@ -2805,16 +2882,17 @@ begin
       fieldbyName('C_EName').value := FC_EName;
       fieldbyName('BatchNO').value := BatchNO.Text;
       fieldbyName('FtyPCId').value := FtyPCId.Text; // ԭ�׺�
-      if strtointdef(Plateno.Text, 0) <> 0 then
+
+      if (StrToIntDef(Plateno.Text, 0) <> 0) and (FieldByName('grade').AsString <> '������') then
       begin
-        fieldbyName('Plateno').value := trim(Plateno.text); //���
+        FieldByName('Plateno').AsString := Trim(Plateno.Text);
       end;
 
       fieldbyName('C_Spec').value := FC_Spec;
       fieldbyName('C_Color').value := FC_Color;
       fieldbyName('C_EColor').value := FC_EColor;
       fieldbyName('C_ColorNo').value := FC_ColorNo;
-      fieldbyName('C_StyleNo').value := FC_StyleNo;
+//      fieldbyName('C_StyleNo').value := FC_StyleNo;
       fieldbyName('C_Composition').value := FC_Composition;
       if dxLayoutItem_width.ActuallyVisible then
         fieldbyName('C_Width').value := trim(C_width.Text)