diff --git a/A00通用窗体/U_ClothInfoSel.dfm b/A00通用窗体/U_ClothInfoSel.dfm
index a651f27..b9bcf97 100644
--- a/A00通用窗体/U_ClothInfoSel.dfm
+++ b/A00通用窗体/U_ClothInfoSel.dfm
@@ -81,6 +81,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
     OptionsView.CellAutoHeight = True
     OptionsView.Headers = False
     RootValue = -1
+    ScrollbarAnnotations.CustomAnnotations = <>
     TabOrder = 1
     OnDblClick = cxDBTreeList1DblClick
     object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
@@ -225,6 +226,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_1
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -238,6 +240,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1SSel: TcxGridDBColumn
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           HeaderAlignmentHorz = taCenter
           Width = 41
@@ -245,6 +248,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1Column12: TcxGridDBColumn
           Caption = #31867#21035
           DataBinding.FieldName = 'CTName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 70
@@ -252,6 +256,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1CYNo: TcxGridDBColumn
           Caption = #20135#21697#32534#21495
           DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 112
@@ -259,12 +264,14 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1Column9: TcxGridDBColumn
           Caption = #20135#21697#21517#31216
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 116
         end
         object Tv1Column11: TcxGridDBColumn
           Caption = #33521#25991#21697#21517
           DataBinding.FieldName = 'C_EName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 92
@@ -272,6 +279,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1Column3: TcxGridDBColumn
           Caption = #38376#24133
           DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -279,6 +287,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object v1Column1: TcxGridDBColumn
           Caption = #20811#37325
           DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 81
@@ -286,6 +295,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object Tv1Column3: TcxGridDBColumn
           Caption = #22383#24067#32534#21495
           DataBinding.FieldName = 'C_FromCode'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 85
@@ -293,6 +303,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object Tv1Column8: TcxGridDBColumn
           Caption = #22383#24067#21517#31216
           DataBinding.FieldName = 'C_FromName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 81
@@ -300,6 +311,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object Tv1Column2: TcxGridDBColumn
           Caption = #25104#20998
           DataBinding.FieldName = 'C_Composition'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -307,6 +319,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel
         object Tv1Column1: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 58
         end
diff --git a/A00通用窗体/U_ClothInfoSel.pas b/A00通用窗体/U_ClothInfoSel.pas
index 377b20f..c370a0f 100644
--- a/A00通用窗体/U_ClothInfoSel.pas
+++ b/A00通用窗体/U_ClothInfoSel.pas
@@ -12,7 +12,7 @@ uses
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxTL,
   cxMaskEdit, cxTLdxBarBuiltInMenu, cxCheckBox, cxInplaceContainer, cxDBTL,
-  cxTLData, math;
+  cxTLData, math, dxScrollbarAnnotations;
 
 type
   TfrmClothInfoSel = class(TfrmBaseHelp)
diff --git a/F02染色计划单/U_DyeCardInput.dfm b/F02染色计划单/U_DyeCardInput.dfm
index 978022c..cc8643d 100644
--- a/F02染色计划单/U_DyeCardInput.dfm
+++ b/F02染色计划单/U_DyeCardInput.dfm
@@ -822,7 +822,7 @@ inherited frmDyeCardInput: TfrmDyeCardInput
             end
             object edt_GramWeight: TEdit
               Tag = 2
-              Left = 48
+              Left = 51
               Top = 32
               Width = 100
               Height = 20
@@ -925,20 +925,6 @@ inherited frmDyeCardInput: TfrmDyeCardInput
               ParentFont = False
               TabOrder = 12
             end
-            object edt_name: TEdit
-              Tag = 2
-              Left = 204
-              Top = 7
-              Width = 100
-              Height = 20
-              Font.Charset = GB2312_CHARSET
-              Font.Color = clBlack
-              Font.Height = -12
-              Font.Name = #23435#20307
-              Font.Style = []
-              ParentFont = False
-              TabOrder = 13
-            end
             object edt_TSNOTE: TEdit
               Tag = 2
               Left = 372
@@ -951,7 +937,7 @@ inherited frmDyeCardInput: TfrmDyeCardInput
               Font.Name = #23435#20307
               Font.Style = []
               ParentFont = False
-              TabOrder = 14
+              TabOrder = 13
             end
             object edt_jitaino: TEdit
               Tag = 2
@@ -965,7 +951,7 @@ inherited frmDyeCardInput: TfrmDyeCardInput
               Font.Name = #23435#20307
               Font.Style = []
               ParentFont = False
-              TabOrder = 15
+              TabOrder = 14
             end
             object JGFACTORYNAME: TEdit
               Tag = 2
@@ -979,9 +965,25 @@ inherited frmDyeCardInput: TfrmDyeCardInput
               Font.Name = #23435#20307
               Font.Style = []
               ParentFont = False
-              TabOrder = 16
+              TabOrder = 15
               Text = #26412#21378
             end
+            object edt_name: TcxButtonEdit
+              Tag = 2
+              Left = 206
+              Top = 5
+              ParentFont = False
+              Properties.Buttons = <
+                item
+                  Default = True
+                  Kind = bkEllipsis
+                end>
+              Properties.ReadOnly = True
+              Properties.OnButtonClick = edt_namePropertiesButtonClick
+              Style.ButtonStyle = btsDefault
+              TabOrder = 16
+              Width = 99
+            end
           end
         end
         object cxTabSheet4: TcxTabSheet
@@ -1449,7 +1451,6 @@ inherited frmDyeCardInput: TfrmDyeCardInput
         Align = alClient
         PopupMenu = PM_1
         TabOrder = 0
-        ExplicitTop = 45
         object TV1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/F02染色计划单/U_DyeCardInput.pas b/F02染色计划单/U_DyeCardInput.pas
index d8d3fc2..9016a98 100644
--- a/F02染色计划单/U_DyeCardInput.pas
+++ b/F02染色计划单/U_DyeCardInput.pas
@@ -12,7 +12,7 @@ uses
   cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, U_BaseInput, System.ImageList,
   Vcl.ImgList, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu,
-  cxButtonEdit, Vcl.Menus, cxPC, dxSkinWXI, dxScrollbarAnnotations;
+  cxButtonEdit, Vcl.Menus, cxPC, dxSkinWXI, dxScrollbarAnnotations, cxMaskEdit;
 
 type
   TfrmDyeCardInput = class(TfrmBaseInput)
@@ -173,7 +173,6 @@ type
     Label24: TLabel;
     edt_C_XINHAO: TEdit;
     Label25: TLabel;
-    edt_name: TEdit;
     TV1Column22: TcxGridDBColumn;
     TV1Column23: TcxGridDBColumn;
     Label27: TLabel;
@@ -195,6 +194,7 @@ type
     ToolButton6: TToolButton;
     ToolButton7: TToolButton;
     TV2Column7: TcxGridDBColumn;
+    edt_name: TcxButtonEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -217,6 +217,7 @@ type
     procedure TextEdit(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
     procedure ToolButton7Click(Sender: TObject);
+    procedure edt_namePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
     FRollNum: integer;
     FGC_BatchNo, FGC_Piece, FGC_STKID, FGC_Position: string;
@@ -243,7 +244,8 @@ implementation
 
 uses
   U_DataLink, U_ZDYHelp, U_RTFun, U_DyePlanForCardSel, U_DyeProcessSel,
-  U_DyeTechnicsSel, U_DyePlanCardSel, U_DyeGreyClothStkSel, U_DyeCardGlideEdit;
+  U_DyeTechnicsSel, U_DyePlanCardSel, U_DyeGreyClothStkSel, U_DyeCardGlideEdit,
+  U_ClothInfoSel;
 {$R *.dfm}    function TfrmDyeCardInput.GetCard(): Boolean;
 var
   MCustNo, MC_Name: string;
@@ -621,7 +623,7 @@ begin
 
         FieldByName('carnum').Value := trim(carnum.Text);
         FieldByName('C_Name').Value := trim(edt_name.Text);
-        FieldByName('C_CODE').Value := trim(FC_CODE);
+        FieldByName('C_CODE').Value := trim(edt_C_XINHAO.Text);
         FieldByName('C_GramWeight').Value := trim(edt_GramWeight.Text);
         FieldByName('C_Width').Value := trim(edt_Width.Text);
         FieldByName('JGFACTORYNAME').Value := trim(JGFACTORYNAME.Text);
@@ -649,6 +651,14 @@ begin
       begin
         raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
       end;
+      with ADOQueryCmd do
+      begin
+        Close;
+        Sql.Clear;
+        Sql.Add('exec P_DYE_CF_GLIDE ');
+        Sql.Add('@PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+        execsql;
+      end;
       ADOQueryCmd.Connection.CommitTrans;
     except
       ADOQueryCmd.Connection.RollbackTrans;
@@ -659,6 +669,28 @@ begin
   InitGreyClothStk();
 end;
 
+procedure TfrmDyeCardInput.edt_namePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmClothInfoSel := TfrmClothInfoSel.Create(Application);
+    with frmClothInfoSel do
+    begin
+
+      if ShowModal = 1 then
+      begin
+
+        edt_name.Text := trim(CDS_1.FieldByName('c_name').AsString);
+        edt_C_XINHAO.Text := trim(CDS_1.FieldByName('c_code').AsString);
+        edt_GramWeight.Text := trim(CDS_1.FieldByName('C_GramWeight').AsString);
+        edt_Width.Text := trim(CDS_1.FieldByName('C_Width').AsString);
+      end;
+    end;
+
+  finally
+    frmClothInfoSel.Free;
+  end;
+end;
+
 procedure TfrmDyeCardInput.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -909,7 +941,14 @@ begin
               raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
             end;
           end;
-
+          with ADOQueryCmd do
+          begin
+            Close;
+            Sql.Clear;
+            Sql.Add('exec P_DYE_CF_GLIDE ');
+            Sql.Add('@PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+            execsql;
+          end;
           ADOQueryCmd.Connection.CommitTrans;
         except
           ADOQueryCmd.Connection.RollbackTrans;
diff --git a/F02染色计划单/U_DyeCardList.dfm b/F02染色计划单/U_DyeCardList.dfm
index e44cc28..c997bac 100644
--- a/F02染色计划单/U_DyeCardList.dfm
+++ b/F02染色计划单/U_DyeCardList.dfm
@@ -444,6 +444,7 @@ inherited frmDyeCardList: TfrmDyeCardList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
+    ExplicitTop = 125
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/F02染色计划单/U_DyePlanList.dfm b/F02染色计划单/U_DyePlanList.dfm
index 004a30b..b93f136 100644
--- a/F02染色计划单/U_DyePlanList.dfm
+++ b/F02染色计划单/U_DyePlanList.dfm
@@ -368,6 +368,7 @@ inherited frmDyePlanList: TfrmDyePlanList
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DataSource1
@@ -395,6 +396,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object Tv1Column17: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSEL'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -403,6 +405,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Content = DataLink_DyePlan.FontBlue
@@ -413,12 +416,14 @@ inherited frmDyePlanList: TfrmDyePlanList
       object Tv1Column2: TcxGridDBColumn
         Caption = #23458#25143#32534#21495
         DataBinding.FieldName = 'CustNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Content = DataLink_DyePlan.FontBlue
@@ -429,6 +434,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1ConNo: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_DyePlan.Default
@@ -437,6 +443,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1Column5: TcxGridDBColumn
         Caption = #29983#20135#31867#22411
         DataBinding.FieldName = 'OrdType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -444,6 +451,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1Column4: TcxGridDBColumn
         Caption = #38144#21806#31867#22411
         DataBinding.FieldName = 'Salestype'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -451,6 +459,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1Column1: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -458,6 +467,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1OrdDate: TcxGridDBColumn
         Caption = #21046#21333#26085#26399
         DataBinding.FieldName = 'OrdDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -468,6 +478,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         OnCustomDrawCell = v1DeliveryDateCustomDrawCell
@@ -479,6 +490,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1Column6: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -486,6 +498,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1MPRTCodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Content = DataLink_DyePlan.FontBlue
@@ -496,6 +509,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1MPRTSpec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_DyePlan.Default
@@ -504,6 +518,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1MPRTMF: TcxGridDBColumn
         Caption = #25104#21697#38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_DyePlan.Default
@@ -512,6 +527,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1MPRTKZ: TcxGridDBColumn
         Caption = #25104#21697#20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -519,6 +535,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object Tv1Column14: TcxGridDBColumn
         Caption = #24211#20301
         DataBinding.FieldName = 'GC_Position'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -526,6 +543,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object v1Column2: TcxGridDBColumn
         Caption = #24635#21305#25968
         DataBinding.FieldName = 'GC_TotalPiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Content = DataLink_DyePlan.FontBlue
@@ -536,6 +554,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object Tv1Column8: TcxGridDBColumn
         Caption = #25805#20316#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -543,6 +562,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       object Tv1Column16: TcxGridDBColumn
         Caption = #21305#37325
         DataBinding.FieldName = 'PieceWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -575,7 +595,6 @@ inherited frmDyePlanList: TfrmDyePlanList
       #24050#23436#25104
       #20840#37096)
     OnChange = cxTabControl1Change
-    ExplicitTop = 99
     ClientRectBottom = 22
     ClientRectRight = 1401
     ClientRectTop = 19
@@ -604,6 +623,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       TabOrder = 0
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_2
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -653,6 +673,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object Tv1Column1: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 80
@@ -660,6 +681,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object v1SOrddefstr1: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_Colorno'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
@@ -669,6 +691,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object v1PRTColor: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -685,6 +708,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object v1PRTORDQTY: TcxGridDBColumn
           Caption = #35746#36135#37327
           DataBinding.FieldName = 'OrdQty'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Content = DataLink_DyePlan.FontBlue
@@ -695,6 +719,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object v1OrderUnit: TcxGridDBColumn
           Caption = #25968#37327#21333#20301
           DataBinding.FieldName = 'OrdUnit'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -709,6 +734,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #20986#36135#25968#37327#21333#20301
           DataBinding.FieldName = 'Sorddefstr9'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -723,6 +749,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object cxGridDBColumn2: TcxGridDBColumn
           Caption = #25237#22383#21305#25968
           DataBinding.FieldName = 'AntcpPiece'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
@@ -731,6 +758,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object cxGridDBColumn3: TcxGridDBColumn
           Caption = #25237#22383#25968#37327
           DataBinding.FieldName = 'AntcpQty'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 80
@@ -738,6 +766,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object Tv1Column3: TcxGridDBColumn
           Caption = #25237#22383#21333#20301
           DataBinding.FieldName = 'AntcpUnit'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxComboBoxProperties'
           Properties.DropDownListStyle = lsEditFixedList
           Properties.Items.Strings = (
@@ -751,6 +780,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #22791#27880
           DataBinding.FieldName = 'Note'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 135
@@ -758,6 +788,7 @@ inherited frmDyePlanList: TfrmDyePlanList
         object TV2Column1: TcxGridDBColumn
           Caption = #21253#35013#21333#20301
           DataBinding.FieldName = 'bzunit'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 73
         end
diff --git a/F02染色计划单/U_DyePlanList.pas b/F02染色计划单/U_DyePlanList.pas
index 2cec9f1..243e81a 100644
--- a/F02染色计划单/U_DyePlanList.pas
+++ b/F02染色计划单/U_DyePlanList.pas
@@ -14,7 +14,8 @@ uses
   cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
   IdFTP, ShellAPI, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  IdExplicitTLSClientServerBase, U_BaseList, cxCheckBox, cxDropDownEdit;
+  IdExplicitTLSClientServerBase, U_BaseList, cxCheckBox, cxDropDownEdit,
+  dxScrollbarAnnotations;
 
 type
   TfrmDyePlanList = class(TfrmBaseList)