工艺部分要求实现

A00通用窗体/U_LabelPrint.dfm

@@ -2,23 +2,23 @@ inherited frmLabelPrint: TfrmLabelPrint
   Left = 372
   Top = 106
   Caption = #25253#34920#25171#21360
-  ClientHeight = 189
+  ClientHeight = 212
-  ClientWidth = 291
+  ClientWidth = 299
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Height = -12
   Font.Name = #23435#20307
   Position = poMainFormCenter
   OnClose = FormClose
-  ExplicitWidth = 307
+  ExplicitWidth = 315
-  ExplicitHeight = 228
+  ExplicitHeight = 251
   PixelsPerInch = 96
   TextHeight = 12
   object Panel1: TPanel [0]
     Left = 0
     Top = 0
-    Width = 291
+    Width = 299
-    Height = 189
+    Height = 212
     Align = alClient
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -26,6 +26,8 @@ inherited frmLabelPrint: TfrmLabelPrint
     FullRepaint = False
     ParentCtl3D = False
     TabOrder = 0
+    ExplicitWidth = 778
+    ExplicitHeight = 563
     object btnPrint: TSpeedButton
       Left = 162
       Top = 128

A00通用窗体/U_ProductInfoSel.dfm

@@ -97,6 +97,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
     object Tv1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Summary.DefaultGroupSummaryItems = <
         item
@@ -139,12 +140,14 @@ inherited frmProductInfoSel: TfrmProductInfoSel
       object Tv1Column2: TcxGridDBColumn
         Caption = #21697#29260
         DataBinding.FieldName = 'Brand'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 79
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'P_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
@@ -152,6 +155,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'P_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -165,6 +169,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'P_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 65
@@ -173,6 +178,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -185,6 +191,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
       object v1Column9: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
@@ -192,6 +199,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel
         Tag = 2
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         Width = 102
       end
     end

A00通用窗体/U_ProductInfoSel.pas

@@ -11,7 +11,7 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
-  cxDropDownEdit;
+  cxDropDownEdit, dxScrollbarAnnotations;
 
 type
   TfrmProductInfoSel = class(TfrmBaseHelp)

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

@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm</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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</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.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>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj</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,6 +338,8 @@ 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
@@ -628,8 +630,6 @@ inherited frmClothInfo: TfrmClothInfo
             BevelInner = bvLowered
             BorderStyle = bsNone
             TabOrder = 0
-            ExplicitLeft = 1
-            ExplicitTop = 6
           end
         end
         object Panel11: TPanel

A02基础产品管理/U_ClothInfoInput.dfm

@@ -98,6 +98,7 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 0
+        ExplicitLeft = 1
         object C_GramWeight: TcxTextEdit
           Tag = 2
           Left = 130
@@ -342,6 +343,7 @@ object frmClothInfoInput: TfrmClothInfoInput
           Font.Style = []
           ParentFont = False
           TabOrder = 29
+          ExplicitTop = 337
           object TV4: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
@@ -437,7 +439,7 @@ object frmClothInfoInput: TfrmClothInfoInput
               Tag = 1
               Left = 185
               Top = 1
-              Width = 497
+              Width = 572
               Height = 39
               Align = alLeft
               AutoSize = True
@@ -459,16 +461,23 @@ object frmClothInfoInput: TfrmClothInfoInput
               ParentFont = False
               ShowCaptions = True
               TabOrder = 1
-              object TbQX: TToolButton
+              object TbFB: TToolButton
                 Left = 0
                 Top = 0
+                Caption = #32763#24067
+                ImageIndex = 2
+                OnClick = TbFBClick
+              end
+              object TbQX: TToolButton
+                Left = 75
+                Top = 0
                 AutoSize = True
                 Caption = #28165#27927
                 ImageIndex = 2
                 OnClick = TbQXClick
               end
               object TbDX: TToolButton
-                Left = 71
+                Left = 146
                 Top = 0
                 AutoSize = True
                 Caption = #23450#22411
@@ -476,7 +485,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 OnClick = TbDXClick
               end
               object TbFS: TToolButton
-                Left = 142
+                Left = 217
                 Top = 0
                 AutoSize = True
                 Caption = #38450#27700
@@ -484,7 +493,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 OnClick = TbFSClick
               end
               object TbFP: TToolButton
-                Left = 213
+                Left = 288
                 Top = 0
                 AutoSize = True
                 Caption = #21457#27873
@@ -492,7 +501,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 OnClick = TbFPClick
               end
               object TbGJ: TToolButton
-                Left = 284
+                Left = 359
                 Top = 0
                 AutoSize = True
                 Caption = #21038#33014
@@ -500,7 +509,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 OnClick = TbGJClick
               end
               object TbZM: TToolButton
-                Left = 355
+                Left = 430
                 Top = 0
                 AutoSize = True
                 Caption = #36711#27611
@@ -508,7 +517,7 @@ object frmClothInfoInput: TfrmClothInfoInput
                 OnClick = TbZMClick
               end
               object TbDelete: TToolButton
-                Left = 426
+                Left = 501
                 Top = 0
                 AutoSize = True
                 Caption = #21024#38500

A02基础产品管理/U_ClothInfoInput.pas

@@ -705,6 +705,7 @@ type
     DS_3_3: TDataSource;
     CDS_3_2: TClientDataSet;
     CDS_3_3: TClientDataSet;
+    TbFB: TToolButton;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -762,6 +763,7 @@ type
     procedure cxGridDBColumn19PropertiesEditValueChanged(Sender: TObject);
     procedure TbGJ2ReplaceClick(Sender: TObject);
     procedure TbGJ3ReplaceClick(Sender: TObject);
+    procedure TbFBClick(Sender: TObject);
   private
     canshu1: string;
     Fint: Integer;
@@ -1633,17 +1635,17 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '防水', []) = True then
   begin
     Application.MessageBox('已存在防水工序!', '提示', 0);
     Exit;
   end;
-
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
 //  CopyAddRow(Tv1, CDS_1);
   with CDS_GX do
   begin
@@ -1663,17 +1665,17 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '清洗', []) = True then
   begin
     Application.MessageBox('已存在清洗工序!', '提示', 0);
     Exit;
   end;
-
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
 //  CopyAddRow(Tv1, CDS_1);
   with CDS_GX do
   begin
@@ -1693,11 +1695,7 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '一次定型', []) = True then
   begin
     if CDS_GX.Locate('GXName', '二次定型', []) = True then
@@ -1739,6 +1737,12 @@ begin
       Post;
     end;
   end;
+
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
   SetXH();
   ArrangeTabsByDataset;
 end;
@@ -1748,6 +1752,36 @@ begin
   FillAllTextEditsWithValue(panel3, '定型烘箱温度', FindLastEditedTextEdit(panel3, '定型烘箱温度'));
 end;
 
+procedure TfrmClothInfoInput.TbFBClick(Sender: TObject);
+var
+  i: Integer;
+begin
+
+  i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
+  i := i + 1;
+  if CDS_GX.Locate('GXName', '翻布', []) = True then
+  begin
+    Application.MessageBox('已存在翻布工序!', '提示', 0);
+    Exit;
+  end;
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
+
+//  CopyAddRow(Tv1, CDS_1);
+  with CDS_GX do
+  begin
+    Append;
+    FieldByName('SerialNo').Value := i;
+    FieldByName('GXName').Value := '翻布';
+    Post;
+  end;
+  SetXH();
+  ArrangeTabsByDataset;
+end;
+
 procedure TfrmClothInfoInput.TbFPClick(Sender: TObject);
 var
   i: Integer;
@@ -1755,16 +1789,18 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '发泡', []) = True then
   begin
     Application.MessageBox('已存在发泡工序!', '提示', 0);
     Exit;
   end;
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
+
 
 //  CopyAddRow(Tv1, CDS_1);
   with CDS_GX do
@@ -1790,11 +1826,7 @@ begin
 
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '一次刮胶', []) = True then
   begin
     if CDS_GX.Locate('GXName', '二次刮胶', []) = True then
@@ -1836,6 +1868,11 @@ begin
       Post;
     end;
   end;
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
   SetXH();
   ArrangeTabsByDataset;
 end;
@@ -1851,17 +1888,17 @@ var
 begin
   i := CDS_GX.RecordCount;      //当前的dataset有多少行记录
   i := i + 1;
-  if i > 10 then
+
-  begin
-    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
-    exit;
-  end;
   if CDS_GX.Locate('GXName', '轧毛', []) = True then
   begin
     Application.MessageBox('已存在轧毛工序!', '提示', 0);
     Exit;
   end;
-
+  if i > 11 then
+  begin
+    Application.MessageBox('已增至最大行数！', '提示信息', MB_OK);
+    exit;
+  end;
 //  CopyAddRow(Tv1, CDS_1);
   with CDS_GX do
   begin
@@ -2040,7 +2077,7 @@ begin
     SInitCDSData(ADOQueryTemp, CDS_3);
 //    end;
   end
-  else if CDS_gx.fieldByName('gxname').Value = '一次刮胶' then
+  else if CDS_gx.fieldByName('gxname').Value = '二次刮胶' then
   begin
     //二次刮胶子表更新
     with ADOQueryTemp do
@@ -2055,7 +2092,7 @@ begin
     SInitCDSData(ADOQueryTemp, CDS_3_2);
 //    end;
   end
-  else if CDS_gx.fieldByName('gxname').Value = '一次刮胶' then
+  else if CDS_gx.fieldByName('gxname').Value = '三次刮胶' then
   begin
     //三次刮胶子表更新
     with ADOQueryTemp do
@@ -2145,7 +2182,6 @@ begin
     gj_RollMethod3.Text := '';
     gj_OpenAmplitude3.Text := '';
   end
-
   else if CDS_gx.fieldByName('gxname').Value = '轧毛' then
   begin
     SClearData(panel7, 2);

B03基础物料仓库/ProductStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F02染色计划单/DyePlan.dpr

@@ -36,7 +36,9 @@ uses
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_DyeTechnicsSel in '..\F00染色通用窗体\U_DyeTechnicsSel.pas' {frmDyeTechnicsSel},
   U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
-  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
+  U_DyeProcessDefin in 'U_DyeProcessDefin.pas' {frmDyeProcessDefin},
+  U_ProductInfoSel in '..\A00通用窗体\U_ProductInfoSel.pas' {frmProductInfoSel};
 
 {$R *.res}
 

F02染色计划单/DyePlan.dproj

@@ -183,6 +183,14 @@
             <DesignClass>TDataModule</DesignClass>
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
+        <DCCReference Include="U_DyeProcessDefin.pas">
+            <Form>frmDyeProcessDefin</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_ProductInfoSel.pas">
+            <Form>frmProductInfoSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F02染色计划单/DyePlan.dproj.local

@@ -2,60 +2,62 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.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.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
+    <Transaction>2025/07/02 16:47:08.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas</Transaction>
+    <Transaction>2025/07/03 16:45:14.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -72,6 +74,8 @@
     <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
     <File Path="..\A00通用窗体\U_LabelPrint.pas"/>
     <File Path="..\A00通用窗体\U_LabelPrint.dfm"/>
+    <File Path="..\A00通用窗体\U_ProductInfoSel.pas"/>
+    <File Path="..\A00通用窗体\U_ProductInfoSel.dfm"/>
     <File Path="..\F00染色通用窗体"/>
     <File Path="..\F00染色通用窗体\U_DyeGreyClothOutSel.pas"/>
     <File Path="..\F00染色通用窗体\U_DyeGreyClothOutSel.dfm"/>
@@ -119,5 +123,7 @@
     <File Path="U_DyeInspSet.dfm"/>
     <File Path="U_DyeTechnicsinput.pas"/>
     <File Path="U_DyeTechnicsinput.dfm"/>
+    <File Path="U_DyeProcessDefin.pas"/>
+    <File Path="U_DyeProcessDefin.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

F02染色计划单/U_DyeCardList.dfm

@@ -2,6 +2,7 @@ inherited frmDyeCardList: TfrmDyeCardList
   Caption = #29983#20135#27969#31243#21345
   ClientHeight = 632
   ClientWidth = 1503
+  ExplicitTop = -2
   ExplicitWidth = 1519
   ExplicitHeight = 671
   PixelsPerInch = 96
@@ -169,6 +170,7 @@ inherited frmDyeCardList: TfrmDyeCardList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 32
     object Label1: TLabel
       Left = 23
       Top = 12
@@ -822,7 +824,7 @@ inherited frmDyeCardList: TfrmDyeCardList
     PreviewOptions.DrawBorder = False
     PreviewOptions.BorderPen.Color = clGray
     PreviewOptions.BorderPen.Style = psDash
-    Dataset = RMDB_1
+    Dataset = RMDB1
     CompressLevel = rmzcFastest
     CompressThread = False
     LaterBuildEvents = True
@@ -831,7 +833,7 @@ inherited frmDyeCardList: TfrmDyeCardList
     Top = 416
     ReportData = {}
   end
-  object RMDB_1: TRMDBDataSet
+  object RMDB1: TRMDBDataSet
     Visible = True
     DataSet = ADOQueryPrint
     Left = 688
@@ -1017,4 +1019,42 @@ inherited frmDyeCardList: TfrmDyeCardList
     Left = 376
     Top = 448
   end
+  object RM_1: TRMGridReport
+    ThreadPrepareReport = True
+    InitialZoom = pzDefault
+    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
+    DefaultCollate = False
+    ShowPrintDialog = False
+    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+    PreviewOptions.RulerUnit = rmutScreenPixels
+    PreviewOptions.RulerVisible = False
+    PreviewOptions.DrawBorder = False
+    PreviewOptions.BorderPen.Color = clGray
+    PreviewOptions.BorderPen.Style = psDash
+    CompressLevel = rmzcFastest
+    CompressThread = False
+    LaterBuildEvents = True
+    OnlyOwnerDataSet = False
+    Left = 240
+    Top = 200
+    ReportData = {}
+  end
+  object RMDB_1: TRMDBDataSet
+    Visible = True
+    DataSet = ADO_1
+    Left = 224
+    Top = 264
+  end
+  object RMDB_2: TRMDBDataSet
+    Visible = True
+    DataSet = ADO_2
+    Left = 296
+    Top = 248
+  end
+  object RMDB_3: TRMDBDataSet
+    Visible = True
+    DataSet = ADO_3
+    Left = 368
+    Top = 264
+  end
 end

F02染色计划单/U_DyeCardList.pas

@@ -42,7 +42,7 @@ type
     v1MPRTSpec: TcxGridDBColumn;
     CDS_1: TClientDataSet;
     RM1: TRMGridReport;
-    RMDB_1: TRMDBDataSet;
+    RMDB1: TRMDBDataSet;
     v1CustomerNoName: TcxGridDBColumn;
     Label4: TLabel;
     CustName: TEdit;
@@ -130,6 +130,10 @@ type
     ADO_1: TADOQuery;
     ADO_2: TADOQuery;
     ADO_3: TADOQuery;
+    RM_1: TRMGridReport;
+    RMDB_1: TRMDBDataSet;
+    RMDB_2: TRMDBDataSet;
+    RMDB_3: TRMDBDataSet;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -227,18 +231,21 @@ begin
   begin
     Close;
     SQL.Clear;
-    SQL.Add('SELECT * from Dye_Plan_Glide where PCID = ' + QuotedStr(MPCID));
+    SQL.Add('EXEC P_Dye_Plan_Glide @PCID = ' + QuotedStr(MPCID));
     Open;
   end;
+
   SCreateCDS(ADOQueryTemp, CDS_Print);
   SInitCDSData(ADOQueryTemp, CDS_Print);
-  with CDS_Print do
+  ShowMessage(IntToStr(CDS_Print.RecordCount));
-  begin
   if CDS_Print.IsEmpty then
   begin
     Application.MessageBox(PChar('没有设置工艺!'), '提示', 0);
     Exit;
   end;
+  with CDS_Print do
+  begin
+
     DisableControls;
     First;
     while not Eof do
@@ -286,23 +293,17 @@ begin
       fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + CDS_Label.fieldbyname('LMName').AsString + '.rmf';
       if FileExists(fPrintFile) then
       begin
-        RM1.LoadFromFile(fPrintFile);
+        RM_1.LoadFromFile(fPrintFile);
-        RM1.PrintReport;
+        RM_1.PrintReport;
         sleep(200);
-        with ADOQueryCmd do
-        begin
-          close;
-          sql.Clear;
-          sql.Add('update  Dye_Plan_Card SET status=''9'' ');
-          sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
-          execsql;
-        end;
       end
       else
+      begin
         Application.MessageBox(PChar('没有找到' + trim(fPrintFile)), '提示信息', 0);
-        exit;
+      end;
       next;
     end;
+
   end;
 end;
 

F02染色计划单/U_DyeProcessInput.dfm

@@ -85,6 +85,7 @@ object frmDyeProcessInput: TfrmDyeProcessInput
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_HZ
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -111,18 +112,21 @@ object frmDyeProcessInput: TfrmDyeProcessInput
       object v2PSName: TcxGridDBColumn
         Caption = #24037#24207#21517#31216
         DataBinding.FieldName = 'PSName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 98
       end
       object v2PSNote: TcxGridDBColumn
         Caption = #24037#24207#31867#21035
         DataBinding.FieldName = 'PSType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 72
       end
       object v2SYRName: TcxGridDBColumn
         Caption = #36710#38388#21517#31216
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -136,12 +140,14 @@ object frmDyeProcessInput: TfrmDyeProcessInput
       object vLDPrice: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 69
       end
       object v2Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 101
@@ -179,13 +185,13 @@ object frmDyeProcessInput: TfrmDyeProcessInput
   end
   object DS_HZ: TDataSource
     DataSet = CDS_HZ
-    Left = 803
+    Left = 571
-    Top = 275
+    Top = 227
   end
   object CDS_HZ: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 687
+    Left = 375
-    Top = 240
+    Top = 168
   end
 end

F02染色计划单/U_DyeProcessInput.pas

@@ -13,7 +13,8 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu;
+  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
+  dxScrollbarAnnotations;
 
 type
   TfrmDyeProcessInput = class(TForm)

F02染色计划单/U_DyeProcessList.dfm

@@ -3,6 +3,7 @@ inherited frmDyeProcessList: TfrmDyeProcessList
   ClientHeight = 569
   ClientWidth = 1126
   WindowState = wsMaximized
+  ExplicitLeft = -275
   ExplicitWidth = 1142
   ExplicitHeight = 608
   PixelsPerInch = 96
@@ -15,7 +16,7 @@ inherited frmDyeProcessList: TfrmDyeProcessList
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonWidth = 91
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_DyePlan.ImageList_new32
@@ -40,23 +41,72 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       ImageIndex = 0
       OnClick = ToolButton2Click
     end
-    object ToolButton3: TToolButton
+    object TbAdd_QX: TToolButton
       Left = 142
       Top = 0
       AutoSize = True
-      Caption = #26032#22686
+      Caption = #26032#22686#28165#27927
       ImageIndex = 9
-      OnClick = ToolButton3Click
+      OnClick = TbAdd_QXClick
     end
-    object ToolButton4: TToolButton
+    object TbAdd_DX: TToolButton
-      Left = 213
+      Left = 237
       Top = 0
+      AutoSize = True
+      Caption = #26032#22686#23450#22411
+      ImageIndex = 9
+      OnClick = TbAdd_DXClick
+    end
+    object TbAdd_FS: TToolButton
+      Left = 332
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686#38450#27700
+      ImageIndex = 9
+      OnClick = TbAdd_FSClick
+    end
+    object TbAdd_FP: TToolButton
+      Left = 427
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686#21457#27873
+      ImageIndex = 9
+      OnClick = TbAdd_FPClick
+    end
+    object TbAdd_GJ: TToolButton
+      Left = 522
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686#21038#33014
+      ImageIndex = 9
+      OnClick = TbAdd_GJClick
+    end
+    object TbAdd_ZM: TToolButton
+      Left = 617
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686#36711#27611
+      ImageIndex = 9
+      OnClick = TbAdd_ZMClick
+    end
+    object TbEdit: TToolButton
+      Left = 712
+      Top = 0
+      AutoSize = True
       Caption = #20462#25913
       ImageIndex = 3
-      OnClick = ToolButton4Click
+      OnClick = TbEditClick
+    end
+    object TbLook: TToolButton
+      Left = 783
+      Top = 0
+      AutoSize = True
+      Caption = #26597#30475
+      ImageIndex = 8
+      OnClick = TbLookClick
     end
     object TBDel: TToolButton
-      Left = 288
+      Left = 854
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -64,7 +114,7 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       OnClick = TBDelClick
     end
     object ToolButton1: TToolButton
-      Left = 359
+      Left = 925
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -72,7 +122,7 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 430
+      Left = 996
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -90,12 +140,13 @@ inherited frmDyeProcessList: TfrmDyeProcessList
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 32
     object Label5: TLabel
       Left = 191
       Top = 12
-      Width = 48
+      Width = 24
       Height = 12
-      Caption = #36710#38388#21517#31216
+      Caption = #24037#26102
     end
     object Label1: TLabel
       Left = 31
@@ -104,9 +155,16 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       Height = 12
       Caption = #24037#24207#21517#31216
     end
-    object Workshop: TEdit
+    object Label2: TLabel
+      Left = 325
+      Top = 12
+      Width = 36
+      Height = 12
+      Caption = #26426#21488#21517
+    end
+    object WorkHour: TEdit
       Tag = 2
-      Left = 241
+      Left = 219
       Top = 8
       Width = 89
       Height = 20
@@ -122,6 +180,15 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       TabOrder = 1
       OnChange = ZdyNameChange
     end
+    object MachineName: TEdit
+      Tag = 2
+      Left = 365
+      Top = 8
+      Width = 89
+      Height = 20
+      TabOrder = 2
+      OnChange = ZdyNameChange
+    end
   end
   object cxGrid2: TcxGrid [2]
     Left = 0
@@ -130,10 +197,12 @@ inherited frmDyeProcessList: TfrmDyeProcessList
     Height = 493
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 72
     object TV2: TcxGridDBTableView
       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]
@@ -150,9 +219,23 @@ inherited frmDyeProcessList: TfrmDyeProcessList
       Styles.Header = DataLink_DyePlan.handBlack
       Styles.Inactive = DataLink_DyePlan.SHuangSe
       Styles.Selection = DataLink_DyePlan.SHuangSe
+      object cxGridDBColumn3: TcxGridDBColumn
+        Caption = #24037#24207#31867#21035
+        DataBinding.FieldName = 'PSType'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        HeaderAlignmentHorz = taCenter
+        Width = 111
+      end
       object cxGridDBColumn1: TcxGridDBColumn
         Caption = #24037#24207#21517#31216
         DataBinding.FieldName = 'PSName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -162,42 +245,49 @@ inherited frmDyeProcessList: TfrmDyeProcessList
         HeaderAlignmentHorz = taCenter
         Width = 98
       end
-      object cxGridDBColumn3: TcxGridDBColumn
-        Caption = #24037#24207#31867#21035
-        DataBinding.FieldName = 'PSType'
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        HeaderAlignmentHorz = taCenter
-        Width = 128
-      end
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #36710#38388#21517#31216
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
             Default = True
             Kind = bkEllipsis
           end>
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Width = 73
       end
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
-        Width = 69
+        Width = 85
+      end
+      object TV2WorkHour: TcxGridDBColumn
+        Caption = #24037#26102
+        DataBinding.FieldName = 'WorkHour'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object TV2MachineName: TcxGridDBColumn
+        Caption = #26426#21488#21517
+        DataBinding.FieldName = 'MachineName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
       end
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
-        Width = 101
+        Width = 86
       end
     end
     object cxGridLevel2: TcxGridLevel
@@ -236,8 +326,8 @@ inherited frmDyeProcessList: TfrmDyeProcessList
   end
   object DS_1: TDataSource
     DataSet = CDS_1
-    Left = 415
+    Left = 335
-    Top = 283
+    Top = 243
   end
   object CDS_1: TClientDataSet
     Aggregates = <>

F02染色计划单/U_DyeProcessList.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseList;
+  U_BaseList, dxScrollbarAnnotations;
 
 type
   TfrmDyeProcessList = class(TfrmBaseList)
@@ -30,10 +30,10 @@ type
     ToolButton1: TToolButton;
     DS_1: TDataSource;
     CDS_1: TClientDataSet;
-    ToolButton3: TToolButton;
+    TbAdd_QX: TToolButton;
-    ToolButton4: TToolButton;
+    TbEdit: TToolButton;
     Label5: TLabel;
-    Workshop: TEdit;
+    WorkHour: TEdit;
     Label1: TLabel;
     PSName: TEdit;
     cxGrid2: TcxGrid;
@@ -44,6 +44,16 @@ type
     cxGridDBColumn5: TcxGridDBColumn;
     cxGridDBColumn6: TcxGridDBColumn;
     cxGridLevel2: TcxGridLevel;
+    TbAdd_DX: TToolButton;
+    TbAdd_FS: TToolButton;
+    TbAdd_FP: TToolButton;
+    TbAdd_GJ: TToolButton;
+    TbAdd_ZM: TToolButton;
+    Label2: TLabel;
+    MachineName: TEdit;
+    TV2MachineName: TcxGridDBColumn;
+    TV2WorkHour: TcxGridDBColumn;
+    TbLook: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -53,14 +63,24 @@ type
     procedure ToolButton2Click(Sender: TObject);
     procedure ZdyNameChange(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
-    procedure ToolButton4Click(Sender: TObject);
+    procedure TbEditClick(Sender: TObject);
-    procedure ToolButton3Click(Sender: TObject);
+    procedure TbAdd_QXClick(Sender: TObject);
     procedure Tv2DblClick(Sender: TObject);
+    procedure TbAdd_DXClick(Sender: TObject);
+    procedure TbAdd_FSClick(Sender: TObject);
+    procedure TbAdd_FPClick(Sender: TObject);
+    procedure TbAdd_GJClick(Sender: TObject);
+    procedure TbAdd_ZMClick(Sender: TObject);
+    procedure TbLookClick(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
   public
     fDEFstr5: string;
+    FPSType: string;
+    FPSID: string;
+    BtnInt: Integer;
+    //0增加，1修改，2复制，3查看
   end;
 
 var
@@ -69,7 +89,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_DyeProcessInput;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_DyeProcessInput, U_DyeProcessDefin;
 
 {$R *.dfm}
 
@@ -126,6 +146,20 @@ begin
       sql.Add('delete Dye_Process where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
       ExecSQL;
     end;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add('delete BS_Cloth_GY_Main where BCIID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
+      ExecSQL;
+    end;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add('delete BS_Cloth_GY_Sub where BCIID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
+      ExecSQL;
+    end;
   end;
   CDS_1.Delete;
 end;
@@ -165,13 +199,15 @@ begin
 //  SelExportData(Tv2,ADOQueryMain,'¹©Ó¦ÉÌ×ÊÁÏÁбí');
 end;
 
-procedure TfrmDyeProcessList.ToolButton4Click(Sender: TObject);
+procedure TfrmDyeProcessList.TbEditClick(Sender: TObject);
 begin
   try
-    frmDyeProcessInput := TfrmDyeProcessInput.Create(Application);
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
-    with frmDyeProcessInput do
+    with frmDyeProcessDefin do
     begin
-      FCYID := Trim(Self.CDS_1.fieldbyname('PSID').AsString);
+      BtnInt := 1;
+      FPSID := Trim(Self.CDS_1.fieldbyname('PSID').AsString);
+      FPSType := Trim(Self.CDS_1.fieldbyname('PSType').AsString);
       fDEFstr5 := self.fDEFstr5;
       if ShowModal = 1 then
       begin
@@ -179,17 +215,19 @@ begin
       end;
     end;
   finally
-    frmDyeProcessInput.Free;
+    frmDyeProcessDefin.Free;
   end;
 end;
 
-procedure TfrmDyeProcessList.ToolButton3Click(Sender: TObject);
+procedure TfrmDyeProcessList.TbLookClick(Sender: TObject);
 begin
   try
-    frmDyeProcessInput := TfrmDyeProcessInput.Create(Application);
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
-    with frmDyeProcessInput do
+    with frmDyeProcessDefin do
     begin
-      FCYID := '';
+      BtnInt := 3;
+      FPSID := Trim(Self.CDS_1.fieldbyname('PSID').AsString);
+      FPSType := Trim(Self.CDS_1.fieldbyname('PSType').AsString);
       fDEFstr5 := self.fDEFstr5;
       if ShowModal = 1 then
       begin
@@ -197,7 +235,122 @@ begin
       end;
     end;
   finally
-    frmDyeProcessInput.Free;
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_DXClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '定型';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_FPClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '发泡';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_FSClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '防水';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_GJClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '刮胶';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_QXClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '清洗';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeProcessList.TbAdd_ZMClick(Sender: TObject);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      BtnInt := 0;
+      FPSType := '轧毛';
+      FPSID := '';
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeProcessDefin.Free;
   end;
 end;
 

F04染色刷卡/DyeProcess.dproj.local

@@ -4,21 +4,21 @@
     <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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>2025/06/28 17:17:29.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">

F04染色刷卡/U_DyeOutputList.dfm

@@ -110,6 +110,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 32
     object Label3: TLabel
       Left = 252
       Top = 36
@@ -323,7 +324,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     Height = 482
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 108
+    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -454,14 +455,14 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #25968#37327
-        DataBinding.FieldName = 'Qty'
+        DataBinding.FieldName = 'EndQty'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #21305#25968
-        DataBinding.FieldName = 'rollnum'
+        DataBinding.FieldName = 'Endrollnum'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 69
@@ -487,9 +488,16 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1Column16: TcxGridDBColumn
+        Caption = #19978#26426#26102#38388
+        DataBinding.FieldName = 'FillTime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 93
+      end
       object Tv1Column11: TcxGridDBColumn
-        Caption = #25805#20316#26102#38388
+        Caption = #19979#26426#26102#38388
-        DataBinding.FieldName = 'FillTime2'
+        DataBinding.FieldName = 'EndTime'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 106

F04染色刷卡/U_DyeOutputList.pas

@@ -87,6 +87,7 @@ type
     Button1: TButton;
     Button2: TButton;
     Edit1: TEdit;
+    Tv1Column16: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);

T02贸易汇总仓库/TradeTotalClothStk.dproj

@@ -4,7 +4,7 @@
         <MainSource>TradeTotalClothStk.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -43,24 +33,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -84,13 +56,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -113,15 +78,6 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Debugger_HostApplication>D:\Dp10Repo\项目代码\恒溢水洗\T02贸易汇总仓库\testDll.exe</Debugger_HostApplication>
@@ -227,10 +183,6 @@
                 </Source>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>

T02贸易汇总仓库/TradeTotalClothStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.435,=D:\Dp10Repo\项目代码\RTBasics\T02贸易汇总仓库\U_TradeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.295,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.908,D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_PictureList.pas=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\T02贸易汇总仓库\U_TradeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.908,D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_PictureList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.892,=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.129,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.892,=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.908,D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_PictureList.dfm=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.dfm</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.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.336,=D:\Dp10Repo\项目代码\RTBasics\T02贸易汇总仓库\U_TradeClothOutInspList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.908,D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\雅尚\A00通用窗体\U_PictureList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

T02贸易汇总仓库/U_TradeClothOutInspList.dfm

@@ -101,6 +101,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
     TabOrder = 1
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCustomDrawCell = Tv1CustomDrawCell
       DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
@@ -118,6 +119,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object Tv1Column19: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSEL'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -126,6 +128,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object Tv1Column20: TcxGridDBColumn
         Caption = #21345#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
@@ -133,6 +136,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #24320#21345#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -143,6 +147,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column26: TcxGridDBColumn
         Caption = #25171#21367#26102#38388
         DataBinding.FieldName = 'Insp_Date'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -150,6 +155,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column13: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'ToOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
@@ -157,6 +163,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #21152#24037#21378
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
@@ -164,6 +171,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
@@ -171,6 +179,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #20811#37325
         DataBinding.FieldName = 'SPKZ'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -179,6 +188,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #38376#24133
         DataBinding.FieldName = 'SPMF'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -186,18 +196,21 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column22: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 61
       end
@@ -205,6 +218,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -215,6 +229,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -224,6 +239,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column23: TcxGridDBColumn
         Caption = #25439#32791
         DataBinding.FieldName = 'Insp_WastageQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FoneClMaroon
@@ -232,6 +248,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object Tv1Column11: TcxGridDBColumn
         Caption = #25439#32791'%'
         DataBinding.FieldName = 'Insp_WastageRatio'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FoneClMaroon
@@ -241,6 +258,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
         Tag = 2
         Caption = #25968#37327#21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -255,6 +273,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column15: TcxGridDBColumn
         Caption = #25171#21367#21305#25968
         DataBinding.FieldName = 'Insp_Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FontBlue
@@ -263,6 +282,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column17: TcxGridDBColumn
         Caption = #25171#21367#31859#25968
         DataBinding.FieldName = 'Insp_Meter'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FontBlue
@@ -271,6 +291,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object Tv1Column17: TcxGridDBColumn
         Caption = #25171#21367#20928#37325
         DataBinding.FieldName = 'Insp_NetWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FontBlue
@@ -279,6 +300,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column27: TcxGridDBColumn
         Caption = #27425#21697#21305#25968
         DataBinding.FieldName = 'Insp_DefectivePiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FoneRed
@@ -287,6 +309,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column18: TcxGridDBColumn
         Caption = #27425#21697#20928#37325
         DataBinding.FieldName = 'Insp_DefectiveNetWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FoneRed
@@ -295,6 +318,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object v1Column20: TcxGridDBColumn
         Caption = #27425#21697#31859#25968
         DataBinding.FieldName = 'Insp_DefectiveMeter'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradeTotalClothStk.FoneRed
@@ -303,6 +327,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       object Tv1Column1: TcxGridDBColumn
         Caption = #25439#32791#29366#24577
         DataBinding.FieldName = 'Insp_WastageFlag'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -323,7 +348,6 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
     Color = clWhite
     ParentBackground = False
     TabOrder = 2
-    ExplicitTop = 33
     object Label2: TLabel
       Left = 68
       Top = 35
@@ -493,7 +517,7 @@ inherited frmTradeClothOutInspList: TfrmTradeClothOutInspList
       TabOrder = 0
       Properties.CustomButtons.Buttons = <>
       Properties.Style = 6
-      Properties.TabIndex = 1
+      Properties.TabIndex = 0
       Properties.Tabs.Strings = (
         '   '#26410#25171#21367'   '
         '   '#24050#25171#21367'   ')

T02贸易汇总仓库/U_TradeClothOutInspList.pas

@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, BtnEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
-  Vcl.CheckLst, cxContainer, Vcl.Clipbrd, cxPC;
+  Vcl.CheckLst, cxContainer, Vcl.Clipbrd, cxPC, dxScrollbarAnnotations;
 
 type
   TfrmTradeClothOutInspList = class(TfrmBaseList)

T02贸易汇总仓库/U_TradeGreyClothOutList.dfm

@@ -3,9 +3,9 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
   Top = 98
   Caption = #22383#24067#20986#24211#21015#34920
   ClientHeight = 544
-  ClientWidth = 1595
+  ClientWidth = 1540
   Position = poScreenCenter
-  ExplicitWidth = 1611
+  ExplicitWidth = 1556
   ExplicitHeight = 583
   PixelsPerInch = 96
   TextHeight = 12
@@ -13,7 +13,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1595
+    Width = 1540
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -116,7 +116,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1595
+    Width = 1540
     Height = 61
     Align = alTop
     BevelInner = bvRaised
@@ -297,13 +297,14 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
   object cxGrid1: TcxGrid [2]
     Left = 0
     Top = 99
-    Width = 1595
+    Width = 1540
     Height = 445
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <
         item
@@ -350,6 +351,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column5: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSEL'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -358,6 +360,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column6: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -366,6 +369,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #20986#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -376,6 +380,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #20986#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -389,6 +394,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #25152#23646#31867#22411
         DataBinding.FieldName = 'SSType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -403,6 +409,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column1: TcxGridDBColumn
         Caption = #37319#36141#21333#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -413,6 +420,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -428,6 +436,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column13: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -435,6 +444,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column16: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -442,6 +452,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column17: TcxGridDBColumn
         Caption = #21697#29260
         DataBinding.FieldName = 'SXPinPai'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -452,6 +463,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -465,6 +477,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column20: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'SPCode'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -475,6 +488,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -483,6 +497,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -492,6 +507,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column7: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -499,12 +515,14 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column14: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'ToOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object v1Column5: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -512,6 +530,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object v1Column19: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -520,6 +539,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 66
@@ -528,6 +548,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -535,18 +556,21 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column11: TcxGridDBColumn
         Caption = #20986#21040#21333#20301
         DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #23384#25918#21333#20301
         DataBinding.FieldName = 'StkCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #21305#37325
         DataBinding.FieldName = 'PieceWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
@@ -554,11 +578,13 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
         Tag = 2
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         Width = 66
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -566,6 +592,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -573,6 +600,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column6: TcxGridDBColumn
         Caption = #38468#20214
         DataBinding.FieldName = 'FJFlag'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -581,6 +609,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column7: TcxGridDBColumn
         Caption = #30331#35760#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -588,6 +617,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column8: TcxGridDBColumn
         Caption = #30331#35760#26102#38388
         DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -595,6 +625,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column9: TcxGridDBColumn
         Caption = #20462#25913#20154
         DataBinding.FieldName = 'Editer'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -602,6 +633,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
       object Tv1Column10: TcxGridDBColumn
         Caption = #20462#25913#26102#38388
         DataBinding.FieldName = 'Edittime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66

T02贸易汇总仓库/U_TradeGreyClothOutList.pas

@@ -12,7 +12,8 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeGreyClothOutList = class(TfrmBaseList)

T02贸易汇总仓库/U_TradeGreyClothStkList.dfm

@@ -167,6 +167,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <
         item
@@ -236,6 +237,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object v1Column6: TcxGridDBColumn
         Caption = #20837#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 87
@@ -244,6 +246,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
         Tag = 2
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -259,6 +262,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object Tv1Column3: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
@@ -266,6 +270,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -280,6 +285,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -288,6 +294,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object v1Column4: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -295,6 +302,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object v1Column5: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -302,6 +310,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 124
@@ -309,6 +318,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object Tv1Column2: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -316,6 +326,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object Tv1Column1: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -323,18 +334,21 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
       object v1Column7: TcxGridDBColumn
         Caption = #20837#24211#21305#25968
         DataBinding.FieldName = 'piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 62
       end
       object v1Column9: TcxGridDBColumn
         Caption = #20837#24211#25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 63
       end
       object v1Column1: TcxGridDBColumn
         Caption = #24211#23384#21305#25968
         DataBinding.FieldName = 'stkpiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -343,6 +357,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
         Tag = 2
         Caption = #24211#23384#25968#37327
         DataBinding.FieldName = 'stkqty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -352,6 +367,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (

T02贸易汇总仓库/U_TradeGreyClothStkList.pas

@@ -12,7 +12,8 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeGreyClothStkList = class(TfrmBaseList)