1

public10/design/U_FormInitThread.pas

@@ -34,16 +34,12 @@ begin
 end;
 
 procedure TFormInitThread.Execute;
-var
-  i:integer;
 begin
   // 在这里执行耗时的数据加载操作
     Synchronize(LoadData); // 使用 Synchronize 方法确保在主线程中更新 UI
   //LoadData();
 end;
 procedure TFormInitThread.LoadData;
-var
-  I: Integer;
 begin
   // 这里是实际加载数据的代码
   // 假设你有一个方法叫 LoadDataFromDatabase 在数据模块中

项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local

@@ -70,12 +70,12 @@
   </ProjectSortOrder>
 	<Transactions>
     <Transaction>1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
   </Transactions>
 </BorlandProject>

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dpr

@@ -18,7 +18,6 @@ uses
   U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
   U_CompressionFun in '..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas',
   U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas',
-  U_CDList in 'U_CDList.pas' {frmCDList},
   U_AttachmentUpload in '..\A00通用窗体\U_AttachmentUpload.pas' {frmFjList_RZ},
   U_ClothInfoSel in '..\A00通用窗体\U_ClothInfoSel.pas' {frmClothInfoSel},
   U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel},

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj

@@ -119,10 +119,6 @@
         <DCCReference Include="..\..\..\public10\design\U_WindowFormdesign.pas"/>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
-        <DCCReference Include="U_CDList.pas">
-            <Form>frmCDList</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
         <DCCReference Include="..\A00通用窗体\U_AttachmentUpload.pas">
             <Form>frmFjList_RZ</Form>
             <FormType>dfm</FormType>

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local

@@ -36,9 +36,9 @@
     <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.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.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.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
@@ -47,7 +47,7 @@
     <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.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,=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.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
@@ -59,11 +59,11 @@
     <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.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</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.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.990,=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.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</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.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm</Transaction>
@@ -90,11 +90,11 @@
     <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.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</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.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.053,=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.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.739,=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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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>
@@ -187,7 +187,5 @@
     <File Path="U_TradePack.dfm"/>
     <File Path="U_TradeClothInspList_Auto.pas"/>
     <File Path="U_TradeClothInspList_Auto.dfm"/>
-    <File Path="U_CDList.pas"/>
-    <File Path="U_CDList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm

@@ -8,6 +8,7 @@ inherited frmMachRollMain: TfrmMachRollMain
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitTop = -117
   ExplicitWidth = 1128
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -57,6 +58,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 13
+      OnClick = edtScanEnter
       Width = 164
     end
     object Qty: TcxTextEdit
@@ -66,6 +68,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 9
+      OnClick = edtScanEnter
       Width = 105
     end
     object FtyPCId: TcxTextEdit
@@ -831,6 +834,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 22
+      OnClick = edtScanEnter
       Height = 31
       Width = 83
     end
@@ -840,6 +844,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 21
+      OnClick = edtScanEnter
       Width = 95
     end
     object C_GramWeight2: TcxTextEdit
@@ -849,6 +854,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 23
+      OnClick = edtScanEnter
       Height = 31
       Width = 88
     end
@@ -859,6 +865,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 24
+      OnClick = edtScanEnter
       Height = 31
       Width = 92
     end
@@ -868,6 +875,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 25
+      OnClick = edtScanEnter
       Width = 121
     end
     object BDBC_Width: TcxTextEdit
@@ -877,6 +885,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 26
+      OnClick = edtScanEnter
       Height = 31
       Width = 121
     end
@@ -887,6 +896,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 33
+      OnClick = edtScanEnter
       Height = 31
       Width = 121
     end
@@ -897,6 +907,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 32
+      OnClick = edtScanEnter
       Height = 31
       Width = 121
     end
@@ -913,6 +924,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 28
+      OnClick = edtScanEnter
       Width = 121
     end
     object TW_diff: TcxButtonEdit
@@ -929,6 +941,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 29
+      OnClick = edtScanEnter
       Height = 31
       Width = 121
     end
@@ -946,6 +959,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 30
+      OnClick = edtScanEnter
       Height = 31
       Width = 121
     end
@@ -962,6 +976,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 27
+      OnClick = edtScanEnter
       Width = 121
     end
     object color_light: TcxButtonEdit
@@ -977,6 +992,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 31
+      OnClick = edtScanEnter
       Width = 121
     end
     object dxLayoutControl_packGroup_Root: TdxLayoutGroup
@@ -2623,80 +2639,62 @@ inherited frmMachRollMain: TfrmMachRollMain
       ExplicitWidth = 338
       ExplicitHeight = 734
       inherited dxPanel1: TdxPanel
-        Top = 448
+        Top = 371
         Width = 338
-        Height = 286
+        Height = 363
-        ExplicitTop = 448
+        ExplicitTop = 371
         ExplicitWidth = 338
-        ExplicitHeight = 286
+        ExplicitHeight = 363
         inherited RadioGroup1: TRadioGroup
-          Top = 227
+          Top = 304
           Width = 336
           Height = 57
           Visible = False
-          ExplicitTop = 227
+          ExplicitTop = 304
           ExplicitWidth = 336
           ExplicitHeight = 57
         end
         inherited dxPanel3: TdxPanel
-          Top = 104
+          Top = 106
           Width = 336
-          Height = 123
+          Height = 198
-          ExplicitTop = 104
+          ExplicitTop = 107
           ExplicitWidth = 336
-          ExplicitHeight = 123
+          ExplicitHeight = 198
           inherited cxButton1: TcxButton
-            Left = 56
+            Left = 18
-            Top = 77
+            Top = 164
-            ExplicitLeft = 56
+            Visible = False
-            ExplicitTop = 77
+            OnClick = frameBads1cxButton1Click
+            ExplicitLeft = 18
+            ExplicitTop = 164
           end
           inherited cxButton2: TcxButton
-            Left = 189
+            Left = 118
-            Top = 79
+            Top = 142
             OnClick = cxButton2Click
-            ExplicitLeft = 189
+            ExplicitLeft = 118
-            ExplicitTop = 79
+            ExplicitTop = 142
           end
         end
         inherited dxLayoutControl1: TdxLayoutControl
-          Top = 5
+          Top = 7
           Width = 336
           OnDblClick = dxLayoutControl_packDblClick
-          ExplicitTop = 5
+          ExplicitTop = 7
           ExplicitWidth = 336
           inherited CIFBeg: TcxTextEdit
-            Top = 48
             OnEnter = edtScanEnter
-            ExplicitTop = 48
-          end
-          inherited CIFEnd: TcxTextEdit
-            Top = 48
-            ExplicitTop = 48
-          end
-          inherited CIFQty: TcxTextEdit
-            Top = 48
-            ExplicitTop = 48
-          end
-          inherited CIFNumber: TcxTextEdit
-            Top = 3
-            ExplicitTop = 3
           end
           inherited IsSubtract: TcxCheckBox
-            Top = 3
-            ExplicitTop = 3
             ExplicitWidth = 43
             Width = 43
           end
           inherited SubtractQty: TcxTextEdit
-            Top = 3
             Properties.OnEditValueChanged = nil
-            ExplicitTop = 3
           end
           inherited cxCheck_len: TcxCheckBox
-            Top = 48
             Properties.OnChange = frameBads1cxCheck_lenPropertiesChange
-            ExplicitTop = 48
           end
           inherited dxLayoutControl1Group_Root: TdxLayoutGroup
             ItemIndex = 1
@@ -2705,41 +2703,61 @@ inherited frmMachRollMain: TfrmMachRollMain
       end
       inherited cxScrollBox1: TcxScrollBox
         Width = 338
-        Height = 448
+        Height = 371
         ExplicitWidth = 338
-        ExplicitHeight = 448
+        ExplicitHeight = 371
       end
       inherited ADOTmp: TADOQuery
         Left = 104
         Top = 153
       end
     end
-    object CIFPoints: TcxTextEdit
-      Left = 98
-      Top = 549
-      TabOrder = 1
-      Width = 121
-    end
-    object cxLabel1: TcxLabel
-      Left = 48
-      Top = 554
-      Caption = #25187#20998
-    end
     object cxLabel2: TcxLabel
-      Left = 21
+      Left = 30
-      Top = 593
+      Top = 594
       Caption = #30133#28857#25551#36848
     end
-    object CIFnote: TcxTextEdit
+    object cxLabel1: TcxLabel
-      Left = 101
+      Left = 60
-      Top = 592
+      Top = 555
+      Caption = #25187#20998
+    end
+    object CIFPoints: TcxButtonEdit
+      Left = 121
+      Top = 555
+      Hint = 'CIFPoints/'#25187#20998
+      Properties.Buttons = <
+        item
+          Default = True
+          Kind = bkEllipsis
+        end>
+      Properties.OnButtonClick = hand_feelPropertiesButtonClick
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 3
+      OnEnter = edtScanEnter
+      Width = 121
+    end
+    object CIFnote: TcxButtonEdit
+      Left = 122
+      Top = 595
+      Hint = 'CIFnote/'#30133#28857#25551#36848
+      Properties.Buttons = <
+        item
+          Default = True
+          Kind = bkEllipsis
+        end>
+      Properties.OnButtonClick = hand_feelPropertiesButtonClick
+      Style.HotTrack = False
+      Style.TransparentBorder = False
       TabOrder = 4
-      Width = 229
+      OnEnter = edtScanEnter
+      Width = 200
     end
   end
   object cxGroupBox_keys: TcxGroupBox [3]
-    Left = 491
+    Left = 505
-    Top = 196
+    Top = 25
     Caption = #34394#25311#38190#30424
     ParentFont = False
     Style.Font.Charset = ANSI_CHARSET
@@ -2802,7 +2820,9 @@ inherited frmMachRollMain: TfrmMachRollMain
           OnClick = FrameKeyBoard1SpeedButton1Click
         end
         inherited SpeedButton9: TSpeedButton
+          Top = 124
           OnClick = FrameKeyBoard1SpeedButton1Click
+          ExplicitTop = 124
         end
         inherited SpeedButton_back: TSpeedButton
           OnClick = FrameKeyBoard1SpeedButton_backClick

项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas

@@ -294,11 +294,11 @@ type
     dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup11: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup;
-    CIFPoints: TcxTextEdit;
-    cxLabel1: TcxLabel;
     cxLabel2: TcxLabel;
-    CIFnote: TcxTextEdit;
     Tv2CIFType: TcxGridDBColumn;
+    cxLabel1: TcxLabel;
+    CIFPoints: TcxButtonEdit;
+    CIFnote: TcxButtonEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button_badClick(Sender: TObject);
@@ -347,6 +347,7 @@ type
     procedure customStrField5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure ToolButton1Click(Sender: TObject);
     procedure hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure frameBads1cxButton1Click(Sender: TObject);
   private
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -422,7 +423,7 @@ implementation
 uses
   U_DataLink, U_ControlData, U_ParamSet, U_RTFun, U_globalVar,
   U_FormLayOutDesign, U_ZDYHelp, U_iniParam, U_ProductListHelp, U_SysLogList,
-  U_MdPrint, U_CDList;
+  U_MdPrint;
 {$R *.dfm}
   /// ///////////////////////////////
 
@@ -1021,6 +1022,13 @@ begin
     frameBads1.CIFBeg.text := inputLen.Text;
 end;
 
+procedure TfrmMachRollMain.frameBads1cxButton1Click(Sender: TObject);
+begin
+  inherited;
+  frameBads1.cxButton1Click(Sender);
+
+end;
+
 procedure TfrmMachRollMain.frameBads1cxButton3Click(Sender: TObject);
 begin
   inherited;

项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm

@@ -98,7 +98,7 @@ object frameBads: TframeBads
       TabOrder = 2
       LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
       object CIFBeg: TcxTextEdit
-        Left = 48
+        Left = 53
         Top = 54
         ParentFont = False
         Properties.OnEditValueChanged = CIFBegPropertiesEditValueChanged
@@ -114,7 +114,7 @@ object frameBads: TframeBads
         Width = 52
       end
       object CIFEnd: TcxTextEdit
-        Left = 124
+        Left = 129
         Top = 54
         AutoSize = False
         ParentFont = False
@@ -128,11 +128,11 @@ object frameBads: TframeBads
         Style.TransparentBorder = False
         Style.IsFontAssigned = True
         TabOrder = 5
-        Height = 31
+        Height = 37
         Width = 58
       end
       object CIFQty: TcxTextEdit
-        Left = 206
+        Left = 211
         Top = 54
         AutoSize = False
         ParentFont = False
@@ -145,7 +145,7 @@ object frameBads: TframeBads
         Style.TransparentBorder = False
         Style.IsFontAssigned = True
         TabOrder = 6
-        Height = 31
+        Height = 37
         Width = 53
       end
       object CIFNumber: TcxTextEdit
@@ -186,7 +186,7 @@ object frameBads: TframeBads
         Transparent = True
         OnClick = IsSubtractClick
         Height = 37
-        Width = 53
+        Width = 36
       end
       object SubtractQty: TcxTextEdit
         Left = 194
@@ -251,7 +251,7 @@ object frameBads: TframeBads
       object dxLayoutItem2: TdxLayoutItem
         Parent = dxLayoutGroup1
         Control = CIFNumber
-        ControlOptions.OriginalHeight = 31
+        ControlOptions.OriginalHeight = 37
         ControlOptions.OriginalWidth = 56
         ControlOptions.ShowBorder = False
         Index = 2
@@ -285,7 +285,7 @@ object frameBads: TframeBads
       object dxLayoutItem1: TdxLayoutItem
         Parent = dxLayoutGroup2
         Control = CIFBeg
-        ControlOptions.OriginalHeight = 31
+        ControlOptions.OriginalHeight = 37
         ControlOptions.OriginalWidth = 52
         ControlOptions.ShowBorder = False
         Index = 1
@@ -352,7 +352,7 @@ object frameBads: TframeBads
         CaptionOptions.Visible = False
         Control = cxCheck_len
         ControlOptions.OriginalHeight = 30
-        ControlOptions.OriginalWidth = 44
+        ControlOptions.OriginalWidth = 49
         ControlOptions.ShowBorder = False
         Index = 0
       end