diff --git a/A00通用窗体/U_CompanySel.dfm b/A00通用窗体/U_CompanySel.dfm index e0e26ec..34f97d6 100644 --- a/A00通用窗体/U_CompanySel.dfm +++ b/A00通用窗体/U_CompanySel.dfm @@ -24,6 +24,7 @@ inherited frmCompanySel: TfrmCompanySel object TV1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> @@ -38,6 +39,7 @@ inherited frmCompanySel: TfrmCompanySel object TV1Column1: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'CoCode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 151 @@ -45,6 +47,7 @@ inherited frmCompanySel: TfrmCompanySel object TV1Column2: TcxGridDBColumn Caption = #21517#31216 DataBinding.FieldName = 'CoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 253 @@ -52,12 +55,14 @@ inherited frmCompanySel: TfrmCompanySel object TV1Column3: TcxGridDBColumn Caption = #31616#31216 DataBinding.FieldName = 'CoAbbrName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 159 end object TV1Column4: TcxGridDBColumn Caption = #20379#24212#21830#31867#22411 DataBinding.FieldName = 'CoBusinessType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 121 end @@ -130,16 +135,23 @@ inherited frmCompanySel: TfrmCompanySel Caption = #21517#31216 end object Label2: TLabel - Left = 240 - Top = 15 + Left = 491 + Top = 17 Width = 60 Height = 12 Caption = #20379#24212#21830#31867#22411 end + object Label3: TLabel + Left = 250 + Top = 17 + Width = 24 + Height = 12 + Caption = #31616#31216 + end object CoName: TEdit Tag = 2 Left = 54 - Top = 12 + Top = 13 Width = 169 Height = 20 TabOrder = 0 @@ -147,13 +159,22 @@ inherited frmCompanySel: TfrmCompanySel end object CoBusinessType: TEdit Tag = 2 - Left = 305 - Top = 11 + Left = 556 + Top = 13 Width = 169 Height = 20 TabOrder = 1 OnChange = CoNameChange end + object CoAbbrName: TEdit + Tag = 2 + Left = 286 + Top = 13 + Width = 169 + Height = 20 + TabOrder = 2 + OnChange = CoNameChange + end end inherited ADOQueryBaseCmd: TADOQuery Connection = ADOConnection1 diff --git a/A00通用窗体/U_CompanySel.pas b/A00通用窗体/U_CompanySel.pas index 418ed5e..6c38101 100644 --- a/A00通用窗体/U_CompanySel.pas +++ b/A00通用窗体/U_CompanySel.pas @@ -10,7 +10,8 @@ uses cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, - dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput; + dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, dxSkinWXI, + dxScrollbarAnnotations; type TfrmCompanySel = class(TfrmBaseHelp) @@ -53,6 +54,8 @@ type TV1Column4: TcxGridDBColumn; Label2: TLabel; CoBusinessType: TEdit; + Label3: TLabel; + CoAbbrName: TEdit; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache index fe0e675..dcc2b3f 100644 Binary files a/A01基础公司管理/Company.identcache and b/A01基础公司管理/Company.identcache differ diff --git a/A01基础公司管理/U_Factory.dfm b/A01基础公司管理/U_Factory.dfm index dd30a1c..1b032ab 100644 --- a/A01基础公司管理/U_Factory.dfm +++ b/A01基础公司管理/U_Factory.dfm @@ -7,6 +7,8 @@ inherited frmFactory: TfrmFactory FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitLeft = -224 + ExplicitTop = -205 ExplicitWidth = 1382 ExplicitHeight = 840 PixelsPerInch = 96 @@ -495,6 +497,13 @@ inherited frmFactory: TfrmFactory Options.Editing = False Width = 232 end + object TV3Column2: TcxGridDBColumn + Caption = #24065#31181 + DataBinding.FieldName = 'Currency' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 53 + end end object cxGridLevel3: TcxGridLevel GridView = TV3 diff --git a/A01基础公司管理/U_Factory.pas b/A01基础公司管理/U_Factory.pas index de8708c..76e05c3 100644 --- a/A01基础公司管理/U_Factory.pas +++ b/A01基础公司管理/U_Factory.pas @@ -93,6 +93,7 @@ type TV4Column1: TcxGridDBColumn; TV4Column2: TcxGridDBColumn; ADOQuery2: TADOQuery; + TV3Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A03基础价格管理/MarketValue.dproj.local b/A03基础价格管理/MarketValue.dproj.local index 18093c2..2fbd029 100644 --- a/A03基础价格管理/MarketValue.dproj.local +++ b/A03基础价格管理/MarketValue.dproj.local @@ -1,73 +1,73 @@  - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm + 1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas 1899-12-30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas - 1899-12-30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.dfm + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas= + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas + 1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas= + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas= + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.451,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_PriceFileUp.pas - 1899-12-30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= - 1899-12-30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm - 1899-12-30 00:00:00.000.321,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\MarketValue.dproj=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\Contract.dproj - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.dfm - 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm - 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas= - 1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas - 1899-12-30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas= + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas - 1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas= - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= - 1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= - 1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas - 1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas= - 1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas - 1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899-12-30 00:00:00.000.041,=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= + 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm + 1899-12-30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas= 1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm - 1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.pas - 1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas= - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas= - 1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.041,=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas + 1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.pas + 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj + 1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas + 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas + 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm + 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm + 1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas= + 1899-12-30 00:00:00.000.321,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\MarketValue.dproj + 1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm + 1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm + 1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= + 1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas= @@ -98,7 +98,7 @@ - + diff --git a/A03基础价格管理/MarketValue.identcache b/A03基础价格管理/MarketValue.identcache index bfaa69b..90f42b8 100644 Binary files a/A03基础价格管理/MarketValue.identcache and b/A03基础价格管理/MarketValue.identcache differ diff --git a/A09财务通用管理/Financial.dpr b/A09财务通用管理/Financial.dpr index 8159a44..ee7ed10 100644 --- a/A09财务通用管理/Financial.dpr +++ b/A09财务通用管理/Financial.dpr @@ -37,7 +37,8 @@ uses U_UserSel in '..\A00ͨô\U_UserSel.pas' {frmUserSel}, U_ProductInfoSel in '..\A00ͨô\U_ProductInfoSel.pas' {frmProductInfoSel}, U_PictureUpload in '..\A00ͨô\U_PictureUpload.pas' {frmPictureUpload}, - U_FinFileUp in 'U_FinFileUp.pas' {frmFinFileUp}; + U_FinFileUp in 'U_FinFileUp.pas' {frmFinFileUp}, + U_PayableEdit in 'U_PayableEdit.pas' {frmPayableEdit}; {$R *.res} diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj index 0d62c98..87d984f 100644 --- a/A09财务通用管理/Financial.dproj +++ b/A09财务通用管理/Financial.dproj @@ -234,6 +234,10 @@
frmFinFileUp
dfm + +
frmPayableEdit
+ dfm + Cfg_2 Base diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index 1ff86b7..457a030 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -1,37 +1,38 @@  - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm - 1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas + 1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas 1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm - 1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas - 1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj + 1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.pas 1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas 1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas + 1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899-12-30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas 1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm 1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas @@ -39,17 +40,17 @@ 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas 1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas + 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm + 1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas + 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas @@ -146,5 +147,7 @@ + + diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index 89e5e97..67ff0a0 100644 Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ diff --git a/A09财务通用管理/U_CollectInput.dfm b/A09财务通用管理/U_CollectInput.dfm index e118db0..bd7d8fb 100644 --- a/A09财务通用管理/U_CollectInput.dfm +++ b/A09财务通用管理/U_CollectInput.dfm @@ -2,8 +2,8 @@ object frmCollectInput: TfrmCollectInput Left = 261 Top = 149 Caption = #25910#27454#30331#35760 - ClientHeight = 343 - ClientWidth = 919 + ClientHeight = 283 + ClientWidth = 923 Color = clWhite Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -21,7 +21,7 @@ object frmCollectInput: TfrmCollectInput Tag = 1 Left = 0 Top = 0 - Width = 919 + Width = 923 Height = 38 AutoSize = True ButtonHeight = 38 @@ -34,6 +34,7 @@ object frmCollectInput: TfrmCollectInput ParentColor = False ShowCaptions = True TabOrder = 0 + ExplicitWidth = 919 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -54,8 +55,8 @@ object frmCollectInput: TfrmCollectInput object ScrollBox1: TScrollBox Left = 0 Top = 38 - Width = 919 - Height = 305 + Width = 923 + Height = 245 Align = alClient BevelInner = bvNone BevelOuter = bvNone @@ -71,6 +72,9 @@ object frmCollectInput: TfrmCollectInput ParentCtl3D = False ParentFont = False TabOrder = 1 + ExplicitTop = 44 + ExplicitWidth = 919 + ExplicitHeight = 305 object Label2: TLabel Left = 245 Top = 20 @@ -86,7 +90,7 @@ object frmCollectInput: TfrmCollectInput end object Label7: TLabel Left = 28 - Top = 186 + Top = 146 Width = 41 Height = 15 Caption = #22791' '#27880 @@ -98,8 +102,8 @@ object frmCollectInput: TfrmCollectInput ParentFont = False end object Label8: TLabel - Left = 28 - Top = 133 + Left = 685 + Top = 75 Width = 52 Height = 15 Caption = #20184#27454#26041#24335 @@ -137,11 +141,11 @@ object frmCollectInput: TfrmCollectInput ParentFont = False end object Label3: TLabel - Left = 245 - Top = 133 - Width = 47 + Left = 685 + Top = 107 + Width = 52 Height = 15 - Caption = #37329' '#39069 + Caption = #20837#36134#37329#39069 Font.Charset = ANSI_CHARSET Font.Color = clBlue Font.Height = -12 @@ -176,7 +180,7 @@ object frmCollectInput: TfrmCollectInput ParentFont = False end object Label20: TLabel - Left = 687 + Left = 685 Top = 20 Width = 39 Height = 15 @@ -228,8 +232,8 @@ object frmCollectInput: TfrmCollectInput ParentFont = False end object Label1: TLabel - Left = 28 - Top = 107 + Left = 245 + Top = 104 Width = 52 Height = 15 Caption = #25171#27454#37329#39069 @@ -241,8 +245,8 @@ object frmCollectInput: TfrmCollectInput ParentFont = False end object Label4: TLabel - Left = 245 - Top = 103 + Left = 477 + Top = 104 Width = 47 Height = 15 Caption = #27719' '#29575 @@ -253,18 +257,31 @@ object frmCollectInput: TfrmCollectInput Font.Style = [fsBold] ParentFont = False end + object Label6: TLabel + Left = 28 + Top = 99 + Width = 52 + Height = 15 + Caption = #20837#36134#24065#31181 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end object Note: TMemo Left = 88 - Top = 186 + Top = 146 Width = 797 Height = 57 ScrollBars = ssVertical TabOrder = 0 end object Currency: TComboBox - Left = 409 - Top = 127 - Width = 37 + Left = 88 + Top = 98 + Width = 140 Height = 20 Style = csDropDownList Font.Charset = ANSI_CHARSET @@ -279,9 +296,9 @@ object frmCollectInput: TfrmCollectInput 'USD') end object PayMent: TBtnEditC - Left = 88 - Top = 130 - Width = 140 + Left = 745 + Top = 72 + Width = 128 Height = 20 Hint = 'PayMent/'#20184#27454#26041#24335 Font.Charset = GB2312_CHARSET @@ -343,12 +360,12 @@ object frmCollectInput: TfrmCollectInput OnBtnDnClick = PayMentBtnDnClick end object Amount: TcxCurrencyEdit - Left = 302 - Top = 129 + Left = 745 + Top = 103 Enabled = False Properties.AssignedValues.DisplayFormat = True TabOrder = 6 - Width = 101 + Width = 128 end object OurBankName: TBtnEditC Left = 88 @@ -381,9 +398,9 @@ object frmCollectInput: TfrmCollectInput OnBtnDnClick = PayMentBtnDnClick end object FFTime: TDateTimePicker - Left = 728 + Left = 745 Top = 17 - Width = 125 + Width = 128 Height = 20 BevelInner = bvNone Date = 40916.000000000000000000 @@ -392,7 +409,7 @@ object frmCollectInput: TfrmCollectInput TabOrder = 9 end object OrderNo: TBtnEditC - Left = 301 + Left = 303 Top = 72 Width = 140 Height = 20 @@ -437,16 +454,16 @@ object frmCollectInput: TfrmCollectInput OnBtnDnClick = PayMentBtnDnClick end object DKAmount: TcxCurrencyEdit - Left = 86 - Top = 104 + Left = 303 + Top = 101 Properties.AssignedValues.DisplayFormat = True TabOrder = 13 OnExit = DKAmountExit Width = 138 end object ExchangeRate: TcxCurrencyEdit - Left = 298 - Top = 103 + Left = 536 + Top = 104 Properties.AssignedValues.DisplayFormat = True TabOrder = 14 OnExit = DKAmountExit @@ -457,20 +474,20 @@ object frmCollectInput: TfrmCollectInput Connection = DataLink_Financial.ADOLink LockType = ltReadOnly Parameters = <> - Left = 835 - Top = 136 + Left = 795 + Top = 200 end object ADOQueryCmd: TADOQuery Connection = DataLink_Financial.ADOLink Parameters = <> - Left = 782 - Top = 128 + Left = 702 + Top = 192 end object ADOQueryMain: TADOQuery Connection = DataLink_Financial.ADOLink LockType = ltReadOnly Parameters = <> - Left = 709 - Top = 129 + Left = 629 + Top = 193 end end diff --git a/A09财务通用管理/U_CollectInput.pas b/A09财务通用管理/U_CollectInput.pas index c920988..f6fa05a 100644 --- a/A09财务通用管理/U_CollectInput.pas +++ b/A09财务通用管理/U_CollectInput.pas @@ -54,6 +54,7 @@ type DKAmount: TcxCurrencyEdit; Label4: TLabel; ExchangeRate: TcxCurrencyEdit; + Label6: TLabel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A09财务通用管理/U_PayableEdit.dfm b/A09财务通用管理/U_PayableEdit.dfm new file mode 100644 index 0000000..19d6031 --- /dev/null +++ b/A09财务通用管理/U_PayableEdit.dfm @@ -0,0 +1,83 @@ +object frmPayableEdit: TfrmPayableEdit + Left = 682 + Top = 315 + Caption = #24212#20184#21333#20215#20462#25913 + ClientHeight = 127 + ClientWidth = 330 + Color = clWhite + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + OldCreateOrder = False + Position = poMainFormCenter + PixelsPerInch = 96 + TextHeight = 13 + object Panel1: TPanel + Left = 0 + Top = 0 + Width = 330 + Height = 127 + Align = alClient + TabOrder = 0 + DesignSize = ( + 330 + 127) + object Label1: TLabel + Left = 24 + Top = 41 + Width = 30 + Height = 13 + Anchors = [] + AutoSize = False + Caption = #21333#20215 + end + object Button1: TButton + Left = 208 + Top = 38 + Width = 75 + Height = 21 + Caption = #30830#35748 + TabOrder = 0 + OnClick = Button1Click + end + object Price: TEdit + Left = 64 + Top = 37 + Width = 121 + Height = 21 + Anchors = [] + TabOrder = 1 + end + object Button2: TButton + Left = 208 + Top = 76 + Width = 75 + Height = 25 + Caption = #20851#38381 + TabOrder = 2 + OnClick = Button2Click + end + end + object ADOQueryMain: TADOQuery + Connection = DataLink_Financial.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 293 + Top = 373 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_Financial.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 197 + Top = 373 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Financial.ADOLink + Parameters = <> + Left = 101 + Top = 373 + end +end diff --git a/A09财务通用管理/U_PayableEdit.pas b/A09财务通用管理/U_PayableEdit.pas new file mode 100644 index 0000000..5a38942 --- /dev/null +++ b/A09财务通用管理/U_PayableEdit.pas @@ -0,0 +1,65 @@ +unit U_PayableEdit; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, StdCtrls, ExtCtrls, DB, ADODB; + +type + TfrmPayableEdit = class(TForm) + Panel1: TPanel; + Button1: TButton; + Label1: TLabel; + Button2: TButton; + ADOQueryMain: TADOQuery; + ADOQueryTemp: TADOQuery; + ADOQueryCmd: TADOQuery; + Price: TEdit; + procedure Button2Click(Sender: TObject); + procedure Button1Click(Sender: TObject); + private + { Private declarations } + public + FFFIDS: string; + { Public declarations } + end; + +var + frmPayableEdit: TfrmPayableEdit; + +implementation + +{$R *.dfm} + +procedure TfrmPayableEdit.Button2Click(Sender: TObject); +begin + Close; +end; + +procedure TfrmPayableEdit.Button1Click(Sender: TObject); +begin + if StrToFloatDef(Price.Text, 0) = 0 then + Price.Text := '0'; + try + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' update Finance_Flow '); + sql.Add(' set Price=' + Price.Text); + sql.Add(' ,Amount=Round((Qty * ' + Price.Text + ' + isnull(OtherFee,0)+ isnull(freight,0)+ isnull(AdvFee,0)+ isnull(PackFee,0) - isnull(Deduction,0)), 2)'); + sql.Add(' where ISNULL(status, ''0'')=''0'' '); + sql.Add(' and EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(FFFIDS) + ','','') X where X.RTValue=Finance_Flow.FFID) '); +// showmessage(sql.text); + ExecSQL; + end; + ModalResult := 1; + except + application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); + + end; +end; + +end. + diff --git a/A09财务通用管理/U_PayableInput.dfm b/A09财务通用管理/U_PayableInput.dfm index 3e49677..7b810cf 100644 --- a/A09财务通用管理/U_PayableInput.dfm +++ b/A09财务通用管理/U_PayableInput.dfm @@ -2,8 +2,8 @@ object frmPayableInput: TfrmPayableInput Left = 261 Top = 149 Caption = #24212#20184#27454#30331#35760 - ClientHeight = 362 - ClientWidth = 919 + ClientHeight = 410 + ClientWidth = 923 Color = clWhite Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -21,7 +21,7 @@ object frmPayableInput: TfrmPayableInput Tag = 1 Left = 0 Top = 0 - Width = 919 + Width = 923 Height = 38 AutoSize = True ButtonHeight = 38 @@ -34,6 +34,7 @@ object frmPayableInput: TfrmPayableInput ParentColor = False ShowCaptions = True TabOrder = 0 + ExplicitWidth = 919 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -54,8 +55,8 @@ object frmPayableInput: TfrmPayableInput object ScrollBox1: TScrollBox Left = 0 Top = 38 - Width = 919 - Height = 324 + Width = 923 + Height = 372 Align = alClient BevelInner = bvNone BevelOuter = bvNone @@ -72,6 +73,8 @@ object frmPayableInput: TfrmPayableInput ParentFont = False TabOrder = 1 OnClick = ScrollBox1Click + ExplicitWidth = 919 + ExplicitHeight = 324 object Label2: TLabel Left = 245 Top = 20 @@ -100,7 +103,7 @@ object frmPayableInput: TfrmPayableInput end object Label7: TLabel Left = 28 - Top = 204 + Top = 235 Width = 50 Height = 15 Caption = #22791' '#27880 @@ -165,7 +168,7 @@ object frmPayableInput: TfrmPayableInput end object Label3: TLabel Left = 245 - Top = 172 + Top = 203 Width = 50 Height = 15 Caption = #37329' '#39069 @@ -244,7 +247,7 @@ object frmPayableInput: TfrmPayableInput Visible = False end object Label15: TLabel - Left = 671 + Left = 674 Top = 80 Width = 50 Height = 15 @@ -287,7 +290,7 @@ object frmPayableInput: TfrmPayableInput end object Label4: TLabel Left = 674 - Top = 136 + Top = 168 Width = 51 Height = 15 Caption = #20854' '#20182' '#36153 @@ -313,7 +316,7 @@ object frmPayableInput: TfrmPayableInput end object Label21: TLabel Left = 28 - Top = 172 + Top = 203 Width = 50 Height = 15 Caption = #20943' '#20813 @@ -325,7 +328,7 @@ object frmPayableInput: TfrmPayableInput ParentFont = False end object Label22: TLabel - Left = 244 + Left = 245 Top = 49 Width = 52 Height = 15 @@ -338,7 +341,7 @@ object frmPayableInput: TfrmPayableInput ParentFont = False end object Label23: TLabel - Left = 27 + Left = 28 Top = 49 Width = 52 Height = 15 @@ -364,8 +367,8 @@ object frmPayableInput: TfrmPayableInput ParentFont = False end object Label18: TLabel - Left = 458 - Top = 172 + Left = 455 + Top = 203 Width = 52 Height = 15 Caption = #26159#21542#21547#31246 @@ -377,7 +380,7 @@ object frmPayableInput: TfrmPayableInput ParentFont = False end object Label19: TLabel - Left = 459 + Left = 455 Top = 79 Width = 52 Height = 15 @@ -389,6 +392,45 @@ object frmPayableInput: TfrmPayableInput Font.Style = [fsBold] ParentFont = False end + object Label25: TLabel + Left = 28 + Top = 168 + Width = 42 + Height = 15 + Caption = #35013'/'#36816#36153 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label26: TLabel + Left = 245 + Top = 168 + Width = 39 + Height = 15 + Caption = #21253#35013#36153 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label27: TLabel + Left = 455 + Top = 168 + Width = 39 + Height = 15 + Caption = #24191#21578#36153 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end object F_Code: TEdit Left = 82 Top = 77 @@ -398,7 +440,7 @@ object frmPayableInput: TfrmPayableInput end object Note: TMemo Left = 82 - Top = 204 + Top = 235 Width = 797 Height = 57 ScrollBars = ssVertical @@ -413,7 +455,7 @@ object frmPayableInput: TfrmPayableInput end object Currency: TComboBox Left = 402 - Top = 169 + Top = 200 Width = 37 Height = 20 Style = csDropDownList @@ -447,7 +489,7 @@ object frmPayableInput: TfrmPayableInput OnBtnDnClick = PayMentBtnDnClick end object OppCoName: TBtnEditC - Left = 297 + Left = 299 Top = 17 Width = 140 Height = 20 @@ -496,14 +538,14 @@ object frmPayableInput: TfrmPayableInput end object Amount: TcxCurrencyEdit Left = 299 - Top = 170 + Top = 201 Properties.AssignedValues.DisplayFormat = True TabOrder = 8 OnExit = QtyExit Width = 101 end object Price: TcxCurrencyEdit - Left = 513 + Left = 512 Top = 133 Properties.AssignedValues.DisplayFormat = True TabOrder = 9 @@ -519,7 +561,7 @@ object frmPayableInput: TfrmPayableInput Width = 101 end object Piece: TcxCurrencyEdit - Left = 84 + Left = 82 Top = 133 Properties.AssignedValues.DisplayFormat = True TabOrder = 11 @@ -550,7 +592,7 @@ object frmPayableInput: TfrmPayableInput Visible = False end object F_GramWeight: TEdit - Left = 298 + Left = 299 Top = 103 Width = 140 Height = 18 @@ -566,7 +608,7 @@ object frmPayableInput: TfrmPayableInput Visible = False end object F_Color: TEdit - Left = 727 + Left = 728 Top = 103 Width = 140 Height = 18 @@ -582,8 +624,8 @@ object frmPayableInput: TfrmPayableInput Visible = False end object OtherFee: TcxCurrencyEdit - Left = 727 - Top = 133 + Left = 728 + Top = 165 Properties.AssignedValues.DisplayFormat = True TabOrder = 18 OnExit = QtyExit @@ -602,14 +644,14 @@ object frmPayableInput: TfrmPayableInput end object Deduction: TcxCurrencyEdit Left = 82 - Top = 169 + Top = 200 Properties.AssignedValues.DisplayFormat = True TabOrder = 20 OnExit = QtyExit Width = 140 end object OrderNo: TBtnEditC - Left = 301 + Left = 299 Top = 47 Width = 140 Height = 20 @@ -624,7 +666,7 @@ object frmPayableInput: TfrmPayableInput OnBtnDnClick = PayMentBtnDnClick end object BuyConNo: TBtnEditC - Left = 81 + Left = 82 Top = 47 Width = 140 Height = 20 @@ -638,7 +680,7 @@ object frmPayableInput: TfrmPayableInput OnBtnDnClick = PayMentBtnDnClick end object FFAbstract: TBtnEditC - Left = 513 + Left = 512 Top = 47 Width = 140 Height = 20 @@ -654,8 +696,8 @@ object frmPayableInput: TfrmPayableInput OnBtnDnClick = PayMentBtnDnClick end object IsInvoice: TComboBox - Left = 513 - Top = 169 + Left = 512 + Top = 200 Width = 137 Height = 20 Style = csDropDownList @@ -672,7 +714,7 @@ object frmPayableInput: TfrmPayableInput end object FZFlag: TcxCurrencyEdit Left = 690 - Top = 275 + Top = 306 Properties.AssignedValues.DisplayFormat = True TabOrder = 25 Visible = False @@ -680,7 +722,7 @@ object frmPayableInput: TfrmPayableInput Width = 140 end object DBFS: TBtnEditC - Left = 513 + Left = 512 Top = 77 Width = 140 Height = 20 @@ -695,6 +737,30 @@ object frmPayableInput: TfrmPayableInput OnBtnUpClick = PayMentBtnUpClick OnBtnDnClick = PayMentBtnDnClick end + object freight: TcxCurrencyEdit + Left = 82 + Top = 165 + Properties.AssignedValues.DisplayFormat = True + TabOrder = 27 + OnExit = QtyExit + Width = 140 + end + object PackFee: TcxCurrencyEdit + Left = 299 + Top = 165 + Properties.AssignedValues.DisplayFormat = True + TabOrder = 28 + OnExit = QtyExit + Width = 140 + end + object AdvFee: TcxCurrencyEdit + Left = 512 + Top = 166 + Properties.AssignedValues.DisplayFormat = True + TabOrder = 29 + OnExit = QtyExit + Width = 140 + end end object ADOQueryTemp: TADOQuery Connection = DataLink_Financial.ADOLink diff --git a/A09财务通用管理/U_PayableInput.pas b/A09财务通用管理/U_PayableInput.pas index 3ccaccf..d390c0d 100644 --- a/A09财务通用管理/U_PayableInput.pas +++ b/A09财务通用管理/U_PayableInput.pas @@ -76,6 +76,12 @@ type FZFlag: TcxCurrencyEdit; Label19: TLabel; DBFS: TBtnEditC; + Label25: TLabel; + freight: TcxCurrencyEdit; + Label26: TLabel; + PackFee: TcxCurrencyEdit; + Label27: TLabel; + AdvFee: TcxCurrencyEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -113,9 +119,13 @@ uses procedure TfrmPayableInput.HJJE(); var MPrice, MQty, MOtherFee, MDeduction, MAmount: double; + Mfreight, MPackFee, MAdvFee: double; begin MPrice := Strtofloatdef(Price.Text, 0); MQty := Strtofloatdef(Qty.Text, 0); + Mfreight := Strtofloatdef(freight.Text, 0); + MPackFee := Strtofloatdef(PackFee.Text, 0); + MAdvFee := Strtofloatdef(AdvFee.Text, 0); MOtherFee := Strtofloatdef(OtherFee.Text, 0); MDeduction := Strtofloatdef(Deduction.Text, 0); MAmount := Strtofloatdef(Amount.Text, 0); @@ -123,7 +133,7 @@ begin // if MQty * MPrice <> 0 then // begin - MAmount := RoundFloat((MQty * MPrice + MOtherFee - MDeduction), 2); + MAmount := RoundFloat((MQty * MPrice + MOtherFee + Mfreight + MPackFee + MAdvFee + - MDeduction), 2); // end; // Price.Text := FloatToStr(MPrice); // Qty.Text := FloatToStr(MQty); diff --git a/A09财务通用管理/U_PayableList.dfm b/A09财务通用管理/U_PayableList.dfm index 52444e4..3a6006d 100644 --- a/A09财务通用管理/U_PayableList.dfm +++ b/A09财务通用管理/U_PayableList.dfm @@ -6,6 +6,7 @@ inherited frmPayableList: TfrmPayableList ClientWidth = 1540 FormStyle = fsMDIChild Visible = True + ExplicitLeft = -7 ExplicitWidth = 1556 ExplicitHeight = 629 PixelsPerInch = 96 @@ -51,16 +52,24 @@ inherited frmPayableList: TfrmPayableList ImageIndex = 3 OnClick = btnEditClick end - object ToolButton1: TToolButton + object ToolButton2: TToolButton Left = 213 Top = 0 AutoSize = True + Caption = #21333#20215#20462#25913 + ImageIndex = 3 + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 308 + Top = 0 + AutoSize = True Caption = #22797#21046 ImageIndex = 9 OnClick = ToolButton1Click end object btnDel: TToolButton - Left = 284 + Left = 379 Top = 0 AutoSize = True Caption = #21024#38500 @@ -68,7 +77,7 @@ inherited frmPayableList: TfrmPayableList OnClick = btnDelClick end object btnChk: TToolButton - Left = 355 + Left = 450 Top = 0 AutoSize = True Caption = #23457#26680 @@ -76,7 +85,7 @@ inherited frmPayableList: TfrmPayableList OnClick = btnChkClick end object btnReChk: TToolButton - Left = 426 + Left = 521 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -84,7 +93,7 @@ inherited frmPayableList: TfrmPayableList OnClick = btnReChkClick end object ToolButton4: TToolButton - Left = 521 + Left = 616 Top = 0 AutoSize = True Caption = #23548#20986 @@ -92,7 +101,7 @@ inherited frmPayableList: TfrmPayableList OnClick = ToolButton4Click end object ToolButton5: TToolButton - Left = 592 + Left = 687 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -100,7 +109,7 @@ inherited frmPayableList: TfrmPayableList OnClick = ToolButton5Click end object TBClose: TToolButton - Left = 687 + Left = 782 Top = 0 AutoSize = True Caption = #20851#38381 @@ -494,6 +503,27 @@ inherited frmPayableList: TfrmPayableList Options.Editing = False Width = 66 end + object Tv1Column28: TcxGridDBColumn + Caption = #35013'/'#36816#36153 + DataBinding.FieldName = 'freight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end + object Tv1Column29: TcxGridDBColumn + Caption = #21253#35013#36153 + DataBinding.FieldName = 'PackFee' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end + object Tv1Column30: TcxGridDBColumn + Caption = #24191#21578#36153 + DataBinding.FieldName = 'AdvFee' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end object Tv1Column16: TcxGridDBColumn Caption = #20943#20813 DataBinding.FieldName = 'Deduction' diff --git a/A09财务通用管理/U_PayableList.pas b/A09财务通用管理/U_PayableList.pas index 5e92ec6..5ac6653 100644 --- a/A09财务通用管理/U_PayableList.pas +++ b/A09财务通用管理/U_PayableList.pas @@ -93,6 +93,10 @@ type Tv1Column25: TcxGridDBColumn; Tv1Column26: TcxGridDBColumn; Tv1Column27: TcxGridDBColumn; + ToolButton2: TToolButton; + Tv1Column28: TcxGridDBColumn; + Tv1Column29: TcxGridDBColumn; + Tv1Column30: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure btnDelClick(Sender: TObject); @@ -114,17 +118,18 @@ type procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure ToolButton2Click(Sender: TObject); private procedure InitGrid(); procedure SetStatus(); public - FAuthority: string; + FAuthority,MFFID: string; end; implementation uses - U_DataLink, U_RTFun, U_PayableInput, U_ZDYHelp; + U_DataLink, U_RTFun, U_PayableInput, U_ZDYHelp, U_PayableEdit; {$R *.dfm} procedure TfrmPayableList.SetStatus(); @@ -169,6 +174,11 @@ begin else CheckBox1.Checked := True; + if not CDS_1.IsEmpty then + MFFID := Trim(CDS_1.FieldByName('FFID').AsString) + else + MFFID := ''; + try ADOQueryMain.DisableControls; with ADOQueryMain do @@ -204,6 +214,9 @@ begin ADOQueryMain.EnableControls; TV1.DataController.Filter.Clear; end; + + if MFFID <> '' then + CDS_1.Locate('FFID', MFFID, []); end; procedure TfrmPayableList.N1Click(Sender: TObject); @@ -483,6 +496,63 @@ begin end; +procedure TfrmPayableList.ToolButton2Click(Sender: TObject); +var + MFFIDS: string; +begin + if CDS_1.IsEmpty then + exit; + + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + + with CDS_1 do + begin + DisableControls; + while CDS_1.Locate('SSel', True, []) do + begin + MFFIDS := MFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; + CDS_1.Delete; + end; + EnableControls; + end; + + try + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' exec P_Fin_Flow_Judge '); + sql.Add(' @FFIDS=' + QuotedStr(MFFIDS)); + Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); + Sql.Add(',@DName=' + quotedstr(Trim(DName))); + open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + except + application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); + Exit; + end; + + try + frmPayableEdit := TfrmPayableEdit.Create(Application); + with frmPayableEdit do + begin + FFFIDS := MFFIDS; + if ShowModal = 1 then + begin + InitGrid(); + end; + end; + finally + frmPayableEdit.Free; + end; +end; + procedure TfrmPayableList.ToolButton4Click(Sender: TObject); begin if ADOQueryMain.IsEmpty then diff --git a/A09财务通用管理/U_ReceivableInput.dfm b/A09财务通用管理/U_ReceivableInput.dfm index 058190f..55eabfc 100644 --- a/A09财务通用管理/U_ReceivableInput.dfm +++ b/A09财务通用管理/U_ReceivableInput.dfm @@ -2,8 +2,8 @@ object frmReceivableInput: TfrmReceivableInput Left = 261 Top = 149 Caption = #24212#25910#27454#30331#35760 - ClientHeight = 508 - ClientWidth = 943 + ClientHeight = 405 + ClientWidth = 934 Color = clWhite Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -21,7 +21,7 @@ object frmReceivableInput: TfrmReceivableInput Tag = 1 Left = 0 Top = 0 - Width = 943 + Width = 934 Height = 38 AutoSize = True ButtonHeight = 38 @@ -34,6 +34,7 @@ object frmReceivableInput: TfrmReceivableInput ParentColor = False ShowCaptions = True TabOrder = 0 + ExplicitWidth = 932 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -54,8 +55,8 @@ object frmReceivableInput: TfrmReceivableInput object ScrollBox1: TScrollBox Left = 0 Top = 38 - Width = 943 - Height = 470 + Width = 934 + Height = 367 Align = alClient BevelInner = bvNone BevelOuter = bvNone @@ -72,6 +73,7 @@ object frmReceivableInput: TfrmReceivableInput ParentFont = False TabOrder = 1 OnClick = ScrollBox1Click + ExplicitTop = 44 object Label2: TLabel Left = 245 Top = 20 @@ -99,8 +101,8 @@ object frmReceivableInput: TfrmReceivableInput ParentFont = False end object Label7: TLabel - Left = 28 - Top = 204 + Left = 29 + Top = 221 Width = 50 Height = 15 Caption = #22791' '#27880 @@ -164,8 +166,8 @@ object frmReceivableInput: TfrmReceivableInput ParentFont = False end object Label3: TLabel - Left = 245 - Top = 172 + Left = 460 + Top = 161 Width = 50 Height = 15 Caption = #37329' '#39069 @@ -307,8 +309,8 @@ object frmReceivableInput: TfrmReceivableInput ParentFont = False end object Label21: TLabel - Left = 28 - Top = 172 + Left = 243 + Top = 161 Width = 50 Height = 15 Caption = #20943' '#20813 @@ -372,8 +374,8 @@ object frmReceivableInput: TfrmReceivableInput ParentFont = False end object Label19: TLabel - Left = 455 - Top = 172 + Left = 674 + Top = 161 Width = 52 Height = 15 Caption = #24212#25910#26085#26399 @@ -384,6 +386,32 @@ object frmReceivableInput: TfrmReceivableInput Font.Style = [fsBold] ParentFont = False end + object Label25: TLabel + Left = 674 + Top = 198 + Width = 50 + Height = 15 + Caption = #33337' '#26399 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label26: TLabel + Left = 27 + Top = 159 + Width = 50 + Height = 15 + Caption = #21253' '#25968 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end object F_Code: TEdit Left = 82 Top = 77 @@ -392,8 +420,8 @@ object frmReceivableInput: TfrmReceivableInput TabOrder = 0 end object Note: TMemo - Left = 82 - Top = 204 + Left = 83 + Top = 221 Width = 797 Height = 57 ScrollBars = ssVertical @@ -407,8 +435,8 @@ object frmReceivableInput: TfrmReceivableInput TabOrder = 1 end object Currency: TComboBox - Left = 401 - Top = 169 + Left = 616 + Top = 158 Width = 37 Height = 20 Style = csDropDownList @@ -490,8 +518,8 @@ object frmReceivableInput: TfrmReceivableInput OnBtnDnClick = PayMentBtnDnClick end object Amount: TcxCurrencyEdit - Left = 299 - Top = 169 + Left = 514 + Top = 158 Properties.AssignedValues.DisplayFormat = True TabOrder = 8 OnExit = QtyExit @@ -591,8 +619,8 @@ object frmReceivableInput: TfrmReceivableInput TabOrder = 19 end object Deduction: TcxCurrencyEdit - Left = 83 - Top = 169 + Left = 298 + Top = 158 Properties.AssignedValues.DisplayFormat = True TabOrder = 20 OnExit = QtyExit @@ -644,7 +672,7 @@ object frmReceivableInput: TfrmReceivableInput OnBtnDnClick = PayMentBtnDnClick end object YJ: TcxCurrencyEdit - Left = 727 + Left = 728 Top = 105 Properties.AssignedValues.DisplayFormat = True TabOrder = 24 @@ -652,8 +680,8 @@ object frmReceivableInput: TfrmReceivableInput Width = 140 end object YSDate: TDateTimePicker - Left = 512 - Top = 169 + Left = 728 + Top = 158 Width = 140 Height = 20 BevelInner = bvNone @@ -662,6 +690,24 @@ object frmReceivableInput: TfrmReceivableInput Time = 0.670856296288548000 TabOrder = 25 end + object SailingSchedule: TDateTimePicker + Left = 728 + Top = 195 + Width = 140 + Height = 20 + BevelInner = bvNone + Date = 40916.000000000000000000 + Format = 'yyyy-MM-dd' + Time = 0.670856296288548000 + TabOrder = 26 + end + object PacketNum: TcxCurrencyEdit + Left = 83 + Top = 159 + Properties.AssignedValues.DisplayFormat = True + TabOrder = 27 + Width = 140 + end end object ADOQueryTemp: TADOQuery Connection = DataLink_Financial.ADOLink diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas index e578bb4..ded2535 100644 --- a/A09财务通用管理/U_ReceivableInput.pas +++ b/A09财务通用管理/U_ReceivableInput.pas @@ -75,6 +75,10 @@ type YJ: TcxCurrencyEdit; Label19: TLabel; YSDate: TDateTimePicker; + Label25: TLabel; + SailingSchedule: TDateTimePicker; + Label26: TLabel; + PacketNum: TcxCurrencyEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -155,6 +159,7 @@ begin begin FFTime.DateTime := SGetServerDateTime(ADOQueryTemp); YSDate.DateTime := FFTime.DateTime + 60; + SailingSchedule.DateTime := FFTime.DateTime; end; finally diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index 28f6bce..4f9cb4a 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -274,6 +274,7 @@ inherited frmReceivableList: TfrmReceivableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 142 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -484,6 +485,13 @@ inherited frmReceivableList: TfrmReceivableList Options.Editing = False Width = 66 end + object Tv1Column30: TcxGridDBColumn + Caption = #21253#25968 + DataBinding.FieldName = 'PacketNum' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end object Tv1Column11: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'Piece' @@ -577,6 +585,13 @@ inherited frmReceivableList: TfrmReceivableList HeaderAlignmentHorz = taCenter Width = 92 end + object Tv1Column29: TcxGridDBColumn + Caption = #33337#26399 + DataBinding.FieldName = 'SailingSchedule' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 69 + end end object cxGridLevel1: TcxGridLevel GridView = Tv1 diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 06dda61..4cfbf33 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -96,6 +96,8 @@ type Tv1Column26: TcxGridDBColumn; Tv1Column27: TcxGridDBColumn; Tv1Column28: TcxGridDBColumn; + Tv1Column29: TcxGridDBColumn; + Tv1Column30: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure btnDelClick(Sender: TObject); diff --git a/B01基础合同管理/Contract.identcache b/B01基础合同管理/Contract.identcache index 2d5b091..b8d09cc 100644 Binary files a/B01基础合同管理/Contract.identcache and b/B01基础合同管理/Contract.identcache differ diff --git a/B04采购计划管理/PurchasePlan.dproj b/B04采购计划管理/PurchasePlan.dproj index 380b1e5..b1089c2 100644 --- a/B04采购计划管理/PurchasePlan.dproj +++ b/B04采购计划管理/PurchasePlan.dproj @@ -124,7 +124,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\testDll.exe + D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\testDll.exe diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local index c6c190f..74c0ea8 100644 --- a/B04采购计划管理/PurchasePlan.dproj.local +++ b/B04采购计划管理/PurchasePlan.dproj.local @@ -1,58 +1,58 @@  - 1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm - 1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas - 1899-12-30 00:00:00.000.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.dfm + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.pas + 1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.pas 1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm - 1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.pas + 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas + 1899-12-30 00:00:00.000.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.564,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_UserSel.pas - 1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm - 1899-12-30 00:00:00.000.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.pas - 1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.pas + 1899-12-30 00:00:00.000.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.pas 1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.pas + 1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm + 1899-12-30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj 1899-12-30 00:00:00.000.961,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas - 1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas - 1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.dfm + 1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm + 1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm 1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanPut.pas 1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas - 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas diff --git a/B04采购计划管理/U_ClothRSPlanList.dfm b/B04采购计划管理/U_ClothRSPlanList.dfm index 6b7ae6a..3e94054 100644 --- a/B04采购计划管理/U_ClothRSPlanList.dfm +++ b/B04采购计划管理/U_ClothRSPlanList.dfm @@ -188,6 +188,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv1CellDblClick OnCustomDrawCell = Tv1CustomDrawCell OnFocusedRecordChanged = Tv1FocusedRecordChanged @@ -215,6 +216,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column4: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -224,11 +226,13 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object Tv1Column1: TcxGridDBColumn Caption = #29366#24577 DataBinding.FieldName = 'ZT' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object v1OrdDate: TcxGridDBColumn Caption = #19979#21333#26085#26399 DataBinding.FieldName = 'PurDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -240,6 +244,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1DeliveryDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -251,6 +256,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1ConNo: TcxGridDBColumn Caption = #26579#33394#21333#21495 DataBinding.FieldName = 'PurNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -260,11 +266,13 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList 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 @@ -274,6 +282,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1CustomerNoName: TcxGridDBColumn Caption = #25105#26041#21333#20301 DataBinding.FieldName = 'BuyName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -283,6 +292,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object Tv1Column19: TcxGridDBColumn Caption = #20132#26399#35828#26126 DataBinding.FieldName = 'ShippMent' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 271 @@ -290,6 +300,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column9: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -297,6 +308,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object Tv1Column14: TcxGridDBColumn Caption = #20215#26684#26415#35821 DataBinding.FieldName = 'JiaGeSY' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -304,12 +316,14 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList 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 @@ -317,6 +331,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column12: TcxGridDBColumn Caption = #38468#20214 DataBinding.FieldName = 'ISSC' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter @@ -326,6 +341,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column13: TcxGridDBColumn Caption = #21046#21333#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -333,12 +349,14 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList 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 @@ -347,6 +365,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList Tag = 2 Caption = #28322#30701#35013 DataBinding.FieldName = 'QtyNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -354,6 +373,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object Tv1Column6: TcxGridDBColumn Caption = #20135#21697#22797#21333#21495 DataBinding.FieldName = 'FOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 86 end @@ -373,7 +393,6 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 37 object Label4: TLabel Left = 235 Top = 35 @@ -612,6 +631,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList 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 +690,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1XHNo: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'SerialNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False SortIndex = 0 @@ -680,6 +701,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object VC_SCSCode: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -694,6 +716,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object cxGridDBColumn2: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -701,6 +724,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column5: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -708,6 +732,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object cxGridDBColumn4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -715,6 +740,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object cxGridDBColumn5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -722,18 +748,21 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object TV2Column6: TcxGridDBColumn Caption = #23433#25490#26579#33394#25968#37327 DataBinding.FieldName = 'CGQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 99 end object TV2Column7: TcxGridDBColumn Caption = #23454#38469#26579#33394#25968#37327 DataBinding.FieldName = 'SCGQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 99 end object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -743,6 +772,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1OrderUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -757,6 +787,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1PRTPrice: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -767,6 +798,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object cxGridDBColumn9: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'Amount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -775,6 +807,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList object v1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'SNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -782,36 +815,42 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList 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 object TV2Column8: TcxGridDBColumn Caption = #35746#21333#25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 86 end diff --git a/B04采购计划管理/U_ClothRSPlanList.pas b/B04采购计划管理/U_ClothRSPlanList.pas index 7877a21..ddb643a 100644 --- a/B04采购计划管理/U_ClothRSPlanList.pas +++ b/B04采购计划管理/U_ClothRSPlanList.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 TfrmClothRSPlanList = class(TfrmBaseList) diff --git a/B04采购计划管理/U_ClothRSPlanPut.dfm b/B04采购计划管理/U_ClothRSPlanPut.dfm index 6b92663..af595dd 100644 --- a/B04采购计划管理/U_ClothRSPlanPut.dfm +++ b/B04采购计划管理/U_ClothRSPlanPut.dfm @@ -834,6 +834,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut TabOrder = 3 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -893,6 +894,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut Tag = 9 Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -902,6 +904,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object cxGridDBColumn14: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'SerialNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter SortIndex = 0 SortOrder = soAscending @@ -911,6 +914,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object TV1Column8: TcxGridDBColumn Caption = #36873#21495 DataBinding.FieldName = 'XH' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -924,12 +928,14 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object TV1Column9: TcxGridDBColumn Caption = #33457#33394#21495 DataBinding.FieldName = 'HSNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 60 end object cxGridDBColumn15: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -944,42 +950,49 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut 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 TV1Column11: TcxGridDBColumn Caption = #23454#38469#26579#33394#25968#37327 DataBinding.FieldName = 'SCGQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 104 end object TV1Column7: TcxGridDBColumn Caption = #23433#25490#26579#33394#25968#37327 DataBinding.FieldName = 'CGQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object cxGridDBColumn20: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -989,6 +1002,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object cxGridDBColumn21: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -1002,6 +1016,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object cxGridDBColumn22: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -1012,6 +1027,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object cxGridDBColumn23: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'Amount' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 84 @@ -1019,35 +1035,41 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut 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 PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged 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 PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -1056,6 +1078,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut object TV1Column6: TcxGridDBColumn Caption = #24320#21305#21333#20301 DataBinding.FieldName = 'KPUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -1068,6 +1091,7 @@ inherited frmClothRSPlanPut: TfrmClothRSPlanPut end object TV1Column10: TcxGridDBColumn DataBinding.FieldName = 'MainID' + DataBinding.IsNullValueType = True Visible = False end end diff --git a/B04采购计划管理/U_ClothRSPlanPut.pas b/B04采购计划管理/U_ClothRSPlanPut.pas index d3e2fe4..60d4e21 100644 --- a/B04采购计划管理/U_ClothRSPlanPut.pas +++ b/B04采购计划管理/U_ClothRSPlanPut.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 TfrmClothRSPlanPut = class(TfrmBaseInput) diff --git a/T00贸易通用窗体/U_TradePlanSel.dfm b/T00贸易通用窗体/U_TradePlanSel.dfm index f979e63..cbfdebd 100644 --- a/T00贸易通用窗体/U_TradePlanSel.dfm +++ b/T00贸易通用窗体/U_TradePlanSel.dfm @@ -276,11 +276,11 @@ inherited frmTradePlanSel: TfrmTradePlanSel Height = 546 Align = alClient TabOrder = 2 - ExplicitLeft = -1 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] @@ -296,6 +296,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'Ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -304,11 +305,13 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column8: TcxGridDBColumn Caption = #32463#33829#21333#20301 DataBinding.FieldName = 'OurCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column11: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -316,6 +319,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -324,6 +328,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1ConNo: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -332,6 +337,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1DeliveryDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -342,6 +348,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column4: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -349,23 +356,27 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column5: TcxGridDBColumn Caption = #24037#33402 DataBinding.FieldName = 'Technics' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column6: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 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 @@ -374,6 +385,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1MPRTCodeName: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -382,6 +394,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1MPRTSpec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -390,6 +403,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column1: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -397,6 +411,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1MPRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -405,6 +420,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1MPRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -413,6 +429,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1PRTColor: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -421,6 +438,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -429,6 +447,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column6: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -437,12 +456,14 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column4: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 87 end object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -451,6 +472,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column5: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -459,6 +481,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object v1Column3: TcxGridDBColumn Caption = #20844#26020#25968 DataBinding.FieldName = 'PRTOrderKgQty' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -467,6 +490,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column3: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -474,6 +498,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel object Tv1Column7: TcxGridDBColumn Caption = #24050#20837#24211#21305#25968 DataBinding.FieldName = 'IOPS' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 85 end diff --git a/T00贸易通用窗体/U_TradePlanSel.pas b/T00贸易通用窗体/U_TradePlanSel.pas index b54bbac..85df7d5 100644 --- a/T00贸易通用窗体/U_TradePlanSel.pas +++ b/T00贸易通用窗体/U_TradePlanSel.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 TfrmTradePlanSel = class(TfrmBaseHelp) @@ -148,7 +148,7 @@ begin sql.Add('select A.*,IOPS=ISNULL((select SUM(X.Piece) PS from Bs_Cloth_IO X'); sql.Add('where X.FromSubId=A.SubID and X.STKName=''ó״첼'' and IOFlag=''''), 0)'); sql.Add('from V_Trade_Plan_Fty A'); - sql.add('where Status=''9'' '); + sql.add('where Status in (''9'',''11'') '); // ShowMessage(sql.Text); Open; end; diff --git a/T01贸易生产计划/TradePlan.dpr b/T01贸易生产计划/TradePlan.dpr index 27dba09..e7f5ba9 100644 --- a/T01贸易生产计划/TradePlan.dpr +++ b/T01贸易生产计划/TradePlan.dpr @@ -23,7 +23,7 @@ uses U_ClothInfoSel in '..\A00ͨô\U_ClothInfoSel.pas' {frmClothInfoSel}, U_CompanySel in '..\A00ͨô\U_CompanySel.pas' {frmCompanySel}, U_EmployeeSel in '..\A00ͨô\U_EmployeeSel.pas' {frmEmployeeSel}, - U_TradePlanMulFtyList in 'U_TradePlanMulFtyList.pas' {frmTradePlanMulFtyList}, + U_PlanTecList in 'U_PlanTecList.pas' {frmPlanTecList}, U_TradeInspSet in 'U_TradeInspSet.pas' {frmTradeInspSet}, U_TradePlanSel in '..\T00óͨô\U_TradePlanSel.pas' {frmTradePlanSel}, U_TradeSalesContractSel in '..\T00óͨô\U_TradeSalesContractSel.pas' {frmTradeSalesContractSel}, diff --git a/T01贸易生产计划/TradePlan.dproj b/T01贸易生产计划/TradePlan.dproj index 3fa1155..6d28021 100644 --- a/T01贸易生产计划/TradePlan.dproj +++ b/T01贸易生产计划/TradePlan.dproj @@ -173,8 +173,8 @@
frmEmployeeSel
dfm - -
frmTradePlanMulFtyList
+ +
frmPlanTecList
dfm diff --git a/T01贸易生产计划/TradePlan.dproj.local b/T01贸易生产计划/TradePlan.dproj.local index 413a647..fcddac6 100644 --- a/T01贸易生产计划/TradePlan.dproj.local +++ b/T01贸易生产计划/TradePlan.dproj.local @@ -1,47 +1,49 @@  - 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm - 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas + 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas + 1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.983,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.672,D:\Dp10Repo\public10\design\U_BaseDataLink.pas= 1899-12-30 00:00:00.000.833,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.pas - 1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj + 1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899-12-30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm + 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas 1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas - 1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm 1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas @@ -94,6 +96,8 @@ + + @@ -103,8 +107,6 @@ - - @@ -120,11 +122,11 @@ - - + + diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache index a419d34..3ba719e 100644 Binary files a/T01贸易生产计划/TradePlan.identcache and b/T01贸易生产计划/TradePlan.identcache differ diff --git a/T01贸易生产计划/U_GetDllForm.pas b/T01贸易生产计划/U_GetDllForm.pas index 2c57a64..e6d1f29 100644 --- a/T01贸易生产计划/U_GetDllForm.pas +++ b/T01贸易生产计划/U_GetDllForm.pas @@ -15,7 +15,8 @@ function GetsysParam(muserId: pchar; fparam1: pchar): Boolean; implementation uses - U_DataLink, U_iniParam, U_TradePlanList, U_TradePlanMulFtyList,U_TradePlanSchedule; + U_DataLink, U_iniParam, U_TradePlanList, U_TradePlanMulFtyList, + U_TradePlanSchedule, U_PlanTecList; ///////////////////////////////////////////////////////////////// // ˵:ȡDllеô // @@ -75,7 +76,7 @@ begin pswd := 'rightsoft@5740'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; -// Parameters1 := '¼'; + Parameters1 := 'ѯ'; // DName:='ADMIN'; end else @@ -149,6 +150,19 @@ begin end; end; + 131: //ձע ѯ + begin + with TfrmPlanTecList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + begin + fFormID := FormID; + FormStyle := mstyle; + WindowState := mstate; + BorderStyle := mborderstyle; + mnewHandle := Handle; + end; + end; + + 211: //Ȳѯ begin with TfrmTradePlanSchedule.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // diff --git a/T01贸易生产计划/U_PlanTecList.dfm b/T01贸易生产计划/U_PlanTecList.dfm new file mode 100644 index 0000000..2b26b71 --- /dev/null +++ b/T01贸易生产计划/U_PlanTecList.dfm @@ -0,0 +1,1024 @@ +inherited frmPlanTecList: TfrmPlanTecList + Left = 165 + Top = 13 + Caption = #24037#33402#22791#27880#26597#35810 + ClientHeight = 760 + ClientWidth = 1540 + FormStyle = fsMDIChild + Position = poScreenCenter + Visible = True + ExplicitLeft = -1 + ExplicitWidth = 1556 + ExplicitHeight = 799 + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1540 + Height = 76 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 103 + Caption = 'ToolBar1' + Color = clBtnFace + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + Images = DataLink_TradePlan.ImageList_new32 + List = True + ParentColor = False + ParentFont = False + ShowCaptions = True + TabOrder = 0 + object TBRafresh: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21047#26032 + ImageIndex = 1 + OnClick = TBRafreshClick + end + object TBAdd: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #26032#22686 + ImageIndex = 9 + Visible = False + OnClick = TBAddClick + end + object btnCopy: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #22797#21046 + ImageIndex = 13 + Visible = False + OnClick = btnCopyClick + end + object TBEdit: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + Visible = False + OnClick = TBEditClick + end + object TBDel: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + Visible = False + OnClick = TBDelClick + end + object ToolButton1: TToolButton + Left = 355 + Top = 0 + AutoSize = True + Caption = #25171#21367#35774#32622 + ImageIndex = 3 + Visible = False + OnClick = ToolButton1Click + end + object TBPrint: TToolButton + Left = 450 + Top = 0 + AutoSize = True + Caption = #25171#21360 + ImageIndex = 21 + Visible = False + OnClick = TBPrintClick + end + object TBCK: TToolButton + Left = 521 + Top = 0 + AutoSize = True + Caption = #26597#30475 + ImageIndex = 8 + Visible = False + OnClick = TBCKClick + end + object ToolButton4: TToolButton + Left = 592 + Top = 0 + AutoSize = True + Caption = #38468#20214 + ImageIndex = 22 + Visible = False + OnClick = ToolButton4Click + end + object TBTJ: TToolButton + Left = 663 + Top = 0 + AutoSize = True + Caption = #25552#20132 + ImageIndex = 12 + Wrap = True + Visible = False + OnClick = TBTJClick + end + object TBTJCX: TToolButton + Left = 0 + Top = 38 + AutoSize = True + Caption = #25552#20132#25764#38144 + ImageIndex = 11 + Visible = False + OnClick = TBTJCXClick + end + object Tchk: TToolButton + Left = 95 + Top = 38 + AutoSize = True + Caption = #23457#26680 + ImageIndex = 12 + Visible = False + OnClick = TchkClick + end + object Tnochk: TToolButton + Left = 166 + Top = 38 + AutoSize = True + Caption = #25764#38144#23457#26680 + ImageIndex = 11 + Visible = False + OnClick = TnochkClick + end + object TWC: TToolButton + Left = 261 + Top = 38 + AutoSize = True + Caption = #23436#25104 + ImageIndex = 12 + Visible = False + OnClick = TWCClick + end + object TNowc: TToolButton + Left = 332 + Top = 38 + AutoSize = True + Caption = #25764#38144#23436#25104 + ImageIndex = 11 + Visible = False + OnClick = TNowcClick + end + object ToolButton2: TToolButton + Left = 427 + Top = 38 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton2Click + end + object TBClose: TToolButton + Left = 522 + Top = 38 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + object ToolButton3: TToolButton + Left = 593 + Top = 38 + Hint = 'material/'#21407#26009 + AutoSize = True + Caption = #21407#26009 + ImageIndex = 8 + OnClick = ToolButton3Click + end + object ToolButton5: TToolButton + Left = 664 + Top = 38 + Hint = 'jiXing/'#26426#22411 + AutoSize = True + Caption = #26426#22411 + ImageIndex = 9 + OnClick = ToolButton3Click + end + object ToolButton6: TToolButton + Left = 735 + Top = 38 + Hint = 'cszs/'#23544#25968#38024#25968 + AutoSize = True + Caption = #23544#25968#38024#25968 + ImageIndex = 9 + OnClick = ToolButton3Click + end + object ToolButton7: TToolButton + Left = 830 + Top = 38 + Hint = 'dispose/'#21069#22788#29702 + AutoSize = True + Caption = #21069#22788#29702 + ImageIndex = 9 + OnClick = ToolButton3Click + end + object ToolButton8: TToolButton + Left = 913 + Top = 38 + Hint = 'device/'#26579#33394#35774#22791 + AutoSize = True + Caption = #26579#33394#35774#22791 + ImageIndex = 9 + OnClick = ToolButton3Click + end + object ToolButton9: TToolButton + Left = 1008 + Top = 38 + Hint = 'process/'#21518#21152#24037#24037#24207 + AutoSize = True + Caption = #21518#21152#24037#24037#24207 + ImageIndex = 9 + OnClick = ToolButton3Click + end + end + object Panel1: TPanel [1] + Left = 0 + Top = 76 + Width = 1540 + Height = 51 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = 16242829 + ParentBackground = False + TabOrder = 1 + ExplicitTop = 38 + object Label3: TLabel + Left = 345 + Top = 20 + Width = 52 + Height = 12 + Caption = #35745#21010#21333#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label12: TLabel + Left = 613 + Top = 119 + Width = 26 + Height = 12 + Caption = #20811#37325 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label1: TLabel + Left = 665 + Top = 20 + Width = 26 + Height = 12 + Caption = #23458#25143 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label2: TLabel + Left = 506 + Top = 20 + Width = 52 + Height = 12 + Caption = #20135#21697#21517#31216 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label4: TLabel + Left = 812 + Top = 20 + Width = 39 + Height = 12 + Caption = #21512#21516#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object BegDate: TDateTimePicker + Left = 128 + Top = 16 + Width = 85 + Height = 20 + Date = 40675.000000000000000000 + Format = 'yyyy-MM-dd' + Time = 0.464742650459811600 + TabOrder = 0 + end + object EndDate: TDateTimePicker + Left = 219 + Top = 16 + Width = 86 + Height = 20 + Date = 40675.000000000000000000 + Format = 'yyyy-MM-dd' + Time = 0.464761099538009100 + TabOrder = 2 + end + object OrderNo: TEdit + Tag = 2 + Left = 403 + Top = 16 + Width = 77 + Height = 20 + TabOrder = 1 + OnKeyPress = OrderNoKeyPress + end + object MPRTKZ: TEdit + Tag = 2 + Left = 654 + Top = 99 + Width = 56 + Height = 20 + TabOrder = 3 + OnChange = OrderNoMChange + end + object ComboBox1: TComboBox + Left = 49 + Top = 16 + Width = 71 + Height = 20 + TabOrder = 4 + Text = #21046#21333#26085#26399 + OnChange = ComboBox1Change + Items.Strings = ( + #21046#21333#26085#26399 + #20132#36135#26085#26399) + end + object CustName: TEdit + Tag = 2 + Left = 697 + Top = 16 + Width = 80 + Height = 20 + TabOrder = 5 + OnKeyPress = OrderNoKeyPress + end + object C_Name: TEdit + Tag = 2 + Left = 561 + Top = 16 + Width = 77 + Height = 20 + TabOrder = 6 + OnKeyPress = OrderNoKeyPress + end + object ConNo: TEdit + Tag = 2 + Left = 857 + Top = 16 + Width = 80 + Height = 20 + TabOrder = 7 + OnKeyPress = OrderNoKeyPress + end + object CheckBox1: TCheckBox + Left = 28 + Top = 18 + Width = 19 + Height = 17 + Checked = True + State = cbChecked + TabOrder = 8 + end + end + object cxGrid1: TcxGrid [2] + Left = 0 + Top = 127 + Width = 1129 + Height = 437 + Align = alClient + PopupMenu = PM_1 + TabOrder = 2 + ExplicitLeft = -6 + ExplicitTop = 109 + ExplicitHeight = 449 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + OnCellDblClick = Tv1CellDblClick + OnFocusedRecordChanged = Tv1FocusedRecordChanged + DataController.DataSource = DataSource1 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + Column = Tv1Column11 + end + item + Kind = skSum + Column = Tv1Column10 + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + OptionsView.IndicatorWidth = 30 + Styles.Content = DataLink_TradePlan.Default + Styles.IncSearch = DataLink_TradePlan.SHuangSe + Styles.Footer = DataLink_TradePlan.Default + Styles.Header = DataLink_TradePlan.Default + Styles.Inactive = DataLink_TradePlan.SHuangSe + Styles.Selection = DataLink_TradePlan.SHuangSe + object v1Column16: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + HeaderAlignmentHorz = taCenter + Width = 38 + end + object v1OrdDate: TcxGridDBColumn + Caption = #21046#21333#26085#26399 + DataBinding.FieldName = 'OrdDate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxDateEditProperties' + Properties.ShowTime = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.Default + Width = 80 + end + object Tv1Column2: TcxGridDBColumn + Caption = #32463#33829#21333#20301 + DataBinding.FieldName = 'OurCoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.FontBlue + Width = 151 + end + object Tv1Column4: TcxGridDBColumn + Caption = #23458#25143 + DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.FoneClMaroon + Width = 88 + end + object v1OrderNo: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.Default + Width = 80 + end + object v1DeliveryDate: TcxGridDBColumn + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxDateEditProperties' + Properties.ShowTime = False + OnCustomDrawCell = v1DeliveryDateCustomDrawCell + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.Default + Width = 80 + end + object Tv1Column3: TcxGridDBColumn + Caption = #32534#21495 + DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + end + object Tv1Column22: TcxGridDBColumn + Caption = #21697#21517 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 89 + end + object Tv1Column12: TcxGridDBColumn + Caption = #21512#21516#21495 + DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 72 + end + object Tv1Column13: TcxGridDBColumn + Caption = #38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 68 + end + object Tv1Column14: TcxGridDBColumn + Caption = #20811#37325 + DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + end + object Tv1Column15: TcxGridDBColumn + Caption = #35268#26684 + DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 72 + end + object Tv1Column16: TcxGridDBColumn + Caption = #25104#20998 + DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + end + object Tv1Column11: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'HZPiQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 54 + end + object Tv1Column10: TcxGridDBColumn + Caption = #25968#37327 + DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object v1Column11: TcxGridDBColumn + Caption = #21333#20301 + DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object Tv1Column6: TcxGridDBColumn + Caption = #21046#21333#20154 + DataBinding.FieldName = 'FILLER' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 72 + end + object Tv1Column1: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + end + object cxGrid1Level1: TcxGridLevel + GridView = Tv1 + end + end + object Panel2: TPanel [3] + Left = 0 + Top = 564 + Width = 1540 + Height = 196 + Align = alBottom + BevelOuter = bvNone + Caption = 'Panel2' + TabOrder = 3 + Visible = False + object cxGrid2: TcxGrid + Left = 0 + Top = 0 + Width = 1540 + Height = 196 + Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + PopupMenu = PopupMenu2 + TabOrder = 0 + Visible = False + ExplicitTop = 6 + object TV2: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DataSource2 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = < + item + Format = '0' + Position = spFooter + end + item + Format = '0' + Position = spFooter + Column = v1PRTOrderQty + end + item + Format = '0' + Position = spFooter + end> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + Column = v1PRTOrderQty + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + Column = VC_PRTPs + end> + DataController.Summary.SummaryGroups = <> + OptionsBehavior.FocusCellOnTab = True + OptionsBehavior.GoToNextCellOnEnter = True + OptionsBehavior.FocusCellOnCycle = True + OptionsCustomize.ColumnFiltering = False + OptionsData.Deleting = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + Styles.IncSearch = DataLink_TradePlan.SHuangSe + Styles.Footer = DataLink_TradePlan.Default + Styles.Header = DataLink_TradePlan.Default + Styles.Inactive = DataLink_TradePlan.SHuangSe + Styles.Selection = DataLink_TradePlan.SHuangSe + object cxGridDBColumn1: TcxGridDBColumn + Tag = 99 + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Sorting = False + Width = 66 + end + object v1PRTColor: TcxGridDBColumn + Caption = #39068#33394 + DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.handBlack + Width = 66 + end + object cxGridDBColumn4: TcxGridDBColumn + Caption = #33394#21495 + DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object v1Column5: TcxGridDBColumn + Caption = #33457#22411 + DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object VC_PRTPs: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object v1PRTOrderQty: TcxGridDBColumn + Caption = #25968#37327 + DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.Default + Width = 66 + end + object v1OrderUnit: TcxGridDBColumn + Caption = #21333#20301 + DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + 'M' + 'Y' + 'Kg') + HeaderAlignmentHorz = taCenter + Options.Editing = False + Styles.Header = DataLink_TradePlan.Default + Width = 66 + end + object cxGridDBColumn7: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object TV2Column1: TcxGridDBColumn + Caption = #27454#21495 + DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + end + object cxGridLevel1: TcxGridLevel + GridView = TV2 + end + end + end + object cxGrid3: TcxGrid [4] + Left = 1129 + Top = 127 + Width = 411 + Height = 437 + Align = alRight + TabOrder = 4 + Visible = False + ExplicitTop = 107 + ExplicitHeight = 449 + object TV3: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_3 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = < + item + Format = '0' + Position = spFooter + end + item + Format = '0' + Position = spFooter + end + item + Format = '0' + Position = spFooter + end> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsBehavior.FocusCellOnTab = True + OptionsBehavior.GoToNextCellOnEnter = True + OptionsBehavior.FocusCellOnCycle = True + OptionsCustomize.ColumnFiltering = False + OptionsData.Deleting = False + OptionsView.GroupByBox = False + Styles.IncSearch = DataLink_TradePlan.SHuangSe + Styles.Header = DataLink_TradePlan.Default + Styles.Inactive = DataLink_TradePlan.SHuangSe + Styles.Selection = DataLink_TradePlan.SHuangSe + object V2Column2: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'SerialNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object cxGridDBColumn2: TcxGridDBColumn + Caption = #24037#33402 + DataBinding.FieldName = 'Technics' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + HeaderAlignmentHorz = taCenter + Width = 79 + end + object V2Column3: TcxGridDBColumn + Caption = #32534#21495 + DataBinding.FieldName = 'FtyNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 82 + end + object V2Column1: TcxGridDBColumn + Caption = #21152#24037#21378 + DataBinding.FieldName = 'FtyName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + HeaderAlignmentHorz = taCenter + Width = 87 + end + object TV2Column5: TcxGridDBColumn + Caption = #36319#21333#21592 + DataBinding.FieldName = 'FollowMan' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + HeaderAlignmentHorz = taCenter + Width = 86 + end + end + object cxGridLevel2: TcxGridLevel + GridView = TV3 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_TradePlan.ADOLink + Left = 257 + Top = 152 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_TradePlan.ADOLink + Left = 121 + Top = 153 + end + object cxgrdpmn1: TcxGridPopupMenu + Grid = cxGrid1 + PopupMenus = <> + Left = 660 + Top = 428 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_TradePlan.ADOLink + Parameters = <> + Left = 568 + Top = 240 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 420 + Top = 216 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 320 + Top = 224 + end + object DataSource1: TDataSource + DataSet = Order_Main + Left = 812 + Top = 440 + end + object Order_Main: TClientDataSet + Aggregates = <> + Params = <> + Left = 724 + Top = 432 + end + object ADOQuerySub: TADOQuery + Connection = DataLink_TradePlan.ADOLink + Parameters = <> + Left = 312 + Top = 600 + end + object DataSource2: TDataSource + DataSet = ORDER_SUB + Left = 408 + Top = 604 + end + object ADOQueryImage: TADOQuery + Connection = DataLink_TradePlan.ADOLink + EnableBCD = False + Parameters = <> + Left = 316 + Top = 283 + end + object DSImage: TDataSource + DataSet = ADOQueryImage + Left = 416 + Top = 288 + end + object IdFTP1: TIdFTP + ConnectTimeout = 0 + NATKeepAlive.UseKeepAlive = False + NATKeepAlive.IdleTimeMS = 0 + NATKeepAlive.IntervalMS = 0 + ProxySettings.ProxyType = fpcmNone + ProxySettings.Port = 0 + ReadTimeout = 0 + Left = 92 + Top = 258 + end + object ORDER_SUB: TClientDataSet + Aggregates = <> + Params = <> + Left = 212 + Top = 608 + end + object PopupMenu2: TPopupMenu + Left = 532 + Top = 636 + object N3: TMenuItem + Caption = #20840#36873 + OnClick = N3Click + end + object N4: TMenuItem + Caption = #20840#24323 + OnClick = N4Click + end + object N2: TMenuItem + Caption = #22797#21046 + OnClick = N2Click + end + end + object cxgrdpmn2: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 660 + Top = 636 + end + object CDS_WXTS: TClientDataSet + Aggregates = <> + Params = <> + Left = 412 + Top = 424 + end + object PM_1: TPopupMenu + Left = 988 + Top = 356 + object N1: TMenuItem + Caption = #22797#21046 + OnClick = N1Click + end + end + object GPM_3: TcxGridPopupMenu + PopupMenus = <> + Left = 860 + Top = 228 + end + object DS_3: TDataSource + DataSet = CDS_3 + Left = 1096 + Top = 404 + end + object CDS_3: TClientDataSet + Aggregates = <> + Params = <> + Left = 1092 + Top = 304 + end +end diff --git a/T01贸易生产计划/U_PlanTecList.pas b/T01贸易生产计划/U_PlanTecList.pas new file mode 100644 index 0000000..6d483d5 --- /dev/null +++ b/T01贸易生产计划/U_PlanTecList.pas @@ -0,0 +1,1173 @@ +unit U_PlanTecList; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, + cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxMemo, + cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit, + StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, + cxCurrencyEdit, cxImage, cxDBEdit, Menus, RM_Common, RM_Class, RM_e_Xls, + RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu, + cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, + IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, + dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, dxSkinWXI, + dxScrollbarAnnotations; + +type + TfrmPlanTecList = class(TfrmBaseList) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TBAdd: TToolButton; + TBEdit: TToolButton; + TBDel: TToolButton; + TBPrint: TToolButton; + TBClose: TToolButton; + Panel1: TPanel; + BegDate: TDateTimePicker; + EndDate: TDateTimePicker; + Tv1: TcxGridDBTableView; + cxGrid1Level1: TcxGridLevel; + cxGrid1: TcxGrid; + cxgrdpmn1: TcxGridPopupMenu; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ADOQueryTemp: TADOQuery; + DataSource1: TDataSource; + Label3: TLabel; + OrderNo: TEdit; + v1OrderNo: TcxGridDBColumn; + v1OrdDate: TcxGridDBColumn; + v1DeliveryDate: TcxGridDBColumn; + Order_Main: TClientDataSet; + TBCK: TToolButton; + Label12: TLabel; + MPRTKZ: TEdit; + btnCopy: TToolButton; + ADOQuerySub: TADOQuery; + DataSource2: TDataSource; + ToolButton4: TToolButton; + Tchk: TToolButton; + Tnochk: TToolButton; + TWC: TToolButton; + TNowc: TToolButton; + Panel2: TPanel; + ADOQueryImage: TADOQuery; + DSImage: TDataSource; + IdFTP1: TIdFTP; + v1Column11: TcxGridDBColumn; + TBTJ: TToolButton; + TBTJCX: TToolButton; + v1Column16: TcxGridDBColumn; + ORDER_SUB: TClientDataSet; + PopupMenu2: TPopupMenu; + N3: TMenuItem; + N4: TMenuItem; + ComboBox1: TComboBox; + Label1: TLabel; + CustName: TEdit; + Tv1Column6: TcxGridDBColumn; + cxgrdpmn2: TcxGridPopupMenu; + cxGrid2: TcxGrid; + TV2: TcxGridDBTableView; + cxGridDBColumn1: TcxGridDBColumn; + v1PRTColor: TcxGridDBColumn; + cxGridDBColumn4: TcxGridDBColumn; + v1Column5: TcxGridDBColumn; + VC_PRTPs: TcxGridDBColumn; + v1PRTOrderQty: TcxGridDBColumn; + v1OrderUnit: TcxGridDBColumn; + cxGridDBColumn7: TcxGridDBColumn; + cxGridLevel1: TcxGridLevel; + Tv1Column2: TcxGridDBColumn; + Tv1Column10: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; + Label2: TLabel; + C_Name: TEdit; + CDS_WXTS: TClientDataSet; + Label4: TLabel; + ConNo: TEdit; + Tv1Column22: TcxGridDBColumn; + CheckBox1: TCheckBox; + ToolButton2: TToolButton; + PM_1: TPopupMenu; + N1: TMenuItem; + N2: TMenuItem; + GPM_3: TcxGridPopupMenu; + DS_3: TDataSource; + CDS_3: TClientDataSet; + Tv1Column3: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; + Tv1Column15: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + ToolButton1: TToolButton; + cxGrid3: TcxGrid; + TV3: TcxGridDBTableView; + V2Column2: TcxGridDBColumn; + cxGridDBColumn2: TcxGridDBColumn; + V2Column3: TcxGridDBColumn; + V2Column1: TcxGridDBColumn; + TV2Column5: TcxGridDBColumn; + cxGridLevel2: TcxGridLevel; + TV2Column1: TcxGridDBColumn; + ToolButton3: TToolButton; + ToolButton5: TToolButton; + ToolButton6: TToolButton; + ToolButton7: TToolButton; + ToolButton8: TToolButton; + ToolButton9: TToolButton; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure FormCreate(Sender: TObject); + procedure TBCloseClick(Sender: TObject); + procedure TBEditClick(Sender: TObject); + procedure TBDelClick(Sender: TObject); + procedure TBPrintClick(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure TBAddClick(Sender: TObject); + procedure OrderNoMChange(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBTPClick(Sender: TObject); + procedure CheckBox1Click(Sender: TObject); + procedure CheckBox2Click(Sender: TObject); + procedure Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); + procedure v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure TBCKClick(Sender: TObject); + procedure btnCopyClick(Sender: TObject); + procedure OrderNoKeyPress(Sender: TObject; var Key: Char); + procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); + procedure ToolButton4Click(Sender: TObject); + procedure cxTabControl1Change(Sender: TObject); + procedure TchkClick(Sender: TObject); + procedure TnochkClick(Sender: TObject); + procedure TWCClick(Sender: TObject); + procedure TNowcClick(Sender: TObject); + procedure TBTJClick(Sender: TObject); + procedure TBTJCXClick(Sender: TObject); + procedure N3Click(Sender: TObject); + procedure N4Click(Sender: TObject); + procedure ComboBox1Change(Sender: TObject); + procedure CustomerNoNameKeyPress(Sender: TObject; var Key: Char); + procedure ToolButton10Click(Sender: TObject); + procedure JGTypeChange(Sender: TObject); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure ToolButton2Click(Sender: TObject); + procedure N1Click(Sender: TObject); + procedure N2Click(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + private + DQdate: TDateTime; + procedure InitGrid(); + procedure InitForm(); + procedure InitFact(); + function DelData(): Boolean; + procedure InitGridFH(); + procedure InitSub(); + procedure SetStatus(); + procedure InitImage(fwbid: string); + + procedure SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string); + { Private declarations } + public + FFInt, FCloth: Integer; + canshu1, canshu2: string; + fFlileFlag: string; + FNOTE: string; + { Public declarations } + end; + +implementation + +uses + U_DataLink, U_TradePlanMulFtyInPut, U_RTFun, U_ZDYHelp, U_LabelPrint, + U_TradeInspSet, U_AttachmentUpload; + + +{$R *.dfm} + +procedure TfrmPlanTecList.InitImage(fwbid: string); +begin + ADOQueryImage.close; + if fwbid = '' then + exit; + with ADOQueryImage do + begin + close; + sql.Clear; + sql.Add('select * from TP_File A'); + sql.Add('where WBID=' + quotedstr(trim(fwbid))); + open; + end; +end; + +procedure TfrmPlanTecList.SetStatus(); +begin + btnCopy.Enabled := false; + tbadd.Enabled := false; + TBEdit.Enabled := False; + TBDel.Enabled := False; + TBTJ.Enabled := False; + TBTJCX.Enabled := False; + tchk.Enabled := false; + tnochk.Enabled := false; + TWC.Enabled := False; + TNowc.Enabled := False; + TBDel.Enabled := False; + +// case cxTabControl1.TabIndex of +// 0: +// begin +// tbadd.Enabled := True; +// TBEdit.Enabled := True; +// TBDel.Enabled := True; +// TBDel.Enabled := True; +// TBTJ.Enabled := True; +// btnCopy.Enabled := True; +// end; +// 1: +// begin +// TBTJCX.Enabled := True; +// btnCopy.Enabled := True; +// TBDel.Enabled := True; +// tchk.Enabled := True; +// +// end; +// 2: +// begin +// TWC.Enabled := True; +// btnCopy.Enabled := True; +// tnochk.Enabled := True; +// end; +// 3: +// begin +// TNowc.Enabled := True; +// btnCopy.Enabled := True; +// end; +// end; + +end; + +procedure TfrmPlanTecList.InitSub(); +begin + ADOQuerySub.Close; + if Order_Main.IsEmpty then + exit; + ADOQuerySub.DisableControls; + with ADOQuerySub do + begin + close; + sql.Clear; + sql.Add('select * '); + sql.Add(' from Trade_Plan_Sub A'); + sql.Add('where mainid =' + quotedstr((Order_Main.fieldbyname('mainID').AsString))); + open; + end; + SCreateCDS(ADOQuerySub, ORDER_SUB); + SInitCDSData(ADOQuerySub, ORDER_SUB); + + ADOQuerySub.EnableControls; + TV2.DataController.Filter.Clear; +end; + +procedure TfrmPlanTecList.InitFact(); +begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + sql.Add(' select * from Trade_Plan_Fty '); + sql.Add(' where MainId=' + quotedstr((Order_Main.fieldbyname('mainID').AsString))); +// ShowMessage(SQL.Text); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_3); + SInitCDSData(ADOQueryTemp, CDS_3); + + TV3.DataController.Filter.Clear; +end; + +procedure TfrmPlanTecList.JGTypeChange(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmPlanTecList.FormDestroy(Sender: TObject); +begin + inherited; +// frmProductOrderList:=nil; +end; + +procedure TfrmPlanTecList.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmPlanTecList.FormCreate(Sender: TObject); +begin + inherited; + cxgrid1.Align := alClient; + DQdate := SGetServerDate(ADOQueryTemp); + +end; + +procedure TfrmPlanTecList.TBCloseClick(Sender: TObject); +begin + + Close; + +end; + +procedure TfrmPlanTecList.InitGrid(); +var + STRwhere, Pwhere: string; +begin + STRwhere := ''; + Pwhere := SGetFilters(Panel1, 1, 2); + + begin + if trim(Pwhere) <> '' then + STRwhere := STRwhere + ' and ' + trim(Pwhere); + end; + +// case cxTabControl1.TabIndex of +// 0: +// begin +// STRwhere := STRwhere + ' and isnull(status,''0'')=''0'' '; +// end; +// 1: +// begin +// STRwhere := STRwhere + ' and isnull(status,''0'')=''1'' '; +// end; +// 2: +// begin +// STRwhere := STRwhere + ' and isnull(status,''0'')=''9'' '; +// end; +// 3: +// begin +// STRwhere := STRwhere + ' and isnull(status,''0'')=''10'' '; +// end; +// end; + + try + ADOQueryMain.DisableControls; + + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + sql.add(' select A.* from V_Trade_Plan_Multiple A'); + + if (ComboBox1.Text = 'Ƶ') and (CheckBox1.Checked = True) then + begin + sql.add(' where A.OrdDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)))); + sql.add(' and A.OrdDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)))); + end; + if (ComboBox1.Text = 'Ƶ') and (CheckBox1.Checked = False) then + begin + sql.add(' where A.OrdDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime - 39999)))); + sql.add(' and A.OrdDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)))); + end; + + if (ComboBox1.Text = '') and (CheckBox1.Checked = True) then + begin + sql.add(' where A.DlyDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)))); + sql.add(' and A.DlyDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)))); + end; + if (ComboBox1.Text = '') and (CheckBox1.Checked = False) then + begin + sql.add(' where A.DlyDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime - 39999)))); + sql.add(' and A.DlyDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)))); + end; + + if canshu1 = '¼' then + begin + sql.add(' and A.Filler= ' + QuotedStr(Trim(DName))); + end; + sql.add(' ' + STRwhere); + + sql.add(' order by filltime desc'); +// ShowMessage(SQL.Text); + Open; + end; + + SCreateCDS(ADOQueryMain, Order_Main); + SInitCDSData(ADOQueryMain, Order_Main); + finally + ADOQueryMain.EnableControls; + TV1.DataController.Filter.Clear; + + end; +end; + +procedure TfrmPlanTecList.SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string); +begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + sql.Add('select distinct A.* from SY_User A inner join SY_Purview B on A.UserID=B.UserID where A.Valid=''Y'' '); + SQL.Add('and isnull(A.wxid,'''')<>'''''); + SQL.Add(' and exists(select 1 from SY_ModuleSub X where X.ModuleID=B.ModuleID and X.ModuleSubID=B.ModuleSubID and X.FormName=''ƻ'' )'); +// showmessage(sql.text); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_WXTS); + SInitCDSData(ADOQueryTemp, CDS_WXTS); + + if CDS_WXTS.IsEmpty then + begin + Application.MessageBox('ûδ΢,ύʧܣ', 'ʾϢ', 0); + Exit; + end; + CDS_WXTS.First; + while not CDS_WXTS.eof do + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('select * from WeixinMessage where 1<>1'); + Open; + Append; + FieldByName('MessageType').Value := 'OrderToAudit'; + FieldByName('MessageName').Value := 'ƻ'; + FieldByName('Title').Value := 'µƻ'; + FieldByName('URL').Value := 'subpages/plan/view?id=' + Trim(MDateId); + FieldByName('OpenId').Value := Trim(CDS_WXTS.FieldByName('wxid').AsString); + FieldByName('Status').Value := '0'; + FieldByName('CreateDate').Value := FormatDateTime('yyyymmdd', SGetServerDateTime(ADOQueryTemp)); + FieldByName('CreateTime').Value := FormatDateTime('HH:mm:ss', SGetServerDateTime(ADOQueryTemp)); + FieldByName('BusinessId').Value := Trim(MDateId); + FieldByName('KeyWord1').Value := Trim(KeyWord1); + FieldByName('KeyWord2').Value := Trim(KeyWord2); + FieldByName('KeyWord3').Value := Trim(KeyWord3); + FieldByName('Remark').Value := 'ɲѯ飡'; + Post; + end; + CDS_WXTS.Next; + end; + + GetHTTP('http://aotang.rightsoft.top/api/message/send/OrderToAudit'); +end; + +procedure TfrmPlanTecList.InitGridFH(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + sql.Add('exec Order_QryList :MainId,:WSql'); + Parameters.ParamByName('WSql').Value := ' and FillTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''' + ' and FillTime<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)) + ''''; + Open; + end; + SCreateCDS(ADOQueryMain, Order_Main); + SInitCDSData(ADOQueryMain, Order_Main); + finally + ADOQueryMain.EnableControls; + end; +end; + +procedure TfrmPlanTecList.InitForm(); +begin + ReadCxGrid('ָʾбFF1', Tv1, 'ָʾ'); + ReadCxGrid('ָʾбFFTv21', Tv2, 'ָʾ'); + BegDate.DateTime := SGetServerDate(ADOQueryTemp) - 180; + EndDate.DateTime := SGetServerDate(ADOQueryTemp); + + SetStatus(); + InitGrid(); +end; + +procedure TfrmPlanTecList.TBEditClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + + try + frmTradePlanMulFtyInPut := TfrmTradePlanMulFtyInPut.Create(Application); + with frmTradePlanMulFtyInPut do + begin + + PState := 1; + FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString); + FOrderNo := Trim(Self.Order_Main.fieldbyname('OrderNo').AsString); + canshu1 := self.canshu1; + if ShowModal = 1 then + begin + + end; + end; + finally + frmTradePlanMulFtyInPut.Free; + end; + +end; + +procedure TfrmPlanTecList.TBDelClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + Exit; + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select * from Trade_Cloth_Inspect where isnull(mainID,'''')<>'''' and mainID=''' + Trim(Order_Main.fieldbyname('mainID').AsString) + ''''); + Open; + end; + if ADOQueryTemp.IsEmpty = False then + begin + Application.MessageBox('Ѽ鲻ɾ!', 'ʾ', 0); + Exit; + end; + + while Order_Main.Locate('SSel', true, []) do + begin + if Trim(Order_Main.fieldbyname('MainId').AsString) <> '' then + begin + DelData() + end; + Order_Main.Delete; + end; +end; + +function TfrmPlanTecList.DelData(): Boolean; +begin + try + Result := false; + ADOQueryCmd.Connection.BeginTrans; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete Trade_Plan_Main where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); + sql.Add('delete Trade_Plan_Sub where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); + sql.Add('delete Trade_Plan_Fty where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); + + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ָʾɾ'))); + sql.Add(',' + quotedstr(trim('ָʾţ' + trim(Order_Main.FieldByName('OrderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + ExecSQL; + end; + + ADOQueryCmd.Connection.CommitTrans; + Result := True; + except + ADOQueryCmd.Connection.RollbackTrans; + Result := False; + Application.MessageBox('ɾ쳣', 'ʾ', 0); + end; +end; + +procedure TfrmPlanTecList.TBPrintClick(Sender: TObject); +var + WSql: string; +begin + if Order_Main.IsEmpty then + Exit; + WSql := QuotedStr(Trim(Order_Main.fieldbyname('MainId').AsString)); + + try + frmLabelPrint := TfrmLabelPrint.Create(Application); + with frmLabelPrint do + begin + FLMType := 'TradePlanPrint'; + FFiltration1 := WSql; + if ShowModal = 1 then + begin +// Self.InitGrid(); + end; + end; + finally + frmLabelPrint.Free; + end; +end; + +procedure TfrmPlanTecList.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmPlanTecList.TBAddClick(Sender: TObject); +begin + try + frmTradePlanMulFtyInPut := TfrmTradePlanMulFtyInPut.Create(Application); + with frmTradePlanMulFtyInPut do + begin + PState := 0; + FMainId := ''; + canshu1 := self.canshu1; + if ShowModal = 1 then + begin + InitGrid(); + end; + end; + finally + frmTradePlanMulFtyInPut.Free; + end; +end; + +procedure TfrmPlanTecList.OrderNoMChange(Sender: TObject); +begin + if ADOQueryMain.Active = False then + Exit; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS(ADOQueryMain, Order_Main); + SInitCDSData(ADOQueryMain, Order_Main); +end; + +procedure TfrmPlanTecList.FormShow(Sender: TObject); +begin + inherited; + canshu1 := self.fParameters1; + fFlileFlag := UserDataFlag + 'HX'; +// cxTabControl1.TabIndex := 0; + InitForm(); +end; + +procedure TfrmPlanTecList.TBTPClick(Sender: TObject); +var + FQty, FQty1, FMxQty, FPQty, FMxQtyS, FPQtyS: string; +begin +end; + +procedure TfrmPlanTecList.CheckBox1Click(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmPlanTecList.CheckBox2Click(Sender: TObject); +begin + TBRafresh.Click; +end; + +procedure TfrmPlanTecList.Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); +var + id, id10: Integer; +begin + {try + if Tv1.GroupedItemCount=0 then + begin + Id:=Tv1.GetColumnByFieldName('DeliveryDate').Index-tv1.GroupedItemCount; + Id10:=Tv1.GetColumnByFieldName('SubStatus').Index-tv1.GroupedItemCount; + if Trim(VarToStr(ARecord.Values[id]))='' then Exit; + if Id<0 then Exit; + if ARecord.Values[id10]='' then exit; + if (ARecord.Values[id]-DQdate)>=4 then Exit; + if ((ARecord.Values[id]-DQdate)>=0) and ((ARecord.Values[id]-DQdate)<4) then + AStyle:=DataLink_.QHuangSe + else + if ARecord.Values[id]-DQdate<0 then + begin + AStyle:=DataLink_OrderManage.FenHongS; + end; + end else + begin + + end; + except + end; } +end; + +procedure TfrmPlanTecList.v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +begin + { Id:=TV1.GetColumnByFieldName('DeliveryDate').Index;//;-TV1.GroupedItemCount; + Id10:=TV1.GetColumnByFieldName('SubStatus').Index; + if Id<0 then Exit; + if AViewInfo.GridRecord.Values[Id10]='' then Exit; + if AViewInfo.GridRecord.Values[Id]-SGetServerDate(ADOQueryTemp)>=4 then Exit; + if ((AViewInfo.GridRecord.Values[id]-SGetServerDate(ADOQueryTemp))>=0) and ((AViewInfo.GridRecord.Values[id]-SGetServerDate(ADOQueryTemp))<4) then + ACanvas.Brush.Color:=clYellow + else + if (AViewInfo.GridRecord.Values[id])-(SGetServerDate(ADOQueryTemp)<0) then + begin + ACanvas.Brush.Color:=clRed; + end; + begin + ACanvas.Brush.Color:=clRed; + end else + if AViewInfo.GridRecord.Values[Id]='Purple' then + begin + ACanvas.Brush.Color:=clPurple; + end else + if AViewInfo.GridRecord.Values[Id]='Olive' then + begin + ACanvas.Brush.Color:=clOlive; + end else + if AViewInfo.GridRecord.Values[Id]='Teal' then + begin + ACanvas.Brush.Color:=clTeal; + end else + if AViewInfo.GridRecord.Values[Id]='Background' then + begin + ACanvas.Brush.Color:=clBackground; + end; } +end; + +procedure TfrmPlanTecList.TBCKClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + + try + frmTradePlanMulFtyInPut := TfrmTradePlanMulFtyInPut.Create(Application); + with frmTradePlanMulFtyInPut do + begin + PState := 1; + FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString); + ToolBar2.Visible := False; + TBSave.Visible := False; + ScrollBox1.Enabled := True; + N2.Visible := False; + if ShowModal = 1 then + begin + + end; + end; + finally + frmTradePlanMulFtyInPut.Free; + end; + +end; + +procedure TfrmPlanTecList.btnCopyClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + + try + frmTradePlanMulFtyInPut := TfrmTradePlanMulFtyInPut.Create(Application); + with frmTradePlanMulFtyInPut do + begin + PState := 1; + CopyInt := 99; + FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString); + canshu1 := self.canshu1; + if ShowModal = 1 then + begin + + end; + end; + finally + frmTradePlanMulFtyInPut.Free; + end; + +end; + +procedure TfrmPlanTecList.OrderNoKeyPress(Sender: TObject; var Key: Char); +begin + + if Key = #13 then + begin + initgrid(); + end; +end; + +procedure TfrmPlanTecList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +begin + Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +end; + +procedure TfrmPlanTecList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); +begin + InitSub(); + InitFact(); +end; + +procedure TfrmPlanTecList.ToolButton4Click(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + try + frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); + with frmAttachmentUpload do + begin + if Trim(canshu1) <> 'ѯ' then + FEditAuthority := True; + fkeyNO := Trim(Self.Order_Main.fieldbyname('MainId').AsString); + fType := 'ָʾ'; + if ShowModal = 1 then + begin + + end; + end; + finally + frmAttachmentUpload.Free; + end; +end; + +procedure TfrmPlanTecList.cxTabControl1Change(Sender: TObject); +begin + SetStatus(); + InitGrid(); +end; + +procedure TfrmPlanTecList.TchkClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; +// if cxTabControl1.TabIndex <> 1 then +// begin +// Application.MessageBox('ֻڴ״̬½˲!', 'ʾ', 0); +// Exit; +// end; + if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then + Exit; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''9'',chker=''' + trim(DName) + ''',Chktime=getdate() '); + sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + + except + application.MessageBox('ƻʧܣ', 'ʾϢ', 0); + end; + TBRafresh.Click; +end; + +procedure TfrmPlanTecList.TnochkClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; +// if cxTabControl1.TabIndex <> 2 then +// begin +// Application.MessageBox('ֻ״̬½˲!', 'ʾ', 0); +// Exit; +// end; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''1'',chker=null,Chktime=null '); + sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + TBRafresh.Click; + except + application.MessageBox('ƻʧܣ', 'ʾϢ', 0); + end; +end; + +procedure TfrmPlanTecList.TWCClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then + Exit; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''10'' '); + sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + + sql.Add('exec P_Ord_Up_SuoLv @DataID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + + application.MessageBox('ƻɳɹ', 'ʾϢ'); + TBRafresh.Click; + except + application.MessageBox('ƻʧܣ', 'ʾϢ', 0); + end; +end; + +procedure TfrmPlanTecList.TNowcClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then + Exit; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''9'' '); + sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + application.MessageBox('ƻɳɹ', 'ʾϢ'); + TBRafresh.Click; + except + application.MessageBox('ƻʧܣ', 'ʾϢ', 0); + end; +end; + +procedure TfrmPlanTecList.TBTJClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; + + if canshu1 <> 'Ȩ' then + begin + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + end; + +// if cxTabControl1.TabIndex <> 0 then +// begin +// Application.MessageBox('ֻڴύ״̬½ύ!', 'ʾ', 0); +// Exit; +// end; + if Application.MessageBox('ȷҪύ', 'ʾ', 32 + 4) <> IDYES then + Exit; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''1'' '); + sql.Add(' where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻύ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + SendMessageQR(trim(Order_Main.FieldByName('mainid').AsString), trim(Order_Main.FieldByName('Filler').AsString), trim(Order_Main.FieldByName('orderNO').AsString), Trim(FormatDateTime('yyyy-MM-dd', Order_Main.FieldByName('OrdDate').asdatetime))); + + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('exec P_MSG_in '); + sql.Add(' @MSG=' + QuotedStr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString) + ' Ҫ'))); + sql.Add(',@FillUserid=' + QuotedStr(trim(DCode))); + sql.Add(',@FillUserName=' + QuotedStr(trim(DName))); + sql.Add(',@FillType=' + QuotedStr(trim('Ҫȷ'))); + sql.Add(',@MegType=' + QuotedStr(trim('ƻύ'))); + execsql; + end; + application.MessageBox('ƻύɹ', 'ʾϢ'); + + except + application.MessageBox('ƻύʧܣ', 'ʾϢ', 0); + end; + TBRafresh.Click; +end; + +procedure TfrmPlanTecList.TBTJCXClick(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; + if canshu1 <> 'Ȩ' then + begin + if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then + begin + Application.MessageBox('ܲ˵!', 'ʾ', 0); + Exit; + end; + end; +// +// if cxTabControl1.TabIndex <> 1 then +// begin +// Application.MessageBox('ֻڴ״̬½ύ!', 'ʾ', 0); +// Exit; +// end; + if Application.MessageBox('ȷҪύ', 'ʾ', 32 + 4) <> IDYES then + Exit; + try + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('update Trade_Plan_Main SET status=''0'' '); + sql.Add(' where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + sql.Add(' and isnull(status,''0'')=''1'' '); + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ƻύ'))); + sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execsql; + end; + application.MessageBox('ƻύɹ', 'ʾϢ'); + TBRafresh.Click; + except + application.MessageBox('ƻύʧܣ', 'ʾϢ', 0); + end; +end; + +procedure TfrmPlanTecList.N1Click(Sender: TObject); +begin + Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +end; + +procedure TfrmPlanTecList.N2Click(Sender: TObject); +begin + Clipboard.SetTextBuf(PChar(Trim(ORDER_SUB.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +end; + +procedure TfrmPlanTecList.N3Click(Sender: TObject); +begin + SelOKNoFiler(Tv1, True); //ȫѡ +end; + +procedure TfrmPlanTecList.N4Click(Sender: TObject); +begin + SelOKNoFiler(Tv1, False); //ȫ +end; + +procedure TfrmPlanTecList.ComboBox1Change(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmPlanTecList.CustomerNoNameKeyPress(Sender: TObject; var Key: Char); +begin + if Key = #13 then + begin + InitGrid(); + end; +end; + +procedure TfrmPlanTecList.ToolButton10Click(Sender: TObject); +begin + WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ'); + WriteCxGrid('ָʾбFFTv21', Tv2, 'ָʾ6'); + application.MessageBox('ɹ', 'ʾϢ', 0); +end; + +procedure TfrmPlanTecList.ToolButton1Click(Sender: TObject); +begin + try + frmTradeInspSet := TfrmTradeInspSet.Create(Application); + with frmTradeInspSet do + begin + + FDataID := Trim(Self.Order_Main.fieldbyname('MainId').AsString); + + if ShowModal = 1 then + begin + + end; + end; + finally + frmTradeInspSet.Free; + end; +end; + +procedure TfrmPlanTecList.ToolButton2Click(Sender: TObject); +begin + WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ'); + WriteCxGrid('ָʾбFFTv21', Tv2, 'ָʾ'); +end; + +procedure TfrmPlanTecList.ToolButton3Click(Sender: TObject); +var + fsj: string; + FWZ: Integer; +begin + fsj := Trim(TButton(Sender).Hint); + FWZ := Pos('/', fsj); + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + flag := Copy(fsj, 1, FWZ - 1); + flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); + if ShowModal = 1 then + begin +// TButton(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + end; + end; + finally + frmZDYHelp.Free; + end; +end; + +end. + diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index 524c2c9..6dcd19c 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -839,8 +839,8 @@ inherited frmTradePlanList: TfrmTradePlanList end end object Panel3: TPanel [6] - Left = 8 - Top = 22 + Left = 71 + Top = 195 Width = 1177 Height = 634 Color = clBtnHighlight @@ -985,8 +985,8 @@ inherited frmTradePlanList: TfrmTradePlanList end object DBNote: TBtnEditC Tag = 2 - Left = 408 - Top = 73 + Left = 415 + Top = 72 Width = 440 Height = 20 Hint = 'DBNote/'#25171#21253#35201#27714 diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index cf3c0d6..ed63de9 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -15,8 +15,8 @@ uses IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, - IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, Vcl.DBCtrls, - dxSkinWXI, dxScrollbarAnnotations; + IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, Vcl.DBCtrls, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradePlanList = class(TfrmBaseList) @@ -309,8 +309,25 @@ begin btnCopy.Enabled := True; end; end; - end; + end + else + begin + case cxTabControl1.TabIndex of + 3: + begin +// ToolButton6.Enabled := True; + TWC.Enabled := True; +// TNowc.Enabled := True; +// btnCopy.Enabled := True; + end; + 4: + begin + TNowc.Enabled := True; +// btnCopy.Enabled := True; + end; + end; + end; end; procedure TfrmTradePlanList.InitSub(); @@ -664,7 +681,7 @@ begin // ShowMessage(sql.Text); Open; end; - if ADOQueryTemp.fieldbyname('S').Value > 0 then + if ADOQueryTemp.fieldbyname('S').Value > 0 then begin Application.MessageBox('첼ļƻ޸!', 'ʾ', 0); Exit; @@ -886,7 +903,7 @@ var fsj, ZYSC: string; FWZ: Integer; begin - fsj := Trim(TEdit(Sender).Hint); + fsj := Trim(Tedit(Sender).Hint); FWZ := Pos('/', fsj); try frmZDYHelpSel := TfrmZDYHelpSel.Create(Application); diff --git a/T01贸易生产计划/U_TradePlanMulFtyInPut.dfm b/T01贸易生产计划/U_TradePlanMulFtyInPut.dfm index c2f306a..645f7af 100644 --- a/T01贸易生产计划/U_TradePlanMulFtyInPut.dfm +++ b/T01贸易生产计划/U_TradePlanMulFtyInPut.dfm @@ -3,14 +3,14 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut Top = 4 Caption = #35745#21010#21333#24405#20837 ClientHeight = 650 - ClientWidth = 1546 + ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -12 Font.Name = #23435#20307 Position = poScreenCenter WindowState = wsMaximized - ExplicitWidth = 1562 + ExplicitWidth = 1556 ExplicitHeight = 689 PixelsPerInch = 96 TextHeight = 12 @@ -44,7 +44,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut Tag = 1 Left = 0 Top = 0 - Width = 1546 + Width = 1540 Height = 38 AutoSize = True ButtonHeight = 38 @@ -92,7 +92,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object ScrollBox1: TScrollBox [3] Left = 0 Top = 38 - Width = 1546 + Width = 1540 Height = 261 Align = alTop BevelInner = bvNone @@ -350,6 +350,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut TabOrder = 4 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DSFact DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -381,12 +382,14 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object V2Column2: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'SerialNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object TV2Column1: TcxGridDBColumn Caption = #24037#33402 DataBinding.FieldName = 'Technics' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -400,6 +403,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object V2Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'FtyNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -407,6 +411,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object V2Column1: TcxGridDBColumn Caption = #21152#24037#21378 DataBinding.FieldName = 'FtyName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -420,6 +425,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object TV2Column5: TcxGridDBColumn Caption = #36319#21333#21592 DataBinding.FieldName = 'FollowMan' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -560,7 +566,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object cxGrid1: TcxGrid [4] Left = 0 Top = 337 - Width = 1546 + Width = 1540 Height = 313 Align = alClient Font.Charset = GB2312_CHARSET @@ -573,6 +579,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -621,6 +628,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut Tag = 99 Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -631,12 +639,14 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object v1Column4: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 102 end object v1PRTColor: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -651,6 +661,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object v1Column5: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 99 @@ -658,12 +669,14 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object VC_PRTPs: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 112 end object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter @@ -673,12 +686,14 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut object Tv1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 105 end object Tv1Column3: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -691,7 +706,7 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut Tag = 1 Left = 0 Top = 299 - Width = 1546 + Width = 1540 Height = 38 AutoSize = True ButtonHeight = 38 @@ -711,7 +726,6 @@ inherited frmTradePlanMulFtyInPut: TfrmTradePlanMulFtyInPut ParentFont = False ShowCaptions = True TabOrder = 3 - ExplicitTop = 293 object btnConSel: TToolButton Left = 0 Top = 0 diff --git a/T01贸易生产计划/U_TradePlanMulFtyInPut.pas b/T01贸易生产计划/U_TradePlanMulFtyInPut.pas index 418b319..aaf082a 100644 --- a/T01贸易生产计划/U_TradePlanMulFtyInPut.pas +++ b/T01贸易生产计划/U_TradePlanMulFtyInPut.pas @@ -15,7 +15,7 @@ uses dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, cxPC, System.ImageList, Vcl.ImgList, U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, - IdFTP, ShellAPI; + IdFTP, ShellAPI, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradePlanMulFtyInPut = class(TfrmBaseInput) diff --git a/T02贸易汇总仓库/U_TradeFinishClothInEdit.dfm b/T02贸易汇总仓库/U_TradeFinishClothInEdit.dfm index aad1154..c2afcd9 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInEdit.dfm +++ b/T02贸易汇总仓库/U_TradeFinishClothInEdit.dfm @@ -24,6 +24,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -55,6 +56,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -62,6 +64,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column2: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -71,6 +74,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column4: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.DropDownRows = 20 @@ -88,6 +92,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1FactoryName: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -103,6 +108,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object Tv1Column1: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -117,6 +123,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object Tv1Column4: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -131,6 +138,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object Tv1Column8: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -143,6 +151,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1SPName: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -156,6 +165,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1SPSpec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -170,29 +180,34 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1SPMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1Column8: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end object Tv1Column7: TcxGridDBColumn Caption = #26579#21378#32568#21495 DataBinding.FieldName = 'FtyPCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 end object Tv1Column12: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object v1Column1: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter VisibleForCustomization = False Width = 92 @@ -200,6 +215,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column9: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 68 @@ -207,6 +223,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v2Column6: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 92 @@ -214,6 +231,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1QtyUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -226,6 +244,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column5: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -240,6 +259,7 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column7: TcxGridDBColumn Caption = #36710#38388 DataBinding.FieldName = 'Workshop' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -251,48 +271,56 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit object v1Column12: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column3: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column5: TcxGridDBColumn Caption = #30721#23610 DataBinding.FieldName = 'Yardstick' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 end object Tv1Column6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object Tv1Column9: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column10: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column11: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas index c96aa85..f8cd77d 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas +++ b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, - System.ImageList, Vcl.ImgList; + System.ImageList, Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradeFinishClothInEdit = class(TfrmBaseInput) diff --git a/T02贸易汇总仓库/U_TradeFinishClothInList.dfm b/T02贸易汇总仓库/U_TradeFinishClothInList.dfm index 447e390..170b272 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInList.dfm +++ b/T02贸易汇总仓库/U_TradeFinishClothInList.dfm @@ -263,6 +263,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -307,6 +308,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -315,6 +317,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -323,6 +326,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'ioTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -333,6 +337,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -345,6 +350,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column11: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 76 end @@ -352,6 +358,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -367,6 +374,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -380,6 +388,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 79 @@ -387,6 +396,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter VisibleForCustomization = False Width = 89 @@ -394,12 +404,14 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column4: TcxGridDBColumn Caption = #26579#21378#32568#21495 DataBinding.FieldName = 'FtyPCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end object v1Column13: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 67 @@ -407,6 +419,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object v1Column11: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -414,6 +427,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column6: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -421,6 +435,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object v1Column15: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 65 @@ -429,6 +444,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 85 @@ -437,6 +453,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -450,6 +467,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -463,6 +481,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object v1Column19: TcxGridDBColumn Caption = #36710#38388 DataBinding.FieldName = 'Workshop' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 @@ -471,12 +490,14 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end object v1Column20: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 63 @@ -484,6 +505,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column3: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -491,6 +513,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column5: TcxGridDBColumn Caption = #30721#23610 DataBinding.FieldName = 'Yardstick' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -498,6 +521,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column1: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -505,12 +529,14 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column2: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object Tv1Column10: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -518,6 +544,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -525,6 +552,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column9: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -532,11 +560,13 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList object Tv1Column12: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column13: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end end diff --git a/T02贸易汇总仓库/U_TradeFinishClothInList.pas b/T02贸易汇总仓库/U_TradeFinishClothInList.pas index a056169..13ddd28 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInList.pas +++ b/T02贸易汇总仓库/U_TradeFinishClothInList.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, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradeFinishClothInList = class(TfrmBaseList) diff --git a/T03贸易布匹检验/TradeInsp.identcache b/T03贸易布匹检验/TradeInsp.identcache index 1a6bf4d..d77bf0d 100644 Binary files a/T03贸易布匹检验/TradeInsp.identcache and b/T03贸易布匹检验/TradeInsp.identcache differ diff --git a/T03贸易布匹检验/testDll.identcache b/T03贸易布匹检验/testDll.identcache index b4d04e6..366c68e 100644 Binary files a/T03贸易布匹检验/testDll.identcache and b/T03贸易布匹检验/testDll.identcache differ diff --git a/T04贸易明细仓库/TradeClothStk.identcache b/T04贸易明细仓库/TradeClothStk.identcache index bf6b483..fb48c02 100644 Binary files a/T04贸易明细仓库/TradeClothStk.identcache and b/T04贸易明细仓库/TradeClothStk.identcache differ diff --git a/T04贸易明细仓库/testDll.identcache b/T04贸易明细仓库/testDll.identcache index 3c2d024..9052b54 100644 Binary files a/T04贸易明细仓库/testDll.identcache and b/T04贸易明细仓库/testDll.identcache differ