1113

A00通用窗体/U_CompanySel.dfm

@@ -21,6 +21,7 @@ inherited frmCompanySel: TfrmCompanySel
     Height = 476
     Align = alClient
     TabOrder = 0
+    ExplicitTop = 88
     object TV1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
@@ -127,54 +128,71 @@ inherited frmCompanySel: TfrmCompanySel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 2
+    ExplicitTop = 32
     object Label1: TLabel
-      Left = 18
+      Left = 210
-      Top = 17
+      Top = 14
       Width = 24
       Height = 12
       Caption = #21517#31216
     end
     object Label2: TLabel
-      Left = 491
+      Left = 643
-      Top = 17
+      Top = 14
       Width = 60
       Height = 12
       Caption = #20379#24212#21830#31867#22411
     end
     object Label3: TLabel
-      Left = 250
+      Left = 418
-      Top = 17
+      Top = 14
       Width = 24
       Height = 12
       Caption = #31616#31216
     end
+    object Label4: TLabel
+      Left = 18
+      Top = 14
+      Width = 24
+      Height = 12
+      Caption = #32534#21495
+    end
     object CoName: TEdit
       Tag = 2
-      Left = 54
+      Left = 240
-      Top = 13
+      Top = 10
-      Width = 169
+      Width = 145
       Height = 20
       TabOrder = 0
       OnChange = CoNameChange
     end
     object CoBusinessType: TEdit
       Tag = 2
-      Left = 556
+      Left = 708
-      Top = 13
+      Top = 10
-      Width = 169
+      Width = 149
       Height = 20
       TabOrder = 1
       OnChange = CoNameChange
     end
     object CoAbbrName: TEdit
       Tag = 2
-      Left = 286
+      Left = 454
-      Top = 13
+      Top = 10
-      Width = 169
+      Width = 155
       Height = 20
       TabOrder = 2
       OnChange = CoNameChange
     end
+    object CoCode: TEdit
+      Tag = 2
+      Left = 48
+      Top = 10
+      Width = 145
+      Height = 20
+      TabOrder = 3
+      OnChange = CoNameChange
+    end
   end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = ADOConnection1

A00通用窗体/U_CompanySel.pas

@@ -56,6 +56,8 @@ type
     CoBusinessType: TEdit;
     Label3: TLabel;
     CoAbbrName: TEdit;
+    Label4: TLabel;
+    CoCode: TEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

B01基础合同管理/U_BaoguanInPut.dfm

@@ -663,6 +663,7 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut
       Hint = 'HYDL/'#36135#36816#20195#29702
       ReadOnly = True
       TabOrder = 14
+      OnBtnUpClick = QiYunBtnUpClick
       OnBtnDnClick = CKSBtnDnClick
     end
     object CGS: TBtnEditC

B04采购计划管理/U_ClothHJGPlanList.dfm

@@ -188,6 +188,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
     TabOrder = 3
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnCustomDrawCell = Tv1CustomDrawCell
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
@@ -215,6 +216,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column4: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -224,12 +226,14 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column1: TcxGridDBColumn
         Caption = #29366#24577
         DataBinding.FieldName = 'ZT'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 58
       end
       object v1OrdDate: TcxGridDBColumn
         Caption = #19979#21333#26085#26399
         DataBinding.FieldName = 'PurDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -241,6 +245,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -252,6 +257,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1ConNo: TcxGridDBColumn
         Caption = #21518#21152#24037#21333#21495
         DataBinding.FieldName = 'PurNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -261,11 +267,13 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object v1Column1: TcxGridDBColumn
         Caption = #20379#24212#21830
         DataBinding.FieldName = 'SellName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -275,6 +283,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'BuyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -284,6 +293,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column19: TcxGridDBColumn
         Caption = #20132#26399#35828#26126
         DataBinding.FieldName = 'ShippMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 271
@@ -291,6 +301,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column9: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -298,6 +309,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column14: TcxGridDBColumn
         Caption = #20215#26684#26415#35821
         DataBinding.FieldName = 'JiaGeSY'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -305,12 +317,14 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column7: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
       end
       object v1Column10: TcxGridDBColumn
         DataBinding.FieldName = 'status'
+        DataBinding.IsNullValueType = True
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -318,6 +332,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column12: TcxGridDBColumn
         Caption = #38468#20214
         DataBinding.FieldName = 'ISSC'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.NullStyle = nssUnchecked
         HeaderAlignmentHorz = taCenter
@@ -327,6 +342,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column13: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -334,12 +350,14 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column2: TcxGridDBColumn
         Caption = #26159#21542#21547#31246
         DataBinding.FieldName = 'IsTax'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #36215#36816#28207
         DataBinding.FieldName = 'QiYun'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -348,6 +366,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
         Tag = 2
         Caption = #28322#30701#35013
         DataBinding.FieldName = 'QtyNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -355,6 +374,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object Tv1Column6: TcxGridDBColumn
         Caption = #20135#21697#22797#21333#21495
         DataBinding.FieldName = 'FOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
@@ -612,6 +632,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
     TabOrder = 5
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_2
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -670,6 +691,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1XHNo: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         SortIndex = 0
@@ -680,6 +702,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object VC_SCSCode: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -694,6 +717,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -701,6 +725,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column5: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -708,6 +733,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -715,6 +741,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -722,12 +749,14 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object TV2Column6: TcxGridDBColumn
         Caption = #21518#21152#24037#25968#37327
         DataBinding.FieldName = 'CGQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 72
       end
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -737,6 +766,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -751,6 +781,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1PRTPrice: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -761,6 +792,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -769,6 +801,7 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'SNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -776,30 +809,35 @@ inherited frmClothHJGPlanList: TfrmClothHJGPlanList
       object TV2Column1: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object TV2Column2: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object TV2Column3: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object TV2Column4: TcxGridDBColumn
         Caption = #24320#21305
         DataBinding.FieldName = 'KP'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 57
       end
       object TV2Column5: TcxGridDBColumn
         Caption = #24320#21305#21333#20301
         DataBinding.FieldName = 'KPUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 59
       end

B04采购计划管理/U_ClothHJGPlanList.pas

@@ -12,7 +12,8 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd;
+  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmClothHJGPlanList = class(TfrmBaseList)

B04采购计划管理/U_ClothHJGPlanPut.dfm

@@ -815,6 +815,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
     TabOrder = 3
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -874,6 +875,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
         Tag = 9
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -883,6 +885,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn14: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         SortIndex = 0
         SortOrder = soAscending
@@ -892,6 +895,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn15: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -906,36 +910,42 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn16: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object cxGridDBColumn17: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object cxGridDBColumn18: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object cxGridDBColumn19: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object TV1Column7: TcxGridDBColumn
         Caption = #21518#21152#24037#25968#37327
         DataBinding.FieldName = 'CGQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
       object cxGridDBColumn20: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -945,6 +955,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn21: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -958,6 +969,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn22: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -968,6 +980,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn23: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 84
@@ -975,39 +988,46 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       object cxGridDBColumn24: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'SNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object TV1Column1: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 54
       end
       object TV1Column2: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 57
       end
       object TV1Column3: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object TV1Column4: TcxGridDBColumn
         DataBinding.FieldName = 'SubId'
+        DataBinding.IsNullValueType = True
         Visible = False
       end
       object TV1Column5: TcxGridDBColumn
         Caption = #24320#21305
         DataBinding.FieldName = 'KP'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 50
       end
       object TV1Column6: TcxGridDBColumn
         Caption = #24320#21305#21333#20301
         DataBinding.FieldName = 'KPUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -1020,6 +1040,7 @@ inherited frmClothHJGPlanPut: TfrmClothHJGPlanPut
       end
       object TV1Column9: TcxGridDBColumn
         DataBinding.FieldName = 'MainID'
+        DataBinding.IsNullValueType = True
         Visible = False
       end
     end

B04采购计划管理/U_ClothHJGPlanPut.pas

@@ -14,7 +14,8 @@ uses
   dxDateRanges, dxBarBuiltInMenu, dxDateTimeWheelPicker, dxGDIPlusClasses,
   Vcl.Menus, MovePanel, cxCheckBox, cxImage, cxDBEdit, Vcl.DBCtrls, U_BaseInput,
   System.ImageList, Vcl.ImgList, IdBaseComponent, IdComponent, IdTCPConnection,
-  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI;
+  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmClothHJGPlanPut = class(TfrmBaseInput)

B04采购计划管理/U_HJGTradePlanSel.dfm

@@ -10,8 +10,6 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
-  ExplicitLeft = -271
-  ExplicitTop = -97
   ExplicitWidth = 1556
   ExplicitHeight = 682
   PixelsPerInch = 96
@@ -72,6 +70,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
+    ExplicitTop = 32
     object Label3: TLabel
       Left = 39
       Top = 10
@@ -125,7 +124,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 620
+      Left = 608
       Top = 10
       Width = 26
       Height = 12
@@ -163,6 +162,19 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label1: TLabel
+      Left = 607
+      Top = 37
+      Width = 52
+      Height = 12
+      Caption = #23458#25143#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 97
@@ -201,7 +213,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
     end
     object C_Pattern: TEdit
       Tag = 2
-      Left = 649
+      Left = 665
       Top = 6
       Width = 120
       Height = 20
@@ -226,6 +238,15 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       TabOrder = 6
       OnChange = OrderNoChange
     end
+    object BuyConNO: TEdit
+      Tag = 2
+      Left = 665
+      Top = 33
+      Width = 120
+      Height = 20
+      TabOrder = 7
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
@@ -238,6 +259,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       PopupMenu = PopupMenu1
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -253,6 +275,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column7: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'Ssel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -261,6 +284,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column11: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -268,6 +292,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -276,6 +301,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1ConNo: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -284,6 +310,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -294,6 +321,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -301,17 +329,20 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column5: TcxGridDBColumn
         Caption = #24037#33402
         DataBinding.FieldName = 'Technics'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #21152#24037#21378
         DataBinding.FieldName = 'FtyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 138
       end
       object v1OrdDefStr1: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -320,6 +351,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1MPRTCodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -328,6 +360,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1MPRTSpec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -336,6 +369,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column1: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -343,6 +377,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1MPRTMF: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -351,6 +386,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1MPRTKZ: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -359,6 +395,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1PRTColor: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -367,6 +404,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column1: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -375,6 +413,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column6: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -383,28 +422,33 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column4: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 87
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #24037#24207#25968
         DataBinding.FieldName = 'GXS'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 53
       end
       object Tv1Column6: TcxGridDBColumn
         Caption = #23433#25490#25968#37327
         DataBinding.FieldName = 'PQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #24453#23433#25490#25968
         DataBinding.FieldName = 'WPQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #35746#21333#25968#37327
         DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -413,6 +457,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column5: TcxGridDBColumn
         Caption = #25968#37327#21333#20301
         DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -421,6 +466,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object v1Column3: TcxGridDBColumn
         Caption = #20844#26020#25968
         DataBinding.FieldName = 'PRTOrderKgQty'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -429,6 +475,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column3: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -436,24 +483,28 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel
       object Tv1Column8: TcxGridDBColumn
         Caption = #24320#21305
         DataBinding.FieldName = 'KP'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 46
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #24320#21305#21333#20301
         DataBinding.FieldName = 'KPUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 59
       end
       object Tv1Column13: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 59
       end

B04采购计划管理/U_HJGTradePlanSel.pas

@@ -11,7 +11,7 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
-  cxCalendar, Vcl.Menus;
+  cxCalendar, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmHJGTradePlanSel = class(TfrmBaseHelp)
@@ -79,6 +79,8 @@ type
     PopupMenu1: TPopupMenu;
     N1: TMenuItem;
     N2: TMenuItem;
+    Label1: TLabel;
+    BuyConNO: TEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

B04采购计划管理/U_PurTradePlanSel.dfm

@@ -70,6 +70,7 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
+    ExplicitTop = 32
     object Label3: TLabel
       Left = 39
       Top = 10
@@ -123,7 +124,7 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 620
+      Left = 604
       Top = 10
       Width = 26
       Height = 12
@@ -161,6 +162,19 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label1: TLabel
+      Left = 604
+      Top = 37
+      Width = 52
+      Height = 12
+      Caption = #23458#25143#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 97
@@ -199,7 +213,7 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel
     end
     object C_Pattern: TEdit
       Tag = 2
-      Left = 649
+      Left = 660
       Top = 6
       Width = 120
       Height = 20
@@ -224,6 +238,15 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel
       TabOrder = 6
       OnChange = OrderNoChange
     end
+    object BuyConNo: TEdit
+      Tag = 2
+      Left = 660
+      Top = 33
+      Width = 120
+      Height = 20
+      TabOrder = 7
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0

B04采购计划管理/U_PurTradePlanSel.pas

@@ -79,6 +79,8 @@ type
     PopupMenu1: TPopupMenu;
     N1: TMenuItem;
     N2: TMenuItem;
+    Label1: TLabel;
+    BuyConNo: TEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

B04采购计划管理/U_RSTradePlanSel.dfm

@@ -10,8 +10,6 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
-  ExplicitLeft = -245
-  ExplicitTop = -73
   ExplicitWidth = 1556
   ExplicitHeight = 682
   PixelsPerInch = 96
@@ -72,6 +70,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
+    ExplicitTop = 44
     object Label3: TLabel
       Left = 39
       Top = 10
@@ -125,7 +124,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 620
+      Left = 602
       Top = 10
       Width = 26
       Height = 12
@@ -163,6 +162,19 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label1: TLabel
+      Left = 602
+      Top = 37
+      Width = 52
+      Height = 12
+      Caption = #23458#25143#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 97
@@ -201,7 +213,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
     end
     object C_Pattern: TEdit
       Tag = 2
-      Left = 649
+      Left = 665
       Top = 6
       Width = 120
       Height = 20
@@ -226,6 +238,15 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       TabOrder = 6
       OnChange = OrderNoChange
     end
+    object BuyConNo: TEdit
+      Tag = 2
+      Left = 665
+      Top = 33
+      Width = 120
+      Height = 20
+      TabOrder = 7
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
@@ -234,12 +255,11 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
     Height = 546
     Align = alClient
     TabOrder = 2
-    ExplicitLeft = 1
-    ExplicitTop = 100
     object Tv1: TcxGridDBTableView
       PopupMenu = PopupMenu1
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -255,6 +275,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column7: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'Ssel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -263,6 +284,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column11: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -270,6 +292,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -278,6 +301,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1ConNo: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -286,6 +310,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -296,6 +321,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -303,17 +329,20 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column5: TcxGridDBColumn
         Caption = #24037#33402
         DataBinding.FieldName = 'Technics'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #21152#24037#21378
         DataBinding.FieldName = 'FtyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 138
       end
       object v1OrdDefStr1: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -322,6 +351,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1MPRTCodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -330,6 +360,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1MPRTSpec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -338,6 +369,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column1: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -345,6 +377,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1MPRTMF: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -353,6 +386,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1MPRTKZ: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -361,6 +395,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1PRTColor: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -369,6 +404,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column1: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -377,6 +413,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column6: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -385,22 +422,26 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column4: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 87
       end
       object Tv1Column6: TcxGridDBColumn
         Caption = #23433#25490#26579#33394#25968#37327
         DataBinding.FieldName = 'PQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #24453#26579#33394#25968
         DataBinding.FieldName = 'WPQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #35746#21333#25968#37327
         DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -409,6 +450,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column5: TcxGridDBColumn
         Caption = #25968#37327#21333#20301
         DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -417,6 +459,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object v1Column3: TcxGridDBColumn
         Caption = #20844#26020#25968
         DataBinding.FieldName = 'PRTOrderKgQty'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -425,6 +468,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column3: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -432,24 +476,28 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel
       object Tv1Column8: TcxGridDBColumn
         Caption = #24320#21305
         DataBinding.FieldName = 'KP'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 46
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #24320#21305#21333#20301
         DataBinding.FieldName = 'KPUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 62
       end

B04采购计划管理/U_RSTradePlanSel.pas

@@ -11,7 +11,7 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
-  cxCalendar, Vcl.Menus;
+  cxCalendar, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmRSTradePlanSel = class(TfrmBaseHelp)
@@ -78,6 +78,8 @@ type
     PopupMenu1: TPopupMenu;
     PopupMenu11: TMenuItem;
     N1: TMenuItem;
+    Label1: TLabel;
+    BuyConNo: TEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

T04贸易明细仓库/U_TradeClothInEdit.dfm

@@ -2,8 +2,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
   Caption = #25104#21697#20837#24211#25195#25551
   ClientHeight = 632
   ClientWidth = 1350
-  ExplicitLeft = -208
-  ExplicitTop = -62
   ExplicitWidth = 1366
   ExplicitHeight = 671
   PixelsPerInch = 96
@@ -23,6 +21,8 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       Height = 423
       Align = alClient
       TabOrder = 0
+      ExplicitLeft = -3
+      ExplicitTop = 41
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -248,18 +248,27 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         ParentFont = False
         TabOrder = 1
       end
-      object StkType: TBtnEditC
+      object StkType: TComboBox
         Left = 488
-        Top = 0
+        Top = 5
-        Width = 94
+        Width = 73
-        Height = 38
+        Height = 28
-        Hint = 'StkType/'#24211#23384#31867#22411
+        Style = csDropDownList
+        BiDiMode = bdLeftToRight
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -20
+        Font.Name = #23435#20307
+        Font.Style = []
+        ParentBiDiMode = False
+        ParentFont = False
         TabOrder = 3
-        OnBtnUpClick = IOPositionBtnUpClick
+        Items.Strings = (
-        OnBtnDnClick = IOPositionBtnDnClick
+          #35746#21333
+          #24211#23384)
       end
       object ToolButton2: TToolButton
-        Left = 582
+        Left = 561
         Top = 0
         AutoSize = True
         Caption = #30830#35748#20837#24211
@@ -440,7 +449,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         Left = 251
         Top = 51
         Width = 87
-        Height = 20
+        Height = 16
         Date = 41337.000000000000000000
         Format = 'yyyy-MM-dd'
         Time = 0.663190821760508700

T04贸易明细仓库/U_TradeClothInEdit.pas

@@ -98,9 +98,9 @@ type
     IOPosition: TBtnEditC;
     Button1: TButton;
     Button2: TButton;
-    StkType: TBtnEditC;
     Tv1Column4: TcxGridDBColumn;
     Tv3Column4: TcxGridDBColumn;
+    StkType: TComboBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);

T04贸易明细仓库/U_TradeClothStkListNew.dfm

@@ -7,7 +7,6 @@
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitTop = -22
   ExplicitWidth = 1556
   ExplicitHeight = 631
   PixelsPerInch = 96
@@ -1730,22 +1729,12 @@
           OnBtnUpClick = IOPositionBtnUpClick
           OnBtnDnClick = IOPositionBtnDnClick
         end
-        object StkType: TBtnEditC
-          Left = 157
-          Top = 99
-          Width = 110
-          Height = 30
-          Hint = 'StkType/'#24211#23384#31867#22411
-          TabOrder = 2
-          OnBtnUpClick = IOPositionBtnUpClick
-          OnBtnDnClick = IOPositionBtnDnClick
-        end
         object Price: TEdit
           Left = 157
           Top = 140
           Width = 110
           Height = 29
-          TabOrder = 3
+          TabOrder = 2
           OnKeyPress = PriceKeyPress
         end
         object 库存调整: TBitBtn
@@ -1760,7 +1749,7 @@
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 4
+          TabOrder = 3
           OnClick = ToolButton5Click
         end
         object BitBtn2: TBitBtn
@@ -1775,7 +1764,7 @@
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 5
+          TabOrder = 4
           OnClick = ToolButton6Click
         end
         object BitBtn3: TBitBtn
@@ -1790,9 +1779,26 @@
           Font.Name = #23435#20307
           Font.Style = [fsBold]
           ParentFont = False
-          TabOrder = 6
+          TabOrder = 5
           OnClick = ToolButton7Click
         end
+        object StkType: TComboBox
+          Left = 157
+          Top = 100
+          Width = 110
+          Height = 28
+          Style = csDropDownList
+          Font.Charset = GB2312_CHARSET
+          Font.Color = clWindowText
+          Font.Height = -20
+          Font.Name = #23435#20307
+          Font.Style = [fsBold]
+          ParentFont = False
+          TabOrder = 6
+          Items.Strings = (
+            #35746#21333
+            #24211#23384)
+        end
       end
     end
   end
@@ -1847,7 +1853,7 @@
     Top = 284
   end
   object PM_1: TPopupMenu
-    Left = 674
+    Left = 682
     Top = 289
     object N1: TMenuItem
       Caption = #20840#36873
@@ -1881,7 +1887,7 @@
     Top = 375
   end
   object PM_2: TPopupMenu
-    Left = 674
+    Left = 690
     Top = 379
     object MenuItem1: TMenuItem
       Caption = #22797#21046

T04贸易明细仓库/U_TradeClothStkListNew.pas

@@ -175,7 +175,6 @@ type
     Panel1: TPanel;
     Panel2: TPanel;
     IOPosition: TBtnEditC;
-    StkType: TBtnEditC;
     Price: TEdit;
     ¿â´æµ÷Õû: TBitBtn;
     BitBtn2: TBitBtn;
@@ -185,6 +184,7 @@ type
     Tv1Column16: TcxGridDBColumn;
     TV2Column13: TcxGridDBColumn;
     ToolButton9: TToolButton;
+    StkType: TComboBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);