1234

A02基础产品管理/ClothInfo.dproj.local

@@ -17,12 +17,12 @@
     <Transaction>1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
@@ -35,7 +35,7 @@
     <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm</Transaction>
@@ -43,8 +43,8 @@
     <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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.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>2025/06/13 15:31:04.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
     <Transaction>2025/06/13 15:43:57.000.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.pas</Transaction>
   </Transactions>

A02基础产品管理/U_ClothInfo.dfm

@@ -338,8 +338,6 @@ inherited frmClothInfo: TfrmClothInfo
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
-      ExplicitLeft = -2
-      ExplicitTop = 59
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False

A02基础产品管理/U_ClothInfoInput.dfm

@@ -31,7 +31,6 @@ object frmClothInfoInput: TfrmClothInfoInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 1
-    ExplicitTop = 714
     object TbSave: TToolButton
       Tag = 1
       Left = 0
@@ -71,9 +70,8 @@ object frmClothInfoInput: TfrmClothInfoInput
     Font.Style = []
     ParentFont = False
     TabOrder = 0
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet9
     Properties.CustomButtons.Buttons = <>
-    ExplicitTop = 44
     ClientRectBottom = 708
     ClientRectLeft = 2
     ClientRectRight = 1078
@@ -1240,14 +1238,14 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 48
           OnClick = TbDXReplaceClick
         end
-        object cxButton3: TcxButton
+        object TbDXClear: TcxButton
           Left = 182
           Top = 158
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 49
-          OnClick = cxButton3Click
+          OnClick = TbDXClearClick
         end
       end
     end
@@ -1260,7 +1258,6 @@ object frmClothInfoInput: TfrmClothInfoInput
       Font.Style = []
       ImageIndex = 7
       ParentFont = False
-      ExplicitLeft = 1
       object Panel12: TPanel
         Left = 0
         Top = 0
@@ -1671,23 +1668,23 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 47
           Width = 150
         end
-        object cxButton6: TcxButton
+        object TbDX2Replace: TcxButton
           Left = 95
           Top = 158
           Width = 75
           Height = 25
           Caption = #19968#38190#26367#25442
           TabOrder = 48
-          OnClick = TbDXReplaceClick
+          OnClick = TbDX2ReplaceClick
         end
-        object cxButton7: TcxButton
+        object TbDX2Clear: TcxButton
           Left = 182
           Top = 158
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 49
-          OnClick = cxButton3Click
+          OnClick = TbDX2ClearClick
         end
       end
     end
@@ -1700,7 +1697,6 @@ object frmClothInfoInput: TfrmClothInfoInput
       Font.Style = []
       ImageIndex = 8
       ParentFont = False
-      ExplicitLeft = 1
       object Panel13: TPanel
         Left = 0
         Top = 0
@@ -2111,23 +2107,23 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 47
           Width = 150
         end
-        object cxButton8: TcxButton
+        object TbDX3Replace: TcxButton
           Left = 95
           Top = 158
           Width = 75
           Height = 25
           Caption = #19968#38190#26367#25442
           TabOrder = 48
-          OnClick = TbDXReplaceClick
+          OnClick = TbDX3ReplaceClick
         end
-        object cxButton9: TcxButton
+        object TbDX3Clear: TcxButton
           Left = 182
           Top = 158
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 49
-          OnClick = cxButton3Click
+          OnClick = TbDX3ClearClick
         end
       end
     end
@@ -2221,7 +2217,6 @@ object frmClothInfoInput: TfrmClothInfoInput
         Height = 458
         Align = alClient
         TabOrder = 1
-        ExplicitTop = -6
         object cxLabel100: TcxLabel
           Left = 260
           Top = 317
@@ -3609,7 +3604,6 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 1
-        ExplicitTop = -6
         object cxLabel116: TcxLabel
           Left = 258
           Top = 282
@@ -4091,14 +4085,14 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 57
           OnClick = TbGJReplaceClick
         end
-        object cxButton5: TcxButton
+        object TbGJClear: TcxButton
           Left = 171
           Top = 215
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 58
-          OnClick = cxButton5Click
+          OnClick = TbGJClearClick
         end
       end
       object ToolBar5: TToolBar
@@ -4136,7 +4130,6 @@ object frmClothInfoInput: TfrmClothInfoInput
     object cxTabSheet10: TcxTabSheet
       Caption = #20108#27425#21038#33014
       ImageIndex = 9
-      ExplicitLeft = 3
       object Panel14: TPanel
         Left = 0
         Top = 0
@@ -4622,23 +4615,23 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 56
           Width = 150
         end
-        object cxButton10: TcxButton
+        object TbGJ2Replace: TcxButton
           Left = 85
           Top = 215
           Width = 75
           Height = 25
           Caption = #19968#38190#26367#25442
           TabOrder = 57
-          OnClick = TbGJReplaceClick
+          OnClick = TbGJ2ReplaceClick
         end
-        object cxButton11: TcxButton
+        object TbGJ2Clear: TcxButton
           Left = 171
           Top = 215
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 58
-          OnClick = cxButton5Click
+          OnClick = TbGJ2ClearClick
         end
       end
       object ToolBar6: TToolBar
@@ -4655,15 +4648,13 @@ object frmClothInfoInput: TfrmClothInfoInput
         ShowCaptions = True
         TabOrder = 1
         Transparent = True
-        ExplicitLeft = 3
-        ExplicitTop = 395
         object ToolButton1: TToolButton
           Left = 0
           Top = 0
           AutoSize = True
           Caption = #22686#34892
           ImageIndex = 2
-          OnClick = TbAdd3Click
+          OnClick = ToolButton1Click
         end
         object ToolButton2: TToolButton
           Left = 79
@@ -4671,7 +4662,7 @@ object frmClothInfoInput: TfrmClothInfoInput
           AutoSize = True
           Caption = #21024#34892
           ImageIndex = 6
-          OnClick = TbDel3Click
+          OnClick = ToolButton2Click
         end
       end
       object cxGrid5: TcxGrid
@@ -4687,11 +4678,10 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 2
-        ExplicitTop = 426
+        object Tv5: TcxGridDBTableView
-        object cxGridDBTableView1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
-          DataController.DataSource = DS_3
+          DataController.DataSource = DS_3_2
           DataController.Summary.DefaultGroupSummaryItems = <>
           DataController.Summary.FooterSummaryItems = <>
           DataController.Summary.SummaryGroups = <>
@@ -4714,7 +4704,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 Default = True
                 Kind = bkEllipsis
               end>
-            Properties.OnButtonClick = Tv3gj_NamePropertiesButtonClick
+            Properties.OnButtonClick = cxGridDBColumn4PropertiesButtonClick
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -4730,7 +4720,7 @@ object frmClothInfoInput: TfrmClothInfoInput
             DataBinding.FieldName = 'gj_unit'
             DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
-            Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged
+            Properties.OnEditValueChanged = cxGridDBColumn6PropertiesEditValueChanged
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -4739,7 +4729,7 @@ object frmClothInfoInput: TfrmClothInfoInput
             DataBinding.FieldName = 'gj_rate'
             DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
-            Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged
+            Properties.OnEditValueChanged = cxGridDBColumn6PropertiesEditValueChanged
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -4769,14 +4759,13 @@ object frmClothInfoInput: TfrmClothInfoInput
           end
         end
         object cxGridLevel5: TcxGridLevel
-          GridView = cxGridDBTableView1
+          GridView = Tv5
         end
       end
     end
     object cxTabSheet11: TcxTabSheet
       Caption = #19977#27425#21038#33014
       ImageIndex = 10
-      ExplicitLeft = 1
       object Panel15: TPanel
         Left = 0
         Top = 0
@@ -4790,8 +4779,6 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 0
-        ExplicitTop = -6
-        ExplicitHeight = 645
         object cxLabel243: TcxLabel
           Left = 258
           Top = 282
@@ -5264,23 +5251,23 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 56
           Width = 150
         end
-        object cxButton12: TcxButton
+        object TbGJ3Replace: TcxButton
           Left = 85
           Top = 215
           Width = 75
           Height = 25
           Caption = #19968#38190#26367#25442
           TabOrder = 57
-          OnClick = TbGJReplaceClick
+          OnClick = TbGJ3ReplaceClick
         end
-        object cxButton13: TcxButton
+        object TbGJ3Clear: TcxButton
           Left = 171
           Top = 215
           Width = 75
           Height = 25
           Caption = #19968#38190#28165#31354
           TabOrder = 58
-          OnClick = cxButton5Click
+          OnClick = TbGJ3ClearClick
         end
       end
       object ToolBar7: TToolBar
@@ -5297,15 +5284,13 @@ object frmClothInfoInput: TfrmClothInfoInput
         ShowCaptions = True
         TabOrder = 1
         Transparent = True
-        ExplicitLeft = -16
-        ExplicitTop = 395
         object ToolButton3: TToolButton
           Left = 0
           Top = 0
           AutoSize = True
           Caption = #22686#34892
           ImageIndex = 2
-          OnClick = TbAdd3Click
+          OnClick = ToolButton3Click
         end
         object ToolButton4: TToolButton
           Left = 79
@@ -5313,7 +5298,7 @@ object frmClothInfoInput: TfrmClothInfoInput
           AutoSize = True
           Caption = #21024#34892
           ImageIndex = 6
-          OnClick = TbDel3Click
+          OnClick = ToolButton4Click
         end
       end
       object cxGrid6: TcxGrid
@@ -5329,11 +5314,10 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 2
-        ExplicitTop = 426
+        object Tv6: TcxGridDBTableView
-        object cxGridDBTableView2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
-          DataController.DataSource = DS_3
+          DataController.DataSource = DS_3_3
           DataController.Summary.DefaultGroupSummaryItems = <>
           DataController.Summary.FooterSummaryItems = <>
           DataController.Summary.SummaryGroups = <>
@@ -5356,7 +5340,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 Default = True
                 Kind = bkEllipsis
               end>
-            Properties.OnButtonClick = Tv3gj_NamePropertiesButtonClick
+            Properties.OnButtonClick = cxGridDBColumn14PropertiesButtonClick
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -5372,7 +5356,7 @@ object frmClothInfoInput: TfrmClothInfoInput
             DataBinding.FieldName = 'gj_unit'
             DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
-            Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged
+            Properties.OnEditValueChanged = cxGridDBColumn19PropertiesEditValueChanged
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -5381,7 +5365,7 @@ object frmClothInfoInput: TfrmClothInfoInput
             DataBinding.FieldName = 'gj_rate'
             DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
-            Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged
+            Properties.OnEditValueChanged = cxGridDBColumn19PropertiesEditValueChanged
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -5411,7 +5395,7 @@ object frmClothInfoInput: TfrmClothInfoInput
           end
         end
         object cxGridLevel6: TcxGridLevel
-          GridView = cxGridDBTableView2
+          GridView = Tv6
         end
       end
     end
@@ -5635,15 +5619,15 @@ object frmClothInfoInput: TfrmClothInfoInput
   end
   object DS_3: TDataSource
     DataSet = CDS_3
-    Left = 827
+    Left = 43
-    Top = 484
+    Top = 596
   end
   object CDS_3: TClientDataSet
     Aggregates = <>
     IndexFieldNames = 'SerialNo'
     Params = <>
-    Left = 827
+    Left = 43
-    Top = 540
+    Top = 644
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
     Grid = cxGrid4
@@ -5663,4 +5647,26 @@ object frmClothInfoInput: TfrmClothInfoInput
     Left = 667
     Top = 580
   end
+  object DS_3_2: TDataSource
+    DataSet = CDS_3_2
+    Left = 106
+    Top = 599
+  end
+  object DS_3_3: TDataSource
+    DataSet = CDS_3_3
+    Left = 186
+    Top = 599
+  end
+  object CDS_3_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 106
+    Top = 647
+  end
+  object CDS_3_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 186
+    Top = 647
+  end
 end

A02基础产品管理/U_ClothInfoInput.pas

@@ -442,9 +442,9 @@ type
     TbGJReplace: TcxButton;
     cxButton1: TcxButton;
     cxButton2: TcxButton;
-    cxButton3: TcxButton;
+    TbDXClear: TcxButton;
     cxButton4: TcxButton;
-    cxButton5: TcxButton;
+    TbGJClear: TcxButton;
     cxTabSheet8: TcxTabSheet;
     cxTabSheet9: TcxTabSheet;
     cxTabSheet10: TcxTabSheet;
@@ -498,8 +498,8 @@ type
     dx_UnpackingMethod2: TcxComboBox;
     dx_OpenAmplitude2: TcxComboBox;
     dx_RollMethod2: TcxComboBox;
-    cxButton6: TcxButton;
+    TbDX2Replace: TcxButton;
-    cxButton7: TcxButton;
+    TbDX2Clear: TcxButton;
     Panel13: TPanel;
     cxLabel188: TcxLabel;
     cxLabel189: TcxLabel;
@@ -549,8 +549,8 @@ type
     dx_UnpackingMethod3: TcxComboBox;
     dx_OpenAmplitude3: TcxComboBox;
     dx_RollMethod3: TcxComboBox;
-    cxButton8: TcxButton;
+    TbDX3Replace: TcxButton;
-    cxButton9: TcxButton;
+    TbDX3Clear: TcxButton;
     Panel14: TPanel;
     cxLabel213: TcxLabel;
     cxLabel214: TcxLabel;
@@ -609,13 +609,13 @@ type
     gj_RollMethod2: TcxComboBox;
     gj_UnpackingMethod2: TcxComboBox;
     gj_OpenAmplitude2: TcxComboBox;
-    cxButton10: TcxButton;
+    TbGJ2Replace: TcxButton;
-    cxButton11: TcxButton;
+    TbGJ2Clear: TcxButton;
     ToolBar6: TToolBar;
     ToolButton1: TToolButton;
     ToolButton2: TToolButton;
     cxGrid5: TcxGrid;
-    cxGridDBTableView1: TcxGridDBTableView;
+    Tv5: TcxGridDBTableView;
     cxGridDBColumn3: TcxGridDBColumn;
     cxGridDBColumn4: TcxGridDBColumn;
     cxGridDBColumn5: TcxGridDBColumn;
@@ -684,13 +684,13 @@ type
     gj_RollMethod3: TcxComboBox;
     gj_UnpackingMethod3: TcxComboBox;
     gj_OpenAmplitude3: TcxComboBox;
-    cxButton12: TcxButton;
+    TbGJ3Replace: TcxButton;
-    cxButton13: TcxButton;
+    TbGJ3Clear: TcxButton;
     ToolBar7: TToolBar;
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
     cxGrid6: TcxGrid;
-    cxGridDBTableView2: TcxGridDBTableView;
+    Tv6: TcxGridDBTableView;
     cxGridDBColumn13: TcxGridDBColumn;
     cxGridDBColumn14: TcxGridDBColumn;
     cxGridDBColumn15: TcxGridDBColumn;
@@ -701,6 +701,10 @@ type
     cxGridDBColumn23: TcxGridDBColumn;
     cxGridDBColumn24: TcxGridDBColumn;
     cxGridLevel6: TcxGridLevel;
+    DS_3_2: TDataSource;
+    DS_3_3: TDataSource;
+    CDS_3_2: TClientDataSet;
+    CDS_3_3: TClientDataSet;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -739,9 +743,25 @@ type
     procedure TbGJReplaceClick(Sender: TObject);
     procedure cxButton1Click(Sender: TObject);
     procedure cxButton2Click(Sender: TObject);
-    procedure cxButton3Click(Sender: TObject);
+    procedure TbDXClearClick(Sender: TObject);
     procedure cxButton4Click(Sender: TObject);
-    procedure cxButton5Click(Sender: TObject);
+    procedure TbGJClearClick(Sender: TObject);
+    procedure TbDX2ReplaceClick(Sender: TObject);
+    procedure TbDX2ClearClick(Sender: TObject);
+    procedure TbDX3ReplaceClick(Sender: TObject);
+    procedure TbDX3ClearClick(Sender: TObject);
+    procedure TbGJ3ClearClick(Sender: TObject);
+    procedure TbGJ2ClearClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
+    procedure cxGridDBColumn4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure cxGridDBColumn14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure cxGridDBColumn6PropertiesEditValueChanged(Sender: TObject);
+    procedure cxGridDBColumn19PropertiesEditValueChanged(Sender: TObject);
+    procedure TbGJ2ReplaceClick(Sender: TObject);
+    procedure TbGJ3ReplaceClick(Sender: TObject);
   private
     canshu1: string;
     Fint: Integer;
@@ -888,6 +908,11 @@ begin
   SCSHData(ADOQueryTemp, Panel6, 2);
   SCSHData(ADOQueryTemp, Panel7, 2);
 
+  SCSHData(ADOQueryTemp, Panel12, 2);
+  SCSHData(ADOQueryTemp, Panel13, 2);
+  SCSHData(ADOQueryTemp, Panel14, 2);
+  SCSHData(ADOQueryTemp, Panel15, 2);
+
   with ADOQueryTemp do
   begin
     Close;
@@ -915,12 +940,34 @@ begin
     Close;
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
-    sql.Add(' where gytype=''민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+    sql.Add(' where gytype=''寧늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_3);
   SInitCDSData(ADOQueryTemp, CDS_3);
 
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
+    sql.Add(' where gytype=''랗늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3_2);
+  SInitCDSData(ADOQueryTemp, CDS_3_2);
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
+    sql.Add(' where gytype=''힛늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3_3);
+  SInitCDSData(ADOQueryTemp, CDS_3_3);
+
   with ADOQueryTemp do
   begin
     Close;
@@ -941,12 +988,79 @@ var
   MaxBCIID, MaxProcessID, MaxBCPID: string;
   Maxid1, maxid2, maxid3, maxgx: string;
 begin
-    InitGrid();
+  InitGrid();
   ArrangeTabsByDataset;
-  if CopyInt = 3 then
+  if CopyInt = 2 then    //릿齡
   begin
     FBCIID := '';
     C_Code.text := '自动生成';
+    with CDS_GX do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_GX.fieldbyname('GXID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+    with CDS_1 do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_1.fieldbyname('BCPID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+    with CDS_2 do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_2.fieldbyname('BCPID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+    with CDS_3 do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_3.fieldbyname('BCPID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+    with CDS_3_2 do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_3_2.fieldbyname('BCPID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+    with CDS_3_3 do
+    begin
+      First;
+      while not Eof do
+      begin
+        Edit;
+        CDS_3_3.fieldbyname('BCPID').AsString := '';
+        Post;
+        Next;
+      end;
+    end;
+
   end;
   if CopyInt = 1 then   //查看
   begin
@@ -961,50 +1075,6 @@ begin
     TbDelete.Enabled := False;
   end;
 
-  with CDS_GX do
-  begin
-    First;
-    while not Eof do
-    begin
-      Edit;
-      CDS_GX.fieldbyname('GXID').AsString := '';
-      Post;
-      Next;
-    end;
-  end;
-  with CDS_1 do
-  begin
-    First;
-    while not Eof do
-    begin
-      Edit;
-      CDS_1.fieldbyname('BCPID').AsString := '';
-      Post;
-      Next;
-    end;
-  end;
-  with CDS_2 do
-  begin
-    First;
-    while not Eof do
-    begin
-      Edit;
-      CDS_2.fieldbyname('BCPID').AsString := '';
-      Post;
-      Next;
-    end;
-  end;
-  with CDS_3 do
-  begin
-    First;
-    while not Eof do
-    begin
-      Edit;
-      CDS_3.fieldbyname('BCPID').AsString := '';
-      Post;
-      Next;
-    end;
-  end;
 end;
 
 procedure TfrmClothInfoInput.fs_meterPropertiesChange(Sender: TObject);
@@ -1155,6 +1225,11 @@ begin
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel5, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel6, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel7, 2);
+
+      RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel12, 2);
+      RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel13, 2);
+      RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel14, 2);
+      RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel15, 2);
       Post;
     end;
 
@@ -1326,20 +1401,20 @@ begin
     end;
 ////////////////       保存发泡子表          //////////////////////
 ///
-///  //////////////////       괏닸민스綾깊          //////////////////////
+///  //////////////////       괏닸寧늴민스綾깊          //////////////////////
     with CDS_3 do
     begin
       First;
       while not Eof do
       begin
-        if copyInt = 1 then
+//        if copyInt = 1 then
-        begin
+//        begin
-          CDS_3.Edit;
+//          CDS_3.Edit;
-//          CDS_GX.fieldbyname('GXID').AsString := '';
+////          CDS_GX.fieldbyname('GXID').AsString := '';
-//          CDS_1.fieldbyname('BCPID').AsString := '';
+////          CDS_1.fieldbyname('BCPID').AsString := '';
-//          CDS_2.fieldbyname('BCPID').AsString := '';
+////          CDS_2.fieldbyname('BCPID').AsString := '';
-          CDS_3.fieldbyname('BCPID').AsString := '';
+//          CDS_3.fieldbyname('BCPID').AsString := '';
-        end;
+//        end;
         if Trim(CDS_3.fieldbyname('BCPID').AsString) = '' then
         begin
           if GetLSNo(ADOQueryTemp, maxid3, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then
@@ -1373,7 +1448,7 @@ begin
             Edit;
 
           end;
-          FieldByName('GYType').Value := '민스';
+          FieldByName('GYType').Value := '寧늴민스';
           FieldByName('BCIID').Value := Trim(MaxBCIID);
           FieldByName('BCPID').Value := Trim(maxid3);
           RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_3, 'Bs_Cloth_GY_Sub', 0);
@@ -1386,7 +1461,128 @@ begin
         Next;
       end;
     end;
-////////////////       괏닸민스綾깊          //////////////////////
+////////////////       괏닸寧늴민스綾깊          //////////////////////
+///  //////////////////       괏닸랗늴민스綾깊          //////////////////////
+    with CDS_3_2 do
+    begin
+      First;
+      while not Eof do
+      begin
+        if copyInt = 1 then
+        begin
+          CDS_3_2.Edit;
+          CDS_3_2.fieldbyname('BCPID').AsString := '';
+        end;
+        if Trim(CDS_3_2.fieldbyname('BCPID').AsString) = '' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxid3, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+            Application.MessageBox('혤토궐綾직彊뵀呵겨！', '瓊刻', 0);
+            Exit;
+          end;
+        end
+        else
+        begin
+          maxid3 := Trim(CDS_3_2.fieldbyname('BCPID').AsString);
+        end;
+        with ADOQueryCmd do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('select * from Bs_Cloth_GY_Sub where ');
+          sql.Add('  BCPID=''' + Trim(maxid3) + '''');
+          Open;
+        end;
+        with ADOQueryCmd do
+        begin
+          if Trim(CDS_3_2.fieldbyname('BCPID').AsString) = '' then
+          begin
+            Append;
+
+          end
+          else
+          begin
+            Edit;
+
+          end;
+          FieldByName('GYType').Value := '랗늴민스';
+          FieldByName('BCIID').Value := Trim(MaxBCIID);
+          FieldByName('BCPID').Value := Trim(maxid3);
+          RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_3_2, 'Bs_Cloth_GY_Sub', 0);
+          Post;
+        end;
+        CDS_3_2.Edit;
+        CDS_3_2.FieldByName('BCIID').Value := Trim(MaxBCIID);
+        CDS_3_2.FieldByName('BCPID').Value := Trim(maxid3);
+
+        Next;
+      end;
+    end;
+////////////////       괏닸랗늴민스綾깊          //////////////////////
+///  //////////////////       괏닸힛늴민스綾깊          //////////////////////
+    with CDS_3_3 do
+    begin
+      First;
+      while not Eof do
+      begin
+        if copyInt = 1 then
+        begin
+          CDS_3_3.Edit;
+//          CDS_GX.fieldbyname('GXID').AsString := '';
+//          CDS_1.fieldbyname('BCPID').AsString := '';
+//          CDS_2.fieldbyname('BCPID').AsString := '';
+          CDS_3_3.fieldbyname('BCPID').AsString := '';
+        end;
+        if Trim(CDS_3_3.fieldbyname('BCPID').AsString) = '' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxid3, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+            Application.MessageBox('혤토궐綾직彊뵀呵겨！', '瓊刻', 0);
+            Exit;
+          end;
+        end
+        else
+        begin
+          maxid3 := Trim(CDS_3_3.fieldbyname('BCPID').AsString);
+        end;
+        with ADOQueryCmd do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('select * from Bs_Cloth_GY_Sub where ');
+          sql.Add('  BCPID=''' + Trim(maxid3) + '''');
+          Open;
+        end;
+        with ADOQueryCmd do
+        begin
+          if Trim(CDS_3_3.fieldbyname('BCPID').AsString) = '' then
+          begin
+            Append;
+
+          end
+          else
+          begin
+            Edit;
+
+          end;
+          FieldByName('GYType').Value := '힛늴민스';
+          FieldByName('BCIID').Value := Trim(MaxBCIID);
+          FieldByName('BCPID').Value := Trim(maxid3);
+          RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_3_3, 'Bs_Cloth_GY_Sub', 0);
+          Post;
+        end;
+        CDS_3_3.Edit;
+        CDS_3_3.FieldByName('BCIID').Value := Trim(MaxBCIID);
+        CDS_3_3.FieldByName('BCPID').Value := Trim(maxid3);
+
+        Next;
+      end;
+    end;
+////////////////       괏닸힛늴민스綾깊          //////////////////////
+
+
     ADOQueryCmd.Connection.CommitTrans;
     FBCIID := MaxBCIID;
     Result := True;
@@ -1437,7 +1633,7 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
@@ -1467,7 +1663,7 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
@@ -1497,24 +1693,51 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
   end;
-  if CDS_GX.Locate('GXName', '땍謹', []) = True then
+  if CDS_GX.Locate('GXName', '寧늴땍謹', []) = True then
   begin
-    Application.MessageBox('綠닸瞳땍謹求묏埼!', '瓊刻', 0);
+    if CDS_GX.Locate('GXName', '랗늴땍謹', []) = True then
-    Exit;
+    begin
-  end;
+      if CDS_GX.Locate('GXName', '힛늴땍謹', []) = True then
-
+      begin
-//  CopyAddRow(Tv1, CDS_1);
+        Application.MessageBox('綠닸瞳힛늴땍謹묏埼!', '瓊刻', 0);
-  with CDS_GX do
+        Exit;
+      end
+      else
+      begin
+        with CDS_GX do
+        begin
+          Append;
+          FieldByName('SerialNo').Value := i;
+          FieldByName('GXName').Value := '힛늴땍謹';
+          Post;
+        end;
+      end;
+    end
+    else
+    begin
+      with CDS_GX do
+      begin
+        Append;
+        FieldByName('SerialNo').Value := i;
+        FieldByName('GXName').Value := '랗늴땍謹';
+        Post;
+      end;
+    end;
+  end
+  else
   begin
-    Append;
+    with CDS_GX do
-    FieldByName('SerialNo').Value := i;
+    begin
-    FieldByName('GXName').Value := '땍謹';
+      Append;
-    Post;
+      FieldByName('SerialNo').Value := i;
+      FieldByName('GXName').Value := '寧늴땍謹';
+      Post;
+    end;
   end;
   SetXH();
   ArrangeTabsByDataset;
@@ -1532,7 +1755,7 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
@@ -1567,24 +1790,51 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
   end;
-  if CDS_GX.Locate('GXName', '민스', []) = True then
+  if CDS_GX.Locate('GXName', '寧늴민스', []) = True then
   begin
-    Application.MessageBox('綠닸瞳민스묏埼!', '瓊刻', 0);
+    if CDS_GX.Locate('GXName', '랗늴민스', []) = True then
-    Exit;
+    begin
-  end;
+      if CDS_GX.Locate('GXName', '힛늴민스', []) = True then
-
+      begin
-//  CopyAddRow(Tv1, CDS_1);
+        Application.MessageBox('綠닸瞳힛늴민스묏埼!', '瓊刻', 0);
-  with CDS_GX do
+        Exit;
+      end
+      else
+      begin
+        with CDS_GX do
+        begin
+          Append;
+          FieldByName('SerialNo').Value := i;
+          FieldByName('GXName').Value := '힛늴민스';
+          Post;
+        end;
+      end;
+    end
+    else
+    begin
+      with CDS_GX do
+      begin
+        Append;
+        FieldByName('SerialNo').Value := i;
+        FieldByName('GXName').Value := '랗늴민스';
+        Post;
+      end;
+    end;
+  end
+  else
   begin
-    Append;
+    with CDS_GX do
-    FieldByName('SerialNo').Value := i;
+    begin
-    FieldByName('GXName').Value := '민스';
+      Append;
-    Post;
+      FieldByName('SerialNo').Value := i;
+      FieldByName('GXName').Value := '寧늴민스';
+      Post;
+    end;
   end;
   SetXH();
   ArrangeTabsByDataset;
@@ -1601,7 +1851,7 @@ var
 begin
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 6 then
+  if i > 10 then
   begin
     Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
     exit;
@@ -1624,6 +1874,112 @@ begin
   ArrangeTabsByDataset;
 end;
 
+procedure TfrmClothInfoInput.ToolButton1Click(Sender: TObject);
+begin
+  with CDS_3_2 do
+  begin
+    Append;
+    CDS_3_2.FieldByName('serialno').Value := CDS_3_2.RecordCount + 1;
+    CDS_3_2.FieldByName('gj_unit').Value := '%';
+    Post;
+  end;
+end;
+
+procedure TfrmClothInfoInput.ToolButton2Click(Sender: TObject);
+var
+  i: Integer;
+begin
+  if not CDS_3_2.IsEmpty then
+  begin
+
+    if Application.MessageBox('횅땍狼<EB958D>뇜鑒앴찐？', '瓊刻', 32 + 4) = IDYES then
+    begin
+      if Trim(CDS_3_2.fieldbyname('BCPID').AsString) <> '' then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('delete BS_Cloth_GY_Sub where BCPID=''' + Trim(CDS_3_2.fieldbyname('BCPID').AsString) + '''');
+          ExecSQL;
+        end;
+      end;
+      CDS_3_2.Delete;
+    end
+    else
+      exit;
+
+    i := 0;
+    CDS_3_2.First;
+    while not CDS_3_2.Eof do
+    begin
+      i := i + 1;
+      CDS_3_2.Edit;
+      CDS_3_2.fieldByName('serialno').value := i;
+      CDS_3_2.Post;
+      CDS_3_2.Next;
+    end;
+  end
+  else
+  begin
+    Application.MessageBox('轟옵<E8BD9F>뇜鑒앴!', '瓊刻', 0);
+    Exit;
+  end;
+end;
+
+procedure TfrmClothInfoInput.ToolButton3Click(Sender: TObject);
+begin
+  with CDS_3_3 do
+  begin
+    Append;
+    CDS_3_3.FieldByName('serialno').Value := CDS_3_3.RecordCount + 1;
+    CDS_3_3.FieldByName('gj_unit').Value := '%';
+    Post;
+  end;
+end;
+
+procedure TfrmClothInfoInput.ToolButton4Click(Sender: TObject);
+var
+  i: Integer;
+begin
+  if not CDS_3_3.IsEmpty then
+  begin
+
+    if Application.MessageBox('횅땍狼<EB958D>뇜鑒앴찐？', '瓊刻', 32 + 4) = IDYES then
+    begin
+      if Trim(CDS_3_3.fieldbyname('BCPID').AsString) <> '' then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('delete BS_Cloth_GY_Sub where BCPID=''' + Trim(CDS_3_3.fieldbyname('BCPID').AsString) + '''');
+          ExecSQL;
+        end;
+      end;
+      CDS_3_3.Delete;
+    end
+    else
+      exit;
+
+    i := 0;
+    CDS_3_3.First;
+    while not CDS_3_3.Eof do
+    begin
+      i := i + 1;
+      CDS_3_3.Edit;
+      CDS_3_3.fieldByName('serialno').value := i;
+      CDS_3_3.Post;
+      CDS_3_3.Next;
+    end;
+  end
+  else
+  begin
+    Application.MessageBox('轟옵<E8BD9F>뇜鑒앴!', '瓊刻', 0);
+    Exit;
+  end;
+end;
+
 procedure TfrmClothInfoInput.TbDeleteClick(Sender: TObject);
 begin
   if CDS_GX.IsEmpty then
@@ -1669,7 +2025,7 @@ begin
     SCreateCDS(ADOQueryTemp, CDS_2);
     SInitCDSData(ADOQueryTemp, CDS_2);
   end
-  else if CDS_gx.fieldByName('gxname').Value = '민스' then
+  else if CDS_gx.fieldByName('gxname').Value = '寧늴민스' then
   begin
     //刮胶子表更新
     with ADOQueryTemp do
@@ -1677,11 +2033,41 @@ begin
       Close;
       sql.Clear;
       sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
-      sql.Add(' where gytype=''민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+      sql.Add(' where gytype=''寧늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
       Open;
     end;
     SCreateCDS(ADOQueryTemp, CDS_3);
     SInitCDSData(ADOQueryTemp, CDS_3);
+//    end;
+  end
+  else if CDS_gx.fieldByName('gxname').Value = '寧늴민스' then
+  begin
+    //랗늴민스綾깊뫘劤
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
+      sql.Add(' where gytype=''랗늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_3_2);
+    SInitCDSData(ADOQueryTemp, CDS_3_2);
+//    end;
+  end
+  else if CDS_gx.fieldByName('gxname').Value = '寧늴민스' then
+  begin
+    //힛늴민스綾깊뫘劤
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
+      sql.Add(' where gytype=''힛늴민스'' and A.BCIID=''' + Trim(FBCIID) + '''');
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_3_3);
+    SInitCDSData(ADOQueryTemp, CDS_3_3);
 //    end;
   end;
 //  else
@@ -1703,13 +2089,27 @@ begin
     qx_UnpackingMethod.Text := '';
     qx_RollMethod.Text := '';
   end
-  else if CDS_gx.fieldByName('gxname').Value = '땍謹' then
+  else if CDS_gx.fieldByName('gxname').Value = '寧늴땍謹' then
   begin
     SClearData(panel3, 2);
     dx_UnpackingMethod.Text := '';
     dx_RollMethod.Text := '';
     dx_OpenAmplitude.Text := '';
   end
+  else if CDS_gx.fieldByName('gxname').Value = '랗늴땍謹' then
+  begin
+    SClearData(panel12, 2);
+    dx_UnpackingMethod2.Text := '';
+    dx_RollMethod2.Text := '';
+    dx_OpenAmplitude2.Text := '';
+  end
+  else if CDS_gx.fieldByName('gxname').Value = '힛늴땍謹' then
+  begin
+    SClearData(panel13, 2);
+    dx_UnpackingMethod3.Text := '';
+    dx_RollMethod3.Text := '';
+    dx_OpenAmplitude3.Text := '';
+  end
   else if CDS_gx.fieldByName('gxname').Value = '防水' then
   begin
     SClearData(panel4, 2);
@@ -1724,13 +2124,28 @@ begin
     fp_RollMethod.Text := '';
     fp_OpenAmplitude.Text := '';
   end
-  else if CDS_gx.fieldByName('gxname').Value = '민스' then
+  else if CDS_gx.fieldByName('gxname').Value = '寧늴민스' then
   begin
     SClearData(panel6, 2);
     gj_UnpackingMethod.Text := '';
     gj_RollMethod.Text := '';
     gj_OpenAmplitude.Text := '';
   end
+  else if CDS_gx.fieldByName('gxname').Value = '랗늴민스' then
+  begin
+    SClearData(panel14, 2);
+    gj_UnpackingMethod2.Text := '';
+    gj_RollMethod2.Text := '';
+    gj_OpenAmplitude2.Text := '';
+  end
+  else if CDS_gx.fieldByName('gxname').Value = '힛늴민스' then
+  begin
+    SClearData(panel15, 2);
+    gj_UnpackingMethod3.Text := '';
+    gj_RollMethod3.Text := '';
+    gj_OpenAmplitude3.Text := '';
+  end
+
   else if CDS_gx.fieldByName('gxname').Value = '轧毛' then
   begin
     SClearData(panel7, 2);
@@ -1978,9 +2393,7 @@ begin
       for j := i + 1 to SortedControls.Count - 1 do
       begin
         // 比较两个控件的 Top 和 Left
-        if (TControl(SortedControls[i]).Top > TControl(SortedControls[j]).Top) or
+        if (TControl(SortedControls[i]).Top > TControl(SortedControls[j]).Top) or ((TControl(SortedControls[i]).Top = TControl(SortedControls[j]).Top) and (TControl(SortedControls[i]).Left > TControl(SortedControls[j]).Left)) then
-           ((TControl(SortedControls[i]).Top = TControl(SortedControls[j]).Top) and
-            (TControl(SortedControls[i]).Left > TControl(SortedControls[j]).Left)) then
         begin
           // 交换位置
           TempControl := TControl(SortedControls[i]);
@@ -1994,9 +2407,7 @@ begin
     for i := 0 to SortedControls.Count - 1 do
     begin
       AControl := TControl(SortedControls[i]);
-      if (AControl is TcxTextEdit) and
+      if (AControl is TcxTextEdit) and (TcxTextEdit(AControl).Hint = AHint) and (TcxTextEdit(AControl).Text <> '') then
-         (TcxTextEdit(AControl).Hint = AHint) and
-         (TcxTextEdit(AControl).Text <> '') then
       begin
         Result := TcxTextEdit(AControl).Text; // 最后一个符合条件的会被保留
       end;
@@ -2033,9 +2444,7 @@ begin
   begin
     AControl := AParent.Controls[i];
     // 检查是否是 TcxTextEdit，并且 Hint 匹配，且不是排除的控件
-    if (AControl is TcxTextEdit) and
+    if (AControl is TcxTextEdit) and (TcxTextEdit(AControl).Hint = AHint) and (TcxTextEdit(AControl) <> AExclude) then
-       (TcxTextEdit(AControl).Hint = AHint) and
-       (TcxTextEdit(AControl) <> AExclude) then
     begin
       TcxTextEdit(AControl).Text := ''; // 直接清空
     end;
@@ -2052,7 +2461,7 @@ begin
   ClearAllTextEditsByHint(panel2, '清洗水温');
 end;
 
-procedure TfrmClothInfoInput.cxButton3Click(Sender: TObject);
+procedure TfrmClothInfoInput.TbDXClearClick(Sender: TObject);
 begin
   ClearAllTextEditsByHint(panel3, '定型烘箱温度');
 end;
@@ -2062,11 +2471,51 @@ begin
   ClearAllTextEditsByHint(panel5, '发泡烘箱温度');
 end;
 
-procedure TfrmClothInfoInput.cxButton5Click(Sender: TObject);
+procedure TfrmClothInfoInput.TbGJ2ClearClick(Sender: TObject);
+begin
+  ClearAllTextEditsByHint(panel14, '민스뷸芎侊똑');
+end;
+
+procedure TfrmClothInfoInput.TbGJ2ReplaceClick(Sender: TObject);
+begin
+  FillAllTextEditsWithValue(panel14, '민스뷸芎侊똑', FindLastEditedTextEdit(panel14, '민스뷸芎侊똑'));
+end;
+
+procedure TfrmClothInfoInput.TbGJ3ClearClick(Sender: TObject);
+begin
+  ClearAllTextEditsByHint(panel15, '민스뷸芎侊똑');
+end;
+
+procedure TfrmClothInfoInput.TbGJ3ReplaceClick(Sender: TObject);
+begin
+  FillAllTextEditsWithValue(panel15, '민스뷸芎侊똑', FindLastEditedTextEdit(panel15, '민스뷸芎侊똑'));
+end;
+
+procedure TfrmClothInfoInput.TbGJClearClick(Sender: TObject);
 begin
   ClearAllTextEditsByHint(panel6, '刮胶烘箱温度');
 end;
 
+procedure TfrmClothInfoInput.TbDX2ClearClick(Sender: TObject);
+begin
+  ClearAllTextEditsByHint(panel12, '땍謹뷸芎侊똑');
+end;
+
+procedure TfrmClothInfoInput.TbDX2ReplaceClick(Sender: TObject);
+begin
+  FillAllTextEditsWithValue(panel12, '땍謹뷸芎侊똑', FindLastEditedTextEdit(panel12, '땍謹뷸芎侊똑'));
+end;
+
+procedure TfrmClothInfoInput.TbDX3ClearClick(Sender: TObject);
+begin
+  ClearAllTextEditsByHint(panel13, '땍謹뷸芎侊똑');
+end;
+
+procedure TfrmClothInfoInput.TbDX3ReplaceClick(Sender: TObject);
+begin
+  FillAllTextEditsWithValue(panel13, '땍謹뷸芎侊똑', FindLastEditedTextEdit(panel13, '땍謹뷸芎侊똑'));
+end;
+
 procedure TfrmClothInfoInput.TbFSReplaceClick(Sender: TObject);
 begin
   FillAllTextEditsWithValue(panel4, '防水烘箱温度', FindLastEditedTextEdit(panel4, '防水烘箱温度'));
@@ -2240,6 +2689,72 @@ begin
   end;
 end;
 
+procedure TfrmClothInfoInput.cxGridDBColumn14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmProductInfoSel := TfrmProductInfoSel.Create(Application);
+    with frmProductInfoSel do
+    begin
+      FSTKName := '燎셉';
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_3_3 do
+        begin
+          Edit;
+          FieldByName('gj_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value;
+          FieldByName('gj_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Spec').value;
+        end;
+      end;
+    end;
+  finally
+    frmProductInfoSel.Free;
+  end;
+end;
+
+procedure TfrmClothInfoInput.cxGridDBColumn19PropertiesEditValueChanged(Sender: TObject);
+var
+  s: string;
+begin
+  s := TcxTextEdit(Sender).EditingText;
+  if (s <> '') and (s[Length(s)] <> '%') then
+  begin
+    Tv6.Controller.FocusedColumn.EditValue := s + '%';
+  end;
+end;
+
+procedure TfrmClothInfoInput.cxGridDBColumn4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmProductInfoSel := TfrmProductInfoSel.Create(Application);
+    with frmProductInfoSel do
+    begin
+      FSTKName := '燎셉';
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_3_2 do
+        begin
+          Edit;
+          FieldByName('gj_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value;
+          FieldByName('gj_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Spec').value;
+        end;
+      end;
+    end;
+  finally
+    frmProductInfoSel.Free;
+  end;
+end;
+
+procedure TfrmClothInfoInput.cxGridDBColumn6PropertiesEditValueChanged(Sender: TObject);
+var
+  s: string;
+begin
+  s := TcxTextEdit(Sender).EditingText;
+  if (s <> '') and (s[Length(s)] <> '%') then
+  begin
+    Tv5.Controller.FocusedColumn.EditValue := s + '%';
+  end;
+end;
+
 procedure TfrmClothInfoInput.Tv3gj_unitPropertiesEditValueChanged(Sender: TObject);
 var
   s: string;