From b0ed23a9b9023cdf62aac05a63da29694418d256 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 23 Nov 2024 16:57:33 +0800 Subject: [PATCH] 1123 --- A00通用窗体/U_AttachmentUpload.dfm | 7 +- A00通用窗体/U_AttachmentUpload.pas | 3 +- A00通用窗体/U_CompanySel.dfm | 1 - A09财务通用管理/Financial.identcache | Bin 2696 -> 2696 bytes A09财务通用管理/U_ClaimsableInPut.dfm | 24 +- A09财务通用管理/U_ClaimsableInPut.pas | 82 +- A09财务通用管理/U_ClaimsableList.dfm | 2 - A09财务通用管理/U_ClaimsableList.pas | 41 +- A09财务通用管理/U_GetDllForm.pas | 4 +- A09财务通用管理/U_ReceivableList.dfm | 3 - A09财务通用管理/U_ReceivableList.pas | 39 +- B01基础合同管理/U_BaoguanInPut.dfm | 410 ++++++---- B01基础合同管理/U_BaoguanInPut.pas | 45 +- B01基础合同管理/U_BaoguanList.dfm | 185 ++++- B01基础合同管理/U_BaoguanList.pas | 708 +++++++++++++----- B01基础合同管理/U_GetDllForm.pas | 2 +- B01基础合同管理/U_SalesConInPut.dfm | 1 + B01基础合同管理/U_SalesConInPut.pas | 10 + B01基础合同管理/U_SalesContractList.dfm | 6 +- B01基础合同管理/U_SalesContractList.pas | 58 +- B01基础合同管理/U_ZDYHelp_Img.dfm | 10 + B01基础合同管理/U_ZDYHelp_Img.pas | 30 + B04采购计划管理/U_HJGTradePlanSel.dfm | 2 +- B04采购计划管理/U_HJGTradePlanSel.pas | 4 +- B04采购计划管理/U_PurTradePlanSel.dfm | 5 +- B04采购计划管理/U_PurTradePlanSel.pas | 4 +- B04采购计划管理/U_RSTradePlanSel.dfm | 2 +- B04采购计划管理/U_RSTradePlanSel.pas | 4 +- T00贸易通用窗体/U_TradeSalesContractSel.dfm | 23 + T00贸易通用窗体/U_TradeSalesContractSel.pas | 8 +- T01贸易生产计划/U_GetDllForm.pas | 3 +- T01贸易生产计划/U_TradePlanInPut.pas | 36 +- T01贸易生产计划/U_TradePlanList.dfm | 397 +++++++++- T01贸易生产计划/U_TradePlanList.pas | 228 +++++- .../TradeTotalClothStk.dproj.local | 50 +- T02贸易汇总仓库/U_TradeFinishClothInList.dfm | 17 + T02贸易汇总仓库/U_TradeFinishClothInList.pas | 2 + T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm | 50 +- T02贸易汇总仓库/U_TradeSampleClothInEdit.pas | 4 +- T02贸易汇总仓库/U_TradeSampleClothInList.dfm | 41 + T02贸易汇总仓库/U_TradeSampleClothInList.pas | 5 +- T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm | 68 ++ T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas | 55 +- T02贸易汇总仓库/U_TradeSampleClothOutList.dfm | 89 ++- T02贸易汇总仓库/U_TradeSampleClothOutList.pas | 10 +- T02贸易汇总仓库/U_TradeSampleClothStkList.dfm | 56 ++ T02贸易汇总仓库/U_TradeSampleClothStkList.pas | 9 +- T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm | 56 +- T02贸易汇总仓库/U_TradeSampleClothStkSel.pas | 9 +- T04贸易明细仓库/U_TradeClothInEdit.dfm | 2 - T04贸易明细仓库/U_TradeClothStkListNew.dfm | 2 + T04贸易明细仓库/U_TradeClothStkListNew.pas | 13 + T04贸易明细仓库/U_TradeClothWaitStorage.dfm | 41 +- T04贸易明细仓库/U_TradeClothWaitStorage.pas | 18 +- 54 files changed, 2432 insertions(+), 552 deletions(-) diff --git a/A00通用窗体/U_AttachmentUpload.dfm b/A00通用窗体/U_AttachmentUpload.dfm index 0c3fa4f..d34921c 100644 --- a/A00通用窗体/U_AttachmentUpload.dfm +++ b/A00通用窗体/U_AttachmentUpload.dfm @@ -30,8 +30,6 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload Height = 463 Align = alRight TabOrder = 1 - ExplicitLeft = 686 - ExplicitTop = -1 object FileName: TcxButton Left = 33 Top = 64 @@ -106,6 +104,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> @@ -118,24 +117,28 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload object v1Column1: TcxGridDBColumn Caption = #25991#20214#21517#31216 DataBinding.FieldName = 'FileName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 146 end object v1Column4: TcxGridDBColumn Caption = #25991#20214#20462#25913#26102#38388 DataBinding.FieldName = 'TFdate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 140 end object v1Column2: TcxGridDBColumn Caption = #25805#20316#21592 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 83 end object v1Column3: TcxGridDBColumn Caption = #19978#20256#26102#38388 DataBinding.FieldName = 'FillTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 140 end diff --git a/A00通用窗体/U_AttachmentUpload.pas b/A00通用窗体/U_AttachmentUpload.pas index a4db45f..3f5bd55 100644 --- a/A00通用窗体/U_AttachmentUpload.pas +++ b/A00通用窗体/U_AttachmentUpload.pas @@ -10,7 +10,8 @@ uses cxDataStorage, cxEdit, cxDBData, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, cxLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, - dxDateRanges, IdExplicitTLSClientServerBase, System.ImageList, U_BaseHelp; + dxDateRanges, IdExplicitTLSClientServerBase, System.ImageList, U_BaseHelp, + dxSkinWXI, dxScrollbarAnnotations; type TfrmAttachmentUpload = class(TfrmBaseHelp) diff --git a/A00通用窗体/U_CompanySel.dfm b/A00通用窗体/U_CompanySel.dfm index f137f99..a6b8753 100644 --- a/A00通用窗体/U_CompanySel.dfm +++ b/A00通用窗体/U_CompanySel.dfm @@ -128,7 +128,6 @@ inherited frmCompanySel: TfrmCompanySel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 2 - ExplicitTop = 32 object Label1: TLabel Left = 210 Top = 14 diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index 0c76d84fabcae7e8a9076f53555fe9b5e196e17e..dec118248ea4cd62a3bd9f3234500a6f185b6f8f 100644 GIT binary patch delta 72 zcmV-O0Jr~$6^IoDA^-pYN|TWWJ(Gj1S6B@2o#gu e0VtDQ1Q4^c2N402H3UzS`v_E%JO@9MrU~LS?-&>W delta 55 zcmV-70LcG{6^Io9B9pNNKe3nf1CzuEPqT~!xB`=B2|u%Y2T1{w<^&^?X9pCM6A4t4 N1_3{jLl~2$3F0WI6Egq+ diff --git a/A09财务通用管理/U_ClaimsableInPut.dfm b/A09财务通用管理/U_ClaimsableInPut.dfm index 745c95e..5433735 100644 --- a/A09财务通用管理/U_ClaimsableInPut.dfm +++ b/A09财务通用管理/U_ClaimsableInPut.dfm @@ -79,8 +79,6 @@ object frmClaimsableInPut: TfrmClaimsableInPut Height = 466 Align = alClient TabOrder = 1 - ExplicitLeft = 376 - ExplicitTop = 44 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -219,6 +217,13 @@ object frmClaimsableInPut: TfrmClaimsableInPut Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv1Column12PropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 69 end @@ -254,7 +259,13 @@ object frmClaimsableInPut: TfrmClaimsableInPut Caption = #25187#27454#26041#24335 DataBinding.FieldName = 'SubExpend' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = v1Column4PropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 80 end @@ -270,6 +281,13 @@ object frmClaimsableInPut: TfrmClaimsableInPut Caption = #24065#31181 DataBinding.FieldName = 'Currency' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv1Column13PropertiesButtonClick HeaderAlignmentHorz = taCenter end object Tv1Column7: TcxGridDBColumn diff --git a/A09财务通用管理/U_ClaimsableInPut.pas b/A09财务通用管理/U_ClaimsableInPut.pas index 121e4f3..37bc5e3 100644 --- a/A09财务通用管理/U_ClaimsableInPut.pas +++ b/A09财务通用管理/U_ClaimsableInPut.pas @@ -61,7 +61,11 @@ type procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); - procedure v1Column5PropertiesButtonClick(Sender: TObject; + procedure v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv1Column12PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure v1Column4PropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); + procedure Tv1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private procedure initGrid(); @@ -79,8 +83,8 @@ var implementation uses - U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink, U_ClothInfoSel, - U_TradePlanSel,U_UserSel,U_ZDYHelpFY; + U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink, U_ClothInfoSel, U_TradePlanSel, + U_UserSel, U_ZDYHelpFY; {$R *.dfm} procedure TfrmClaimsableInPut.SaveDate(); @@ -228,10 +232,31 @@ begin tv1.Controller.EditingController.ShowEdit(); end; -procedure TfrmClaimsableInPut.v1Column5PropertiesButtonClick(Sender: TObject; +procedure TfrmClaimsableInPut.v1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := '索赔登记'; + flag := 'SubExpend'; + flagname := '扣款方式'; + if ShowModal = 1 then + begin + Self.CDS_Invoice.Edit; + Self.CDS_Invoice.FieldByName('SubExpend').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + + end; + end; + finally + frmZDYHelp.Free; + end; +end; + +procedure TfrmClaimsableInPut.v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try frmUserSel := TfrmUserSel.Create(Application); with frmUserSel do begin @@ -317,6 +342,49 @@ begin frmClaimsableInPut := nil; end; +procedure TfrmClaimsableInPut.Tv1Column12PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := '索赔登记'; + flag := 'QtyUnit'; + flagname := '单位'; + if ShowModal = 1 then + begin + Self.CDS_Invoice.Edit; + Self.CDS_Invoice.FieldByName('QtyUnit').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + + end; + end; + finally + frmZDYHelp.Free; + end; +end; + +procedure TfrmClaimsableInPut.Tv1Column13PropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := '索赔登记'; + flag := 'Currency'; + flagname := '币种'; + if ShowModal = 1 then + begin + Self.CDS_Invoice.Edit; + Self.CDS_Invoice.FieldByName('Currency').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + + end; + end; + finally + frmZDYHelp.Free; + end; +end; + procedure TfrmClaimsableInPut.Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try @@ -341,10 +409,10 @@ end; procedure TfrmClaimsableInPut.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin - if Self.CDS_Invoice.FieldByName('RegType').ASString='' then + if Self.CDS_Invoice.FieldByName('RegType').ASString = '' then begin - application.MessageBox('先选择类型！', '提示'); - Exit; + application.MessageBox('先选择类型！', '提示'); + Exit; end; try frmCompanySel := TfrmCompanySel.Create(Application); diff --git a/A09财务通用管理/U_ClaimsableList.dfm b/A09财务通用管理/U_ClaimsableList.dfm index 161b689..5705a29 100644 --- a/A09财务通用管理/U_ClaimsableList.dfm +++ b/A09财务通用管理/U_ClaimsableList.dfm @@ -273,8 +273,6 @@ inherited frmClaimsableList: TfrmClaimsableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 - ExplicitLeft = 8 - ExplicitTop = 133 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_ClaimsableList.pas b/A09财务通用管理/U_ClaimsableList.pas index 3dc4c4b..a55dfbb 100644 --- a/A09财务通用管理/U_ClaimsableList.pas +++ b/A09财务通用管理/U_ClaimsableList.pas @@ -126,7 +126,7 @@ implementation uses U_DataLink, U_RTFun, U_ZDYHelp, U_InvoiceInInPut, U_HandPayableInPut, - U_HandPayableImport, U_ClaimsableInPut,U_LabelPrint; + U_HandPayableImport, U_ClaimsableInPut, U_LabelPrint; {$R *.dfm} @@ -136,39 +136,58 @@ begin tnochk.Visible := false; TUPDATE.Visible := false; tbdel.Visible := false; - - if trim(DParameters1) <> 'Ȩ' then + ToolButton7.Visible := false; + ToolButton8.Visible := false; + if trim(DParameters1) <> '' then begin + case cxTabControl1.TabIndex of 0: begin TUPDATE.Visible := true; tbdel.Visible := true; - TCHK.Visible := true; + if trim(DParameters1) = '' then + begin + TCHK.Visible := true; + end; + end; 1: begin - tnochk.Visible := true; + if trim(DParameters1) = '' then + begin + tnochk.Visible := true; + end + else + begin + ToolButton7.Visible := true; + end; end; 2: begin + if trim(DParameters1) = '' then + begin + ToolButton8.Visible := true; + end; + end; end; end else begin + case cxTabControl1.TabIndex of 0: begin - tchk.Visible := true; +// tchk.Visible := true; TUPDATE.Visible := true; tbdel.Visible := true; - TCHK.Visible := true; +// TCHK.Visible := true; end; 1: begin - tnochk.Visible := true; +// tnochk.Visible := true; end; 2: @@ -302,7 +321,7 @@ begin FFID := trim(Self.CDS_Invoice.fieldbyname('FFID').asstring); if Canshu1 = '' then begin - if Trim(CDS_Invoice.fieldbyname('Filler').AsString) <> Trim(DName) then + if Trim(Self.CDS_Invoice.fieldbyname('Filler').AsString) <> Trim(DName) then begin Application.MessageBox('ܲ˵!', 'ʾ', 0); Exit; @@ -402,7 +421,7 @@ begin end; application.MessageBox('˳ɹ', 'ʾ'); // InitGrid(); - CDS_Invoice.delete; +// CDS_Invoice.delete; except application.MessageBox('ʧ', 'ʾ'); end; @@ -633,7 +652,7 @@ begin end; application.MessageBox('˳ɹ', 'ʾ'); // InitGrid(); - CDS_Invoice.delete; +// CDS_Invoice.delete; except application.MessageBox('ʧ', 'ʾ'); end; diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index e7c3701..bd609ba 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -78,7 +78,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 := ''; + DParameters1 := ''; end else begin @@ -223,7 +223,7 @@ begin end; end; - 217: //ֹõǼ + 217: //õǼ begin with TfrmClaimsableList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index b33bc33..a8d51fa 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -6,8 +6,6 @@ inherited frmReceivableList: TfrmReceivableList ClientWidth = 1540 FormStyle = fsMDIChild Visible = True - ExplicitLeft = -398 - ExplicitTop = -20 ExplicitWidth = 1556 ExplicitHeight = 629 PixelsPerInch = 96 @@ -276,7 +274,6 @@ inherited frmReceivableList: TfrmReceivableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 142 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 69272d2..394caab 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -121,6 +121,7 @@ type procedure SetStatus(); public FAuthority: string; + MFFIDS: string; end; implementation @@ -203,6 +204,10 @@ begin ADOQueryMain.EnableControls; TV1.DataController.Filter.Clear; end; + + if MFFIDS <> '' then + CDS_1.Locate('FFID', MFFIDS, []); + MFFIDS:=''; end; procedure TfrmReceivableList.N1Click(Sender: TObject); @@ -470,28 +475,28 @@ begin end; procedure TfrmReceivableList.ToolButton1Click(Sender: TObject); -var - MFFIDS: string; +//var +// MFFIDS: string; begin if CDS_1.IsEmpty then exit; - if not CDS_1.Locate('SSel', True, []) then - begin - application.MessageBox('ѡ', 'ʾ'); - Exit; - end; +// 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; +// with CDS_1 do +// begin +// DisableControls; +// while CDS_1.Locate('SSel', True, []) do +// begin + MFFIDS := CDS_1.fieldbyname('FFID').AsString; +// CDS_1.Delete; +// end; +// EnableControls; +// end; try with ADOQueryCmd do diff --git a/B01基础合同管理/U_BaoguanInPut.dfm b/B01基础合同管理/U_BaoguanInPut.dfm index a843f0c..fb8be2b 100644 --- a/B01基础合同管理/U_BaoguanInPut.dfm +++ b/B01基础合同管理/U_BaoguanInPut.dfm @@ -2,8 +2,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Left = 219 Top = 76 Caption = #25253#20851#24405#20837 - ClientHeight = 695 - ClientWidth = 1517 + ClientHeight = 667 + ClientWidth = 1284 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -12 @@ -11,15 +11,17 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut OldCreateOrder = True Position = poScreenCenter WindowState = wsMaximized - ExplicitWidth = 1533 - ExplicitHeight = 734 + ExplicitLeft = -49 + ExplicitTop = -92 + ExplicitWidth = 1300 + ExplicitHeight = 706 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] Tag = 1 Left = 0 Top = 0 - Width = 1517 + Width = 1284 Height = 38 AutoSize = True ButtonHeight = 38 @@ -60,8 +62,9 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut object ScrollBox1: TScrollBox [1] Left = 0 Top = 38 - Width = 1517 - Height = 315 + Width = 1284 + Height = 339 + HorzScrollBar.Position = 61 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -69,7 +72,7 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Color = clWhite Ctl3D = False Font.Charset = GB2312_CHARSET - Font.Color = clBlue + Font.Color = clBlack Font.Height = -12 Font.Name = #23435#20307 Font.Style = [] @@ -77,21 +80,22 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentCtl3D = False ParentFont = False TabOrder = 1 + ExplicitWidth = 1511 object Label10: TLabel - Left = 925 - Top = 30 + Left = 435 + Top = 95 Width = 66 Height = 12 Caption = #21512' '#21516' '#21495#65306 Font.Charset = GB2312_CHARSET - Font.Color = clBlue + Font.Color = clBackground Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label14: TLabel - Left = 36 + Left = -25 Top = 30 Width = 66 Height = 12 @@ -104,8 +108,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label1: TLabel - Left = 477 - Top = 30 + Left = -25 + Top = 95 Width = 66 Height = 12 Caption = #21457' '#31080' '#21495#65306 @@ -117,8 +121,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label2: TLabel - Left = 701 - Top = 30 + Left = 216 + Top = 95 Width = 65 Height = 12 Caption = #21457#31080#26085#26399#65306 @@ -130,8 +134,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label4: TLabel - Left = 1150 - Top = 30 + Left = 435 + Top = 193 Width = 65 Height = 12 Caption = #24449#20813#24615#36136#65306 @@ -143,11 +147,11 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label3: TLabel - Left = 925 - Top = 70 + Left = 435 + Top = 63 Width = 65 Height = 12 - Caption = #23458#25143#21517#31216#65306 + Caption = #23458#25143#31616#31216#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -156,8 +160,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label5: TLabel - Left = 36 - Top = 68 + Left = 435 + Top = 30 Width = 67 Height = 12 Caption = #31246' '#21495#65306 @@ -169,8 +173,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label6: TLabel - Left = 477 - Top = 70 + Left = 870 + Top = 30 Width = 65 Height = 12 Caption = #28023#20851#32534#30721#65306 @@ -182,8 +186,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label7: TLabel - Left = 1155 - Top = 67 + Left = 641 + Top = 95 Width = 65 Height = 12 Caption = #21512#21516#26085#26399#65306 @@ -195,8 +199,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label8: TLabel - Left = 701 - Top = 70 + Left = 641 + Top = 158 Width = 65 Height = 12 Caption = #33322#21517#33322#27425#65306 @@ -208,8 +212,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label11: TLabel - Left = 36 - Top = 108 + Left = -25 + Top = 158 Width = 66 Height = 12 Caption = #25552' '#21333' '#21495#65306 @@ -221,8 +225,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label15: TLabel - Left = 1150 - Top = 108 + Left = 870 + Top = 63 Width = 65 Height = 12 Caption = #31163#22659#21475#23736#65306 @@ -234,8 +238,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label17: TLabel - Left = 36 - Top = 143 + Left = 216 + Top = 126 Width = 66 Height = 12 Caption = #20986' '#36816' '#28207#65306 @@ -247,8 +251,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label20: TLabel - Left = 1150 - Top = 152 + Left = 870 + Top = 193 Width = 65 Height = 12 Caption = #21253#35013#31181#31867#65306 @@ -260,8 +264,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label21: TLabel - Left = 925 - Top = 190 + Left = 216 + Top = 227 Width = 67 Height = 12 Caption = #36816' '#36153#65306 @@ -273,8 +277,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label22: TLabel - Left = 36 - Top = 188 + Left = -25 + Top = 193 Width = 65 Height = 12 Caption = #36152#26131#26041#24335#65306 @@ -286,8 +290,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label24: TLabel - Left = 1150 - Top = 190 + Left = 1098 + Top = 30 Width = 65 Height = 12 Caption = #30003#25253#26085#26399#65306 @@ -299,8 +303,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label25: TLabel - Left = 701 - Top = 190 + Left = -25 + Top = 227 Width = 65 Height = 12 Caption = #25253#20851#26465#27454#65306 @@ -312,7 +316,7 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label26: TLabel - Left = 1150 + Left = 641 Top = 227 Width = 66 Height = 12 @@ -325,8 +329,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label27: TLabel - Left = 256 - Top = 228 + Left = -25 + Top = 262 Width = 65 Height = 12 Caption = #36135#36816#20195#29702#65306 @@ -338,7 +342,7 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label28: TLabel - Left = 36 + Left = 435 Top = 227 Width = 67 Height = 12 @@ -351,8 +355,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label30: TLabel - Left = 701 - Top = 227 + Left = 650 + Top = 262 Width = 66 Height = 12 Caption = #33337' '#20844' '#21496#65306 @@ -364,8 +368,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label32: TLabel - Left = 701 - Top = 268 + Left = -25 + Top = 63 Width = 65 Height = 12 Caption = #23458#25143#21517#31216#65306 @@ -377,8 +381,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label33: TLabel - Left = 36 - Top = 267 + Left = -26 + Top = 295 Width = 67 Height = 12 Caption = #22791' '#27880#65306 @@ -390,21 +394,21 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label35: TLabel - Left = 1150 - Top = 269 + Left = 1090 + Top = 126 Width = 78 Height = 12 Caption = #26368#32456#30446#30340#22269#65306 Font.Charset = GB2312_CHARSET - Font.Color = clBlue + Font.Color = clBlack Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label12: TLabel - Left = 477 - Top = 108 + Left = 435 + Top = 158 Width = 65 Height = 12 Caption = #24320#33322#26085#26399#65306 @@ -416,8 +420,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label13: TLabel - Left = 701 - Top = 108 + Left = 870 + Top = 158 Width = 65 Height = 12 Caption = #31665#21495#23553#21495#65306 @@ -429,8 +433,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label9: TLabel - Left = 925 - Top = 108 + Left = 1098 + Top = 158 Width = 67 Height = 12 Caption = #36135' '#26588#65306 @@ -442,8 +446,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label16: TLabel - Left = 925 - Top = 148 + Left = 641 + Top = 193 Width = 65 Height = 12 Caption = #36816#36755#26041#24335#65306 @@ -455,8 +459,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label19: TLabel - Left = 701 - Top = 146 + Left = 641 + Top = 126 Width = 66 Height = 12 Caption = #25269' '#36816' '#22269#65306 @@ -468,8 +472,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label18: TLabel - Left = 477 - Top = 146 + Left = 435 + Top = 126 Width = 66 Height = 12 Caption = #36152' '#26131' '#22269#65306 @@ -481,8 +485,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label36: TLabel - Left = 256 - Top = 145 + Left = 869 + Top = 126 Width = 66 Height = 12 Caption = #21040' '#36135' '#28207#65306 @@ -494,8 +498,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut ParentFont = False end object Label23: TLabel - Left = 477 - Top = 190 + Left = 1098 + Top = 193 Width = 65 Height = 12 Caption = #32467#27719#26041#24335#65306 @@ -506,19 +510,58 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Font.Style = [fsBold] ParentFont = False end + object Label29: TLabel + Left = 641 + Top = 63 + Width = 66 + Height = 12 + Caption = #36890' '#30693' '#20154#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label31: TLabel + Left = 216 + Top = 262 + Width = 78 + Height = 12 + Caption = #30446#30340#28207#20195#29702#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label34: TLabel + Left = -25 + Top = 126 + Width = 66 + Height = 12 + Caption = #20986' '#21475' '#22269#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object ConNo: TEdit Tag = 2 - Left = 993 - Top = 27 + Left = 503 + Top = 92 Width = 110 Height = 18 TabOrder = 0 end object CKS: TBtnEditC Tag = 2 - Left = 108 + Left = 47 Top = 26 - Width = 318 + Width = 350 Height = 20 Hint = 'CKS/'#20986#21475#21830 TabOrder = 1 @@ -527,16 +570,16 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object FPNO: TEdit Tag = 2 - Left = 549 - Top = 27 + Left = 47 + Top = 92 Width = 110 Height = 18 TabOrder = 2 end object FPDate: TDateTimePicker Tag = 2 - Left = 772 - Top = 27 + Left = 287 + Top = 91 Width = 110 Height = 20 BevelInner = bvNone @@ -547,8 +590,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object ZMXZ: TBtnEditC Tag = 2 - Left = 1226 - Top = 26 + Left = 503 + Top = 189 Width = 110 Height = 20 Hint = 'ZMXZ/'#24449#20813#24615#36136 @@ -558,16 +601,16 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object PONO: TEdit Tag = 2 - Left = 993 - Top = 68 + Left = 503 + Top = 60 Width = 110 Height = 18 TabOrder = 5 end object HTDate: TDateTimePicker Tag = 2 - Left = 1226 - Top = 66 + Left = 712 + Top = 91 Width = 110 Height = 20 BevelInner = bvNone @@ -578,8 +621,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object HB: TBtnEditC Tag = 2 - Left = 769 - Top = 68 + Left = 712 + Top = 154 Width = 110 Height = 20 Hint = 'HB/'#33322#29677 @@ -589,8 +632,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object LJKA: TBtnEditC Tag = 2 - Left = 1221 - Top = 104 + Left = 932 + Top = 59 Width = 110 Height = 20 Hint = 'LJKA/'#31163#22659#21475#23736 @@ -600,8 +643,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object ChuyunG: TBtnEditC Tag = 2 - Left = 108 - Top = 141 + Left = 287 + Top = 122 Width = 110 Height = 20 Hint = 'ChuYunG/'#20986#36816#28207 @@ -611,8 +654,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object BZType: TBtnEditC Tag = 2 - Left = 1226 - Top = 143 + Left = 932 + Top = 189 Width = 110 Height = 20 Hint = 'BZType/'#21253#35013#31181#31867 @@ -622,9 +665,9 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object MYType: TBtnEditC Tag = 2 - Left = 108 - Top = 185 - Width = 318 + Left = 47 + Top = 189 + Width = 350 Height = 20 Hint = 'MYType/'#36152#26131#26041#24335 TabOrder = 11 @@ -633,8 +676,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object SBDate: TDateTimePicker Tag = 2 - Left = 1226 - Top = 188 + Left = 1174 + Top = 26 Width = 110 Height = 20 BevelInner = bvNone @@ -645,8 +688,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object BGTK: TBtnEditC Tag = 2 - Left = 769 - Top = 188 + Left = 47 + Top = 223 Width = 110 Height = 20 Hint = 'BGTK/'#25253#20851#26465#27454 @@ -656,9 +699,9 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object HYDL: TBtnEditC Tag = 2 - Left = 316 - Top = 225 - Width = 343 + Left = 287 + Top = 258 + Width = 326 Height = 20 Hint = 'HYDL/'#36135#36816#20195#29702 ReadOnly = True @@ -668,9 +711,9 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object CGS: TBtnEditC Tag = 2 - Left = 767 - Top = 225 - Width = 336 + Left = 716 + Top = 258 + Width = 326 Height = 20 Hint = 'CGS/'#33337#20844#21496 TabOrder = 15 @@ -679,19 +722,19 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object CustName: TBtnEditC Tag = 2 - Left = 772 - Top = 265 - Width = 336 + Left = 47 + Top = 59 + Width = 350 Height = 20 Hint = 'CustName/'#23458#25143#21517#31216 TabOrder = 16 - OnBtnUpClick = QiYunBtnUpClick + OnBtnUpClick = CustNameBtnUpClick OnBtnDnClick = CKSBtnDnClick end object ZZMDG: TBtnEditC Tag = 2 - Left = 1226 - Top = 265 + Left = 1174 + Top = 122 Width = 110 Height = 20 Hint = 'ZZMDG/'#26368#32456#30446#30340#22269 @@ -701,16 +744,16 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object DPNo: TEdit Tag = 2 - Left = 109 - Top = 65 + Left = 503 + Top = 27 Width = 317 Height = 18 TabOrder = 18 end object HGCode: TBtnEditC Tag = 2 - Left = 548 - Top = 65 + Left = 932 + Top = 26 Width = 110 Height = 20 Hint = 'HGCode/'#28023#20851#32534#30721 @@ -720,8 +763,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object YunFee: TEdit Tag = 2 - Left = 993 - Top = 188 + Left = 287 + Top = 224 Width = 110 Height = 18 TabOrder = 20 @@ -729,16 +772,16 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object BANo: TEdit Tag = 2 - Left = 1226 - Top = 225 + Left = 712 + Top = 224 Width = 110 Height = 18 TabOrder = 21 end object BaoFee: TEdit Tag = 2 - Left = 108 - Top = 225 + Left = 503 + Top = 224 Width = 110 Height = 18 TabOrder = 22 @@ -746,24 +789,24 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object Note: TEdit Tag = 2 - Left = 109 - Top = 265 - Width = 550 + Left = 47 + Top = 293 + Width = 995 Height = 18 TabOrder = 23 end object TDNo: TEdit Tag = 2 - Left = 108 - Top = 105 - Width = 318 + Left = 47 + Top = 155 + Width = 350 Height = 18 TabOrder = 24 end object KHDate: TDateTimePicker Tag = 2 - Left = 549 - Top = 104 + Left = 503 + Top = 154 Width = 110 Height = 20 BevelInner = bvNone @@ -774,16 +817,16 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object batchNo: TEdit Tag = 2 - Left = 769 - Top = 105 + Left = 932 + Top = 155 Width = 110 Height = 18 TabOrder = 26 end object HG: TBtnEditC Tag = 2 - Left = 993 - Top = 104 + Left = 1174 + Top = 154 Width = 110 Height = 20 Hint = 'HG/'#36135#26588 @@ -793,8 +836,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object YSType: TBtnEditC Tag = 2 - Left = 993 - Top = 144 + Left = 712 + Top = 189 Width = 110 Height = 20 Hint = 'YSType/'#36816#36755#26041#24335 @@ -804,8 +847,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object DYG: TBtnEditC Tag = 2 - Left = 769 - Top = 144 + Left = 712 + Top = 122 Width = 110 Height = 20 Hint = 'DYG/'#25269#36816#22269 @@ -815,8 +858,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object MYG: TBtnEditC Tag = 2 - Left = 549 - Top = 144 + Left = 503 + Top = 122 Width = 110 Height = 20 Hint = 'MYG/'#36152#26131#22269 @@ -826,8 +869,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object DaohuoG: TBtnEditC Tag = 2 - Left = 315 - Top = 141 + Left = 932 + Top = 122 Width = 110 Height = 20 Hint = 'DaohuoG/'#21040#36135#28207 @@ -837,8 +880,8 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut end object JHType: TBtnEditC Tag = 2 - Left = 549 - Top = 188 + Left = 1174 + Top = 189 Width = 110 Height = 20 Hint = 'JHType/'#32467#27719#26041#24335 @@ -846,20 +889,56 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut OnBtnUpClick = QiYunBtnUpClick OnBtnDnClick = CKSBtnDnClick end + object notifier: TBtnEditC + Tag = 2 + Left = 712 + Top = 59 + Width = 110 + Height = 20 + Hint = 'notifier/'#36890#30693#20154 + TabOrder = 33 + OnBtnUpClick = QiYunBtnUpClick + OnBtnDnClick = CKSBtnDnClick + end + object MDGDL: TBtnEditC + Tag = 2 + Left = 47 + Top = 258 + Width = 110 + Height = 20 + Hint = 'MDGDL/'#30446#30340#28207#20195#29702 + TabOrder = 34 + OnBtnUpClick = QiYunBtnUpClick + OnBtnDnClick = CKSBtnDnClick + end + object chukouG: TBtnEditC + Tag = 2 + Left = 47 + Top = 122 + Width = 110 + Height = 20 + Hint = 'chukouG/'#20986#21475#22269 + TabOrder = 35 + OnBtnUpClick = QiYunBtnUpClick + OnBtnDnClick = CKSBtnDnClick + end end object Panel1: TPanel [2] Left = 0 - Top = 353 - Width = 1517 - Height = 342 + Top = 377 + Width = 1284 + Height = 290 Align = alClient Caption = 'Panel1' TabOrder = 2 + ExplicitTop = 353 + ExplicitWidth = 1517 + ExplicitHeight = 342 object ToolBar3: TToolBar Tag = 1 Left = 1 Top = 1 - Width = 1515 + Width = 1282 Height = 38 AutoSize = True ButtonHeight = 38 @@ -900,11 +979,13 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut object cxGrid2: TcxGrid Left = 1 Top = 39 - Width = 1515 - Height = 302 + Width = 1282 + Height = 250 Align = alClient BorderStyle = cxcbsNone TabOrder = 1 + ExplicitWidth = 1515 + ExplicitHeight = 302 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1141,7 +1222,7 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Width = 77 end object TV2Column8: TcxGridDBColumn - Caption = #23610#30721 + Caption = #31435#26041 DataBinding.FieldName = 'Size' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -1181,9 +1262,18 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Caption = #21787#22836 DataBinding.FieldName = 'Shippingmark' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxMemoProperties' + Properties.VisibleLineCount = 5 HeaderAlignmentHorz = taCenter Width = 77 end + object TV2Column17: TcxGridDBColumn + Caption = #30003#25253#35201#32032 + DataBinding.FieldName = 'SBYS' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end object TV2Column13: TcxGridDBColumn Caption = #21512#21516#25968#37327 DataBinding.FieldName = 'ConQty' @@ -1268,12 +1358,12 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut object ADOQueryImage: TADOQuery Connection = DataLink_Contract.ADOLink Parameters = <> - Left = 1048 - Top = 315 + Left = 1096 + Top = 307 end object DS_ImgHX: TDataSource DataSet = Qry_ImgHX - Left = 1268 + Left = 1372 Top = 119 end object Qry_ImgHX: TADOQuery @@ -1347,4 +1437,10 @@ inherited frmBaoguanInPut: TfrmBaoguanInPut Left = 1025 Top = 587 end + object GPM_1: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 976 + Top = 457 + end end diff --git a/B01基础合同管理/U_BaoguanInPut.pas b/B01基础合同管理/U_BaoguanInPut.pas index 2e11a50..960b4c8 100644 --- a/B01基础合同管理/U_BaoguanInPut.pas +++ b/B01基础合同管理/U_BaoguanInPut.pas @@ -145,6 +145,14 @@ type JHType: TBtnEditC; TV2Column15: TcxGridDBColumn; TV2Column16: TcxGridDBColumn; + GPM_1: TcxGridPopupMenu; + Label29: TLabel; + Label31: TLabel; + Label34: TLabel; + notifier: TBtnEditC; + MDGDL: TBtnEditC; + chukouG: TBtnEditC; + TV2Column17: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -173,6 +181,7 @@ type procedure BaoFeeKeyPress(Sender: TObject; var Key: Char); procedure cxGridDBColumn2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure CKSBtnUpClick(Sender: TObject); + procedure CustNameBtnUpClick(Sender: TObject); // procedure PBPriceKeyPress(Sender: TObject; var Key: Char); // procedure Button1Click(Sender: TObject); private @@ -743,8 +752,8 @@ end; function TfrmBaoguanInPut.TestData(): Boolean; begin try - if Trim(ConNo.Text) = '' then - raise Exception.Create('ͬŲΪգ'); +// if Trim(ConNo.Text) = '' then +// raise Exception.Create('ͬŲΪգ'); if Trim(CKS.Text) = '' then raise Exception.Create('̲Ϊգ'); if Trim(FPNo.Text) = '' then @@ -767,8 +776,8 @@ begin raise Exception.Create('ѲΪգ'); if Trim(CustName.Text) = '' then raise Exception.Create('ͻƲΪգ'); - if Trim(ZZMDG.Text) = '' then - raise Exception.Create('ĿĹΪգ'); +// if Trim(ZZMDG.Text) = '' then +// raise Exception.Create('ĿĹΪգ'); if BG_Sub.IsEmpty then raise Exception.Create('ϸΪգ'); @@ -783,8 +792,8 @@ begin raise Exception.Create('ɷֲΪգ'); if BG_Sub.Locate('ZZFF', null, []) then raise Exception.Create('֯췽Ϊգ'); - if BG_Sub.Locate('RZType', '', []) then - raise Exception.Create('ȾʽΪգ'); +// if BG_Sub.Locate('RZType', '', []) then +// raise Exception.Create('ȾʽΪգ'); if BG_Sub.Locate('C_Width', null, []) then raise Exception.Create('ŷΪգ'); @@ -1715,6 +1724,7 @@ begin end; DPNO.Text := ADOQueryTemp.fieldbyname('DPNO').ASString; TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + HGCode.Text := Trim(ClientDataSet1.fieldbyname('Note3').AsString); end; end; finally @@ -1722,6 +1732,29 @@ begin end; end; +procedure TfrmBaoguanInPut.CustNameBtnUpClick(Sender: TObject); +begin + try + frmCompanySel := TfrmCompanySel.Create(Application); + with frmCompanySel do + begin + FCoType := 'ͻ'; +// if Self.FAuthority = '¼' then +// FAuthority := 'ҵ'; + if ShowModal = 1 then + begin + + self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoName').AsString); + self.PoNO.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); + end; + end; + + finally + frmCompanySel.Free; + end; + +end; + procedure TfrmBaoguanInPut.v1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try diff --git a/B01基础合同管理/U_BaoguanList.dfm b/B01基础合同管理/U_BaoguanList.dfm index a618efc..a8e95f2 100644 --- a/B01基础合同管理/U_BaoguanList.dfm +++ b/B01基础合同管理/U_BaoguanList.dfm @@ -15,10 +15,10 @@ inherited frmBaoguanList: TfrmBaoguanList Left = 0 Top = 0 Width = 1525 - Height = 38 + Height = 76 AutoSize = True ButtonHeight = 38 - ButtonWidth = 91 + ButtonWidth = 103 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_Contract.ImageList_new32 @@ -93,15 +93,15 @@ inherited frmBaoguanList: TfrmBaoguanList Left = 497 Top = 0 AutoSize = True - Caption = #25552#20132 + Caption = #36716#27491#24335 ImageIndex = 12 OnClick = btnTijiaoClick end object btnCXTijiao: TToolButton - Left = 568 + Left = 580 Top = 0 AutoSize = True - Caption = #25764#38144#25552#20132 + Caption = #36716#33609#31295 ImageIndex = 11 OnClick = btnCXTijiaoClick end @@ -109,7 +109,7 @@ inherited frmBaoguanList: TfrmBaoguanList Left = 663 Top = 0 AutoSize = True - Caption = #23457#26680 + Caption = #25552#20132 ImageIndex = 12 OnClick = tchkClick end @@ -117,66 +117,97 @@ inherited frmBaoguanList: TfrmBaoguanList Left = 734 Top = 0 AutoSize = True - Caption = #25764#38144#23457#26680 + Caption = #25764#38144#25552#20132 ImageIndex = 11 + Wrap = True OnClick = TnochkClick end + object ToolButton3: TToolButton + Left = 0 + Top = 38 + AutoSize = True + Caption = #30830#35748 + ImageIndex = 12 + OnClick = ToolButton3Click + end + object ToolButton4: TToolButton + Left = 71 + Top = 38 + AutoSize = True + Caption = #25764#38144#30830#35748 + ImageIndex = 11 + OnClick = ToolButton4Click + end object btnWC: TToolButton - Left = 829 - Top = 0 + Left = 166 + Top = 38 AutoSize = True Caption = #23436#25104 ImageIndex = 12 - Visible = False OnClick = btnWCClick end object btnWCCX: TToolButton - Left = 900 - Top = 0 + Left = 237 + Top = 38 AutoSize = True Caption = #25764#38144#23436#25104 ImageIndex = 11 - Visible = False OnClick = btnWCCXClick end object Tqx: TToolButton - Left = 995 - Top = 0 + Left = 332 + Top = 38 AutoSize = True Caption = #21462#28040 ImageIndex = 14 OnClick = TqxClick end object Tnoqx: TToolButton - Left = 1066 - Top = 0 + Left = 403 + Top = 38 AutoSize = True Caption = #25764#38144#21462#28040 ImageIndex = 11 OnClick = TnoqxClick end object ToolButton7: TToolButton - Left = 1161 - Top = 0 + Left = 498 + Top = 38 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton7Click end object TBClose: TToolButton - Left = 1256 - Top = 0 + Left = 593 + Top = 38 AutoSize = True Caption = #20851#38381 ImageIndex = 7 OnClick = TBCloseClick end + object ToolButton5: TToolButton + Left = 664 + Top = 38 + AutoSize = True + Caption = #30830#35748#20214#38468#20214 + ImageIndex = 19 + OnClick = ToolButton5Click + end + object ToolButton6: TToolButton + Left = 771 + Top = 38 + AutoSize = True + Caption = #27491#26412#20214#38468#20214 + ImageIndex = 19 + OnClick = ToolButton6Click + end end object cxGrid1: TcxGrid [1] Left = 0 - Top = 121 + Top = 159 Width = 1525 - Height = 343 + Height = 305 Align = alClient PopupMenu = pm1 TabOrder = 3 @@ -421,6 +452,51 @@ inherited frmBaoguanList: TfrmBaoguanList HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter end + object Tv1Column26: TcxGridDBColumn + Caption = #30830#35748#38468#20214#25968 + DataBinding.FieldName = 'QRFJS' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 81 + end + object Tv1Column27: TcxGridDBColumn + Caption = #27491#26412#38468#20214#25968 + DataBinding.FieldName = 'ZBFJS' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 86 + end + object Tv1Column28: TcxGridDBColumn + Caption = #25552#21333#30830#35748 + DataBinding.FieldName = 'ISTD' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + end + object Tv1Column29: TcxGridDBColumn + Caption = #20135#22320#35777#30830#35748 + DataBinding.FieldName = 'ISCDZ' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 77 + end + object Tv1Column30: TcxGridDBColumn + Caption = #36153#29992#30830#35748 + DataBinding.FieldName = 'ISFY' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + end + object Tv1Column31: TcxGridDBColumn + Caption = #30005#25918#30830#35748 + DataBinding.FieldName = 'ISDF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + end + object Tv1Column32: TcxGridDBColumn + Caption = #20184#27454#30830#35748 + DataBinding.FieldName = 'ISFK' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -428,7 +504,7 @@ inherited frmBaoguanList: TfrmBaoguanList end object Panel1: TPanel [2] Left = 0 - Top = 38 + Top = 76 Width = 1525 Height = 61 Align = alTop @@ -580,7 +656,7 @@ inherited frmBaoguanList: TfrmBaoguanList Height = 20 Date = 40675.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.464761099538009100 + Time = 0.464761099538009200 TabOrder = 1 end object PONO: TEdit @@ -686,7 +762,7 @@ inherited frmBaoguanList: TfrmBaoguanList end object cxTabControl1: TcxTabControl [3] Left = 0 - Top = 99 + Top = 137 Width = 1525 Height = 22 Align = alTop @@ -695,10 +771,12 @@ inherited frmBaoguanList: TfrmBaoguanList Properties.Style = 9 Properties.TabIndex = 0 Properties.Tabs.Strings = ( - #26410#25552#20132 - #24050#25552#20132 - #24050#23457#26680 - #24050#21462#28040 + #33609#31295#20214 + #27491#24335#20214 + #24453#30830#35748 + #24050#30830#35748 + #24050#23436#25104 + #22403#22334#20214 #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 @@ -981,7 +1059,7 @@ inherited frmBaoguanList: TfrmBaoguanList HeaderAlignmentHorz = taCenter end object TV2Column8: TcxGridDBColumn - Caption = #23610#30721 + Caption = #31435#26041 DataBinding.FieldName = 'Size' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -1046,8 +1124,8 @@ inherited frmBaoguanList: TfrmBaoguanList object ADOQueryCmd: TADOQuery Connection = DataLink_Contract.ADOLink Parameters = <> - Left = 329 - Top = 273 + Left = 337 + Top = 241 end object ADOQueryMain: TADOQuery Connection = DataLink_Contract.ADOLink @@ -1121,8 +1199,49 @@ inherited frmBaoguanList: TfrmBaoguanList end object N3: TMenuItem Caption = #22797#21046 + Visible = False OnClick = N3Click end + object N7: TMenuItem + Caption = #25552#21333#30830#35748 + OnClick = N7Click + end + object N8: TMenuItem + Caption = #25764#38144#25552#21333#30830#35748 + OnClick = N8Click + end + object N9: TMenuItem + Caption = #20135#22320#35777#30830#35748 + OnClick = N9Click + end + object N10: TMenuItem + Caption = #25764#38144#20135#22320#35777#30830#35748 + OnClick = N10Click + end + object N11: TMenuItem + Caption = #36153#29992#30830#35748 + OnClick = N11Click + end + object N12: TMenuItem + Caption = #25764#38144#36153#29992#30830#35748 + OnClick = N12Click + end + object N13: TMenuItem + Caption = #30005#25918#30830#35748 + OnClick = N13Click + end + object N14: TMenuItem + Caption = #25764#38144#30005#25918#30830#35748 + OnClick = N14Click + end + object N15: TMenuItem + Caption = #20184#27454#30830#35748 + OnClick = N15Click + end + object N16: TMenuItem + Caption = #25764#38144#20184#27454#30830#35748 + OnClick = N16Click + end end object ADOQueryImage: TADOQuery Connection = DataLink_Contract.ADOLink diff --git a/B01基础合同管理/U_BaoguanList.pas b/B01基础合同管理/U_BaoguanList.pas index 38877e6..e3fe849 100644 --- a/B01基础合同管理/U_BaoguanList.pas +++ b/B01基础合同管理/U_BaoguanList.pas @@ -142,6 +142,27 @@ type TV2Column12: TcxGridDBColumn; TV2Column13: TcxGridDBColumn; TV2Column14: TcxGridDBColumn; + ToolButton3: TToolButton; + ToolButton4: TToolButton; + ToolButton5: TToolButton; + ToolButton6: TToolButton; + Tv1Column26: TcxGridDBColumn; + Tv1Column27: TcxGridDBColumn; + Tv1Column28: TcxGridDBColumn; + Tv1Column29: TcxGridDBColumn; + Tv1Column30: TcxGridDBColumn; + Tv1Column31: TcxGridDBColumn; + Tv1Column32: TcxGridDBColumn; + N7: TMenuItem; + N8: TMenuItem; + N9: TMenuItem; + N10: TMenuItem; + N11: TMenuItem; + N12: TMenuItem; + N13: TMenuItem; + N14: TMenuItem; + N15: TMenuItem; + N16: TMenuItem; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -179,10 +200,25 @@ type procedure N5Click(Sender: TObject); procedure N6Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); + procedure ToolButton6Click(Sender: TObject); + procedure N7Click(Sender: TObject); + procedure N8Click(Sender: TObject); + procedure N9Click(Sender: TObject); + procedure N10Click(Sender: TObject); + procedure N11Click(Sender: TObject); + procedure N12Click(Sender: TObject); + procedure N13Click(Sender: TObject); + procedure N14Click(Sender: TObject); + procedure N15Click(Sender: TObject); + procedure N16Click(Sender: TObject); private fFlileFlag: string; procedure InitGrid(); procedure SetStatus(); + procedure SetYJ(); + procedure SetDQR(); + procedure SetYQR(); procedure InitSub(); procedure InitImage(); @@ -234,6 +270,97 @@ begin end; +procedure TfrmBaoguanList.N10Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set CDZFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N11Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set FYFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N12Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set FYFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N13Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set DFFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N14Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set DFFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N15Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set FKFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N16Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set FKFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + procedure TfrmBaoguanList.N1Click(Sender: TObject); begin SelOKNoFiler(Tv1, True); //ȫѡ @@ -246,7 +373,7 @@ end; procedure TfrmBaoguanList.N3Click(Sender: TObject); begin - Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +// Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; procedure TfrmBaoguanList.N4Click(Sender: TObject); @@ -265,11 +392,51 @@ begin end; +procedure TfrmBaoguanList.N7Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set TDFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); +end; + +procedure TfrmBaoguanList.N8Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set TDFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + +procedure TfrmBaoguanList.N9Click(Sender: TObject); +begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' Update BaoGuan_Main Set CDZFlag='''' where BGMID=''' + Trim(CDS_1.fieldbyname('BGMID').AsString) + ''''); + ExecSQL; + end; + InitGrid(); + +end; + procedure TfrmBaoguanList.SetStatus(); begin TBAdd.Enabled := false; tbedit.Enabled := false; ToolButton2.Enabled := false; + ToolButton3.Enabled := false; //ȷ + ToolButton4.Enabled := false; //ȷ tchk.Enabled := false; tnochk.Enabled := false; Tqx.Enabled := false; @@ -281,38 +448,49 @@ begin btnWCCX.Enabled := False; // ToolButton3.Enabled := false; - if Trim(FAuthority) = '¼' then + if Trim(FAuthority) = 'ҵ' then begin ToolButton2.Enabled := true; - TBAdd.Enabled := true; +// TBAdd.Enabled := true; TBPrint.Enabled := True; + case cxTabControl1.TabIndex of 0: begin - tbedit.Enabled := true; - Tqx.Enabled := True; +// tbedit.Enabled := true; +// Tqx.Enabled := True; btnTijiao.Enabled := True; // ToolButton3.Enabled := True; +// SetDQR(); end; 1: begin tbedit.Enabled := True; btnCXTijiao.Enabled := True; -// ToolButton3.Enabled := True; + tchk.Enabled := True; end; 2: begin // tbedit.Enabled := True; -// btnWC.Enabled := True; tnochk.Enabled := True; + + Toolbutton3.Enabled := True; + SetDQR(); end; -// 3: -// begin -// btnWCCX.Enabled := True; -// end; 3: begin - TNoqx.Enabled := True; + Toolbutton4.Enabled := true; + btnWC.Enabled := true; + SetYQR(); + end; + 4: + begin + btnWCCX.Enabled := true; + end; + + 5: + begin + TNoqx.Enabled := true; end; end; end; @@ -340,22 +518,70 @@ begin begin // tbedit.Enabled := True; tnochk.Enabled := True; -// btnWC.Enabled := True; + + Toolbutton3.Enabled := True; + + SetDQR(); end; // 3: // begin // btnWCCX.Enabled := True; // end; 3: + begin + Toolbutton4.Enabled := true; + btnWC.Enabled := true; + SetYQR(); + end; + 4: + begin + btnWCCX.Enabled := true; + end; + + 5: begin TNoqx.Enabled := true; end; end; end; - if Trim(FAuthority) = 'ѯ' then - begin - TBPrint.Enabled := True; - end; +// if Trim(FAuthority) = 'ѯ' then +// begin +// TBPrint.Enabled := True; +// end; +end; + +procedure TfrmBaoguanList.SetYJ(); +begin + N7.Visible := False; + N8.Visible := False; + N9.Visible := False; + N10.Visible := False; + N11.Visible := False; + N12.Visible := False; + N13.Visible := False; + N14.Visible := False; + N15.Visible := False; + N16.Visible := False; +end; + +procedure TfrmBaoguanList.SetDQR(); +begin + N7.Visible := True; + N8.Visible := True; + N9.Visible := True; + N10.Visible := True; + N11.Visible := True; + N12.Visible := True; + +end; + +procedure TfrmBaoguanList.SetYQR(); +begin + + N13.Visible := True; + N14.Visible := True; + N15.Visible := True; + N16.Visible := True; end; procedure TfrmBaoguanList.FormDestroy(Sender: TObject); @@ -416,9 +642,16 @@ begin Close; sql.Clear; - sql.Add('select *,(Case A.Status when ''0'' then ''δύ'' when ''1'' then ''ύ'''); + sql.Add('select *,QRFJS=ISNULL((select Count(F.WBID) FJS from FJ_File F where F.TFType = ''ȷϼ'' and F.WBID=A.BGMID ),0)'); + sql.Add(',ZBFJS=ISNULL((select Count(F.WBID) FJS from FJ_File F where F.TFType = '''' and F.WBID=A.BGMID ),0)'); + sql.Add(',ISTD=Cast((case when ISNULL(TDFlag,'''')='''' then 0 else 1 end) AS bit)'); + sql.Add(',ISCDZ=Cast((case when ISNULL(CDZFlag,'''')='''' then 0 else 1 end) AS bit)'); + sql.Add(',ISFY=Cast((case when ISNULL(FYFlag,'''')='''' then 0 else 1 end) AS bit)'); + sql.Add(',ISDF=Cast((case when ISNULL(DFFlag,'''')='''' then 0 else 1 end) AS bit)'); + sql.Add(',ISFK=Cast((case when ISNULL(FKFlag,'''')='''' then 0 else 1 end) AS bit)'); + sql.Add(',(Case A.Status when ''0'' then ''δύ'' when ''1'' then ''ύ'''); sql.Add('when ''9'' then '''' when ''10'' then '''' '); - SQL.Add('when ''-1'' then ''ȡ'' end) AS ZT from Baoguan_Main A' ); + SQL.Add('when ''-1'' then ''ȡ'' end) AS ZT from Baoguan_Main A'); sql.Add('where 1=1 ' + (WSql)); sql.Add(' and FPDate>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + ''''); @@ -440,14 +673,18 @@ begin sql.Add(' and isnull(A.status,''0'')=''1'''); end; 2: + begin + sql.Add(' and isnull(A.status,''0'')=''5'''); + end; + 3: begin sql.Add(' and isnull(A.status,''0'')=''9'''); end; -// 3: -// begin -// sql.Add(' and isnull(A.status,''0'')=''10'''); -// end; - 3: + 4: + begin + sql.Add(' and isnull(A.status,''0'')=''10'''); + end; + 5: begin sql.Add(' and isnull(A.status,''0'')=''-1'''); end; @@ -562,6 +799,8 @@ begin FAuthority := self.fParameters1; readCxGrid(trim(Self.Caption) + 'tv1', Tv1, 'ع'); readCxGrid(trim(Self.Caption) + 'tv2', Tv2, 'ع'); + if Trim(FAuthority) = 'ҵ' then + cxTabControl1.TabIndex := 2; SetStatus(); InitGrid(); @@ -639,35 +878,124 @@ begin end; procedure TfrmBaoguanList.ToolButton3Click(Sender: TObject); +var + MBGMIDS: string; begin if CDS_1.IsEmpty then + exit; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); Exit; -// ShowMessage(Trim(CDS_1.fieldbyname('Filler').AsString)); -// ShowMessage(Trim(DName)); -// if Trim(CDS_1.fieldbyname('Filler').AsString) <> Trim(DName) then -// begin -// Application.MessageBox('ܲ˵!', 'ʾ', 0); -// Exit; -// end; - try - frmSalesConInPut := TfrmSalesConInPut.Create(Application); - with frmSalesConInPut do + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do begin - PState := 'ɱԤ'; - FConMId := Trim(Self.CDS_1.fieldbyname('BGMID').AsString); - FAuthority := self.FAuthority; - FGSTT := self.FGSTT; - fFlileFlag := self.fFlileFlag; - panel2.Visible := True; - ToolButton4.Visible := False; - ToolButton5.Visible := False; - if ShowModal = 1 then + if fieldbyname('SSel').AsBoolean then begin - + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; end; + next; end; - finally - frmSalesConInPut.Free; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; + + try + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' exec P_BaoGuan_SetStatus '); + sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); + sql.Add(',@Operation=''ȷ'' '); + Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); + Sql.Add(',@DName=' + quotedstr(Trim(DName))); + + 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('صID' + trim(MBGMIDS)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + application.MessageBox('ȷϳɹ', 'ʾ'); + InitGrid(); + except + application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); + InitGrid(); + end; + +end; + +procedure TfrmBaoguanList.ToolButton4Click(Sender: TObject); +var + MBGMIDS: string; +begin + if CDS_1.IsEmpty then + exit; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; + + try + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add(' exec P_BaoGuan_SetStatus '); + sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); + sql.Add(',@Operation=''ȷ'' '); + Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); + Sql.Add(',@DName=' + quotedstr(Trim(DName))); + + 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('صID' + trim(MBGMIDS)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + open; + end; + + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + application.MessageBox('ȷϳɹ', 'ʾ'); + InitGrid(); + except + application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); + InitGrid(); end; end; @@ -678,33 +1006,33 @@ var begin if CDS_1.IsEmpty then exit; - if CDS_1.FieldByName('ISFJ').AsBoolean=False then + if CDS_1.FieldByName('ISFJ').AsBoolean = False then begin - application.MessageBox('ϴɺͬ', 'ʾ'); - Exit; + application.MessageBox('ϴɺͬ', 'ʾ'); + Exit; end; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; -// with CDS_1 do -// begin -// DisableControls; -// First; -// MConMIDS := ''; -// while not eof do -// begin -// if fieldbyname('SSel').AsBoolean then -// begin -// MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ','; -// end; -// next; -// end; -// MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1); -// EnableControls; -// end; - MBGMIDS := CDS_1.fieldbyname('BGMID').AsString; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; +// MBGMIDS := CDS_1.fieldbyname('BGMID').AsString; try with ADOQueryCmd do begin @@ -752,28 +1080,28 @@ var begin if CDS_1.IsEmpty then exit; - MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; -// with CDS_1 do -// begin -// DisableControls; -// First; -// MConMIDS := ''; -// while not eof do -// begin -// if fieldbyname('SSel').AsBoolean then -// begin -// MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ','; -// end; -// next; -// end; -// MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1); -// EnableControls; -// end; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; try with ADOQueryCmd do @@ -782,7 +1110,7 @@ begin sql.Clear; sql.Add(' exec P_BaoGuan_SetStatus '); sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); - sql.Add(',@Operation='''' '); + sql.Add(',@Operation=''ύ'' '); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); @@ -790,7 +1118,7 @@ begin sql.Add(' ' + quotedstr(trim(DName))); sql.Add(',getdate() '); sql.Add(',' + quotedstr(trim(self.Caption))); - sql.Add(',' + quotedstr(trim('ص'))); + sql.Add(',' + quotedstr(trim('صύ'))); sql.Add(',' + quotedstr(trim('صID' + trim(MBGMIDS)))); sql.Add(',' + quotedstr(trim('ɹ'))); sql.Add(')'); @@ -798,7 +1126,7 @@ begin end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); - application.MessageBox('˳ɹ', 'ʾ'); + application.MessageBox('ύɹ', 'ʾ'); InitGrid(); except application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); @@ -813,28 +1141,28 @@ var begin if CDS_1.IsEmpty then exit; - MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; -// with CDS_1 do -// begin -// DisableControls; -// First; -// MConMIDS := ''; -// while not eof do -// begin -// if fieldbyname('SSel').AsBoolean then -// begin -// MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ','; -// end; -// next; -// end; -// MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1); -// EnableControls; -// end; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; try with ADOQueryCmd do @@ -843,7 +1171,7 @@ begin sql.Clear; sql.Add(' exec P_BaoGuan_SetStatus '); sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); - sql.Add(',@Operation='''' '); + sql.Add(',@Operation=''ύ'' '); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); @@ -851,7 +1179,7 @@ begin sql.Add(' ' + quotedstr(trim(DName))); sql.Add(',getdate() '); sql.Add(',' + quotedstr(trim(self.Caption))); - sql.Add(',' + quotedstr(trim('ص'))); + sql.Add(',' + quotedstr(trim('صύ'))); sql.Add(',' + quotedstr(trim('صID' + trim(MBGMIDS)))); sql.Add(',' + quotedstr(trim('ɹ'))); sql.Add(')'); @@ -860,7 +1188,7 @@ begin if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); - application.MessageBox('˳ɹ', 'ʾ'); + application.MessageBox('ύɹ', 'ʾ'); InitGrid(); except application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); @@ -871,6 +1199,7 @@ end; procedure TfrmBaoguanList.cxTabControl1Change(Sender: TObject); begin + SetYJ(); SetStatus(); TBRafresh.Click; end; @@ -888,28 +1217,28 @@ var begin if CDS_1.IsEmpty then exit; - MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; -// with CDS_1 do -// begin -// DisableControls; -// First; -// MConMIDS := ''; -// while not eof do -// begin -// if fieldbyname('SSel').AsBoolean then -// begin -// MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ','; -// end; -// next; -// end; -// MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1); -// EnableControls; -// end; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; try with ADOQueryCmd do @@ -949,28 +1278,28 @@ var begin if CDS_1.IsEmpty then exit; - MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; -// with CDS_1 do -// begin -// DisableControls; -// First; -// MConMIDS := ''; -// while not eof do -// begin -// if fieldbyname('SSel').AsBoolean then -// begin -// MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ','; -// end; -// next; -// end; -// MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1); -// EnableControls; -// end; +// MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ','; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + with CDS_1 do + begin + DisableControls; + First; + MBGMIDS := ''; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + end; + next; + end; + MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1); + EnableControls; + end; try with ADOQueryCmd do @@ -1012,9 +1341,13 @@ begin frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); with frmAttachmentUpload do begin - FEditAuthority := True; + if self.FAuthority = 'ҵ' then + FEditAuthority := False; + if self.FAuthority = '' then + FEditAuthority := True; + fkeyNO := Trim(Self.CDS_1.fieldbyname('BGMID').AsString); - fType := 'ͬ'; + fType := 'ȷϼ'; if ShowModal = 1 then begin @@ -1025,6 +1358,32 @@ begin end; end; +procedure TfrmBaoguanList.ToolButton6Click(Sender: TObject); +begin + if CDS_1.IsEmpty then + Exit; + try + frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); + with frmAttachmentUpload do + begin + if self.FAuthority = 'ҵ' then + FEditAuthority := False; + if self.FAuthority = '' then + FEditAuthority := True; + + fkeyNO := Trim(Self.CDS_1.fieldbyname('BGMID').AsString); + fType := ''; + if ShowModal = 1 then + begin + + end; + end; + finally + frmAttachmentUpload.Free; + end; + +end; + procedure TfrmBaoguanList.ToolButton7Click(Sender: TObject); begin writeCxGrid(trim(Self.Caption) + 'tv1', Tv1, 'ع'); @@ -1105,7 +1464,7 @@ end; procedure TfrmBaoguanList.btnTijiaoClick(Sender: TObject); var MBGMIDS: string; - i:Integer; + i: Integer; begin if CDS_1.IsEmpty then exit; @@ -1115,7 +1474,6 @@ begin Exit; end; - with CDS_1 do begin DisableControls; @@ -1140,7 +1498,7 @@ begin sql.Clear; sql.Add(' exec P_BaoGuan_SetStatus '); sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); - sql.Add(',@Operation=''ύ'' '); + sql.Add(',@Operation=''ת'' '); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); @@ -1148,7 +1506,7 @@ begin sql.Add(' ' + quotedstr(trim(DName))); sql.Add(',getdate() '); sql.Add(',' + quotedstr(trim(self.Caption))); - sql.Add(',' + quotedstr(trim('صύ'))); + sql.Add(',' + quotedstr(trim('صתʽ'))); sql.Add(',' + quotedstr(trim('صID' + trim(MBGMIDS)))); sql.Add(',' + quotedstr(trim('ɹ'))); sql.Add(')'); @@ -1156,7 +1514,7 @@ begin end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); - application.MessageBox('ύɹ', 'ʾ'); + application.MessageBox('תʽɹ', 'ʾ'); InitGrid(); except application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); @@ -1200,7 +1558,7 @@ begin sql.Clear; sql.Add(' exec P_BaoGuan_SetStatus '); sql.Add(' @BGMIDS=' + QuotedStr(MBGMIDS)); - sql.Add(',@Operation=''ύ'' '); + sql.Add(',@Operation=''תݸ'' '); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); @@ -1208,7 +1566,7 @@ begin sql.Add(' ' + quotedstr(trim(DName))); sql.Add(',getdate() '); sql.Add(',' + quotedstr(trim(self.Caption))); - sql.Add(',' + quotedstr(trim('صύ'))); + sql.Add(',' + quotedstr(trim('صתݸ'))); sql.Add(',' + quotedstr(trim('صID' + trim(MBGMIDS)))); sql.Add(',' + quotedstr(trim('ɹ'))); sql.Add(')'); @@ -1216,7 +1574,7 @@ begin end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); - application.MessageBox('ύɹ', 'ʾ'); + application.MessageBox('תݸɹ', 'ʾ'); InitGrid(); except application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index 5b82cfd..99fe335 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -76,7 +76,7 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // Parameters1 := '¼'; - Parameters1 := ''; + Parameters1 := ''; DName :='admin'; DCode :='006'; end diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm index 426a778..fd47728 100644 --- a/B01基础合同管理/U_SalesConInPut.dfm +++ b/B01基础合同管理/U_SalesConInPut.dfm @@ -11,6 +11,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut OldCreateOrder = True Position = poScreenCenter WindowState = wsMaximized + ExplicitTop = -39 ExplicitWidth = 1533 ExplicitHeight = 734 PixelsPerInch = 96 diff --git a/B01基础合同管理/U_SalesConInPut.pas b/B01基础合同管理/U_SalesConInPut.pas index 8ca20e9..c19f4c9 100644 --- a/B01基础合同管理/U_SalesConInPut.pas +++ b/B01基础合同管理/U_SalesConInPut.pas @@ -875,6 +875,16 @@ begin end; end; + if Trim(FAuthority) = '' then + begin + TV1Column2.Visible := False; + TV1Column2.VisibleForCustomization := False; + TV1Column4.Visible := False; + TV1Column4.VisibleForCustomization := False; + Panel2.Visible:=False; + end; + + end; procedure TfrmSalesConInPut.MiddleNameBtnUpClick(Sender: TObject); diff --git a/B01基础合同管理/U_SalesContractList.dfm b/B01基础合同管理/U_SalesContractList.dfm index 75e44a5..a89620a 100644 --- a/B01基础合同管理/U_SalesContractList.dfm +++ b/B01基础合同管理/U_SalesContractList.dfm @@ -413,7 +413,7 @@ inherited frmSalesContractList: TfrmSalesContractList end object Tv1Column6: TcxGridDBColumn Caption = #27719#29575 - DataBinding.FieldName = 'huilv' + DataBinding.FieldName = 'ExchangeRate' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -421,7 +421,7 @@ inherited frmSalesContractList: TfrmSalesContractList end object Tv1Column25: TcxGridDBColumn Caption = #31867#22411 - DataBinding.FieldName = 'SCMType' + DataBinding.FieldName = 'ConType' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -429,7 +429,7 @@ inherited frmSalesContractList: TfrmSalesContractList end object Tv1Column27: TcxGridDBColumn Caption = #29702#21333 - DataBinding.FieldName = 'lidan' + DataBinding.FieldName = 'Tallyer' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False diff --git a/B01基础合同管理/U_SalesContractList.pas b/B01基础合同管理/U_SalesContractList.pas index 53167b7..e9cef96 100644 --- a/B01基础合同管理/U_SalesContractList.pas +++ b/B01基础合同管理/U_SalesContractList.pas @@ -324,8 +324,12 @@ begin btnWCCX.Enabled := False; ToolButton3.Enabled := false; - if Trim(FAuthority) = '¼' then + if (Trim(FAuthority) = '¼') or (Trim(FAuthority) = '') then begin +// if True then +// begin +// Noqx.Enabled := false; +// end; ToolButton2.Enabled := true; TBAdd.Enabled := true; TBPrint.Enabled := True; @@ -335,7 +339,8 @@ begin tbedit.Enabled := true; Tqx.Enabled := True; btnTijiao.Enabled := True; - ToolButton3.Enabled := True; + if Trim(FAuthority) = '¼' then + ToolButton3.Enabled := True; end; 1: begin @@ -399,6 +404,14 @@ begin begin TBPrint.Enabled := True; end; + + if Trim(FAuthority) = '' then + begin + TV2Column1.Visible := False; + TV2Column1.VisibleForCustomization := False; + TV2Column2.Visible := False; + TV2Column2.VisibleForCustomization := False; + end; end; procedure TfrmSalesContractList.FormDestroy(Sender: TObject); @@ -474,6 +487,11 @@ begin sql.Add(' and ( AA.SalesId=' + quotedstr(trim(DCode)) + ' or AA.Filler =' + quotedstr(trim(DCode)) + ' or B.SalesId =' + quotedstr(trim(DCode)) + ' '); sql.Add('or exists (select * from [dbo].[F_Tool_SplitString](AA.TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))'); end; + if Trim(FAuthority) = '' then + begin + + sql.Add('and AA.TallyId=' + quotedstr(trim(DCode))); + end; case cxTabControl1.TabIndex of 0: @@ -728,10 +746,10 @@ var begin if CDS_1.IsEmpty then exit; - if CDS_1.FieldByName('ISFJ').AsBoolean=False then + if CDS_1.FieldByName('ISFJ').AsBoolean = False then begin - application.MessageBox('ϴɺͬ', 'ʾ'); - Exit; + application.MessageBox('ϴɺͬ', 'ʾ'); + Exit; end; // if not CDS_1.Locate('SSel', True, []) then // begin @@ -1061,7 +1079,7 @@ begin frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); with frmAttachmentUpload do begin - FEditAuthority := True; + FEditAuthority := True; fkeyNO := Trim(Self.CDS_1.fieldbyname('ConMID').AsString); fType := 'ͬ'; if ShowModal = 1 then @@ -1144,17 +1162,17 @@ procedure TfrmSalesContractList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView begin if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('status').Index] = '2' then ACanvas.Brush.Color := clLime; - if cxTabControl1.TabIndex=5 then + if cxTabControl1.TabIndex = 5 then begin - if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('status').Index] = '-1' then - ACanvas.Brush.Color := clBtnShadow; + if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('status').Index] = '-1' then + ACanvas.Brush.Color := clBtnShadow; end; end; procedure TfrmSalesContractList.btnTijiaoClick(Sender: TObject); var MConMIDS: string; - i:Integer; + i: Integer; begin if CDS_1.IsEmpty then exit; @@ -1166,22 +1184,22 @@ begin with ADOQuery1 do begin - Close; - sql.Clear; - sql.Add('select Count(ConSid) CS from BS_Contract_Sub'); - sql.add(' where ConMid=' + QuotedStr(TRIM(CDS_1.FieldByName('ConMid').AsString))); - sql.add('and isnull(Estimated,'''')='''''); + Close; + sql.Clear; + sql.Add('select Count(ConSid) CS from BS_Contract_Sub'); + sql.add(' where ConMid=' + QuotedStr(TRIM(CDS_1.FieldByName('ConMid').AsString))); + sql.add('and isnull(Estimated,'''')='''''); // ShowMessage(Sql.text); - open; + open; end; - i :=Strtoint(ADOQuery1.FieldByName('CS').AsString); + i := Strtoint(ADOQuery1.FieldByName('CS').AsString); // ShowMessage(ADOQuery1.FieldByName('CS').AsString); - if i>0 then + if i > 0 then begin - application.MessageBox('Ԥɱۺύ', 'ʾ'); - Exit + application.MessageBox('Ԥɱۺύ', 'ʾ'); + Exit end; // if not CDS_2.Locate('Estimated', True, []) then // begin diff --git a/B01基础合同管理/U_ZDYHelp_Img.dfm b/B01基础合同管理/U_ZDYHelp_Img.dfm index 8bb4ef5..291bf8d 100644 --- a/B01基础合同管理/U_ZDYHelp_Img.dfm +++ b/B01基础合同管理/U_ZDYHelp_Img.dfm @@ -21,6 +21,7 @@ inherited frmZDYHelp_Img: TfrmZDYHelp_Img Height = 476 Align = alClient TabOrder = 0 + ExplicitTop = 79 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -91,6 +92,15 @@ inherited frmZDYHelp_Img: TfrmZDYHelp_Img HeaderAlignmentHorz = taCenter Width = 80 end + object V1HGCode: TcxGridDBColumn + Caption = #28023#20851#32534#30721 + DataBinding.FieldName = 'Note3' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = TV1Column3PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 76 + end object V1note1: TcxGridDBColumn Caption = #33521#25991#21517#31216 DataBinding.FieldName = 'note1' diff --git a/B01基础合同管理/U_ZDYHelp_Img.pas b/B01基础合同管理/U_ZDYHelp_Img.pas index c7ddb5b..5e3c9ee 100644 --- a/B01基础合同管理/U_ZDYHelp_Img.pas +++ b/B01基础合同管理/U_ZDYHelp_Img.pas @@ -49,6 +49,7 @@ type TV1Column2: TcxGridDBColumn; ToolButton2: TToolButton; ToolButton3: TToolButton; + V1HGCode: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); @@ -68,6 +69,7 @@ type procedure FormDestroy(Sender: TObject); procedure ToolButton2Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); + procedure TV1Column3PropertiesEditValueChanged(Sender: TObject); private procedure InitGrid(); { Private declarations } @@ -422,6 +424,34 @@ begin end; end; +procedure TfrmZDYHelp_Img.TV1Column3PropertiesEditValueChanged(Sender: TObject); +var + mvalue: string; + fieldname: string; +begin + fieldname := Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName; + if Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) = '' then + begin + Application.MessageBox('ƲΪ!', 'ʾ', 0); + Exit; + end; + mvalue := TcxTextEdit(Sender).EditingText; + with ClientDataSet1 do + begin + Edit; + FieldByName(fieldname).Value := mvalue; + Post; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('Update KH_Zdy Set ' + fieldname + '=''' + Trim(mvalue) + ''' '); + sql.Add('where ZdyNo=''' + Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) + ''''); + ExecSQL; + end; +end; + procedure TfrmZDYHelp_Img.ZDYNameChange(Sender: TObject); var fsj: string; diff --git a/B04采购计划管理/U_HJGTradePlanSel.dfm b/B04采购计划管理/U_HJGTradePlanSel.dfm index f1ccabd..d687ad6 100644 --- a/B04采购计划管理/U_HJGTradePlanSel.dfm +++ b/B04采购计划管理/U_HJGTradePlanSel.dfm @@ -70,7 +70,6 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - ExplicitTop = 32 object Label3: TLabel Left = 39 Top = 10 @@ -444,6 +443,7 @@ inherited frmHJGTradePlanSel: TfrmHJGTradePlanSel DataBinding.FieldName = 'WPQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Styles.Header = DataLink_PurchasePlan.FontBlue end object v1PRTOrderQty: TcxGridDBColumn Caption = #35746#21333#25968#37327 diff --git a/B04采购计划管理/U_HJGTradePlanSel.pas b/B04采购计划管理/U_HJGTradePlanSel.pas index ce2514f..c5a249a 100644 --- a/B04采购计划管理/U_HJGTradePlanSel.pas +++ b/B04采购计划管理/U_HJGTradePlanSel.pas @@ -212,8 +212,8 @@ begin begin Close; sql.Clear; - sql.Add('select A.* from Trade_Plan_Main A '); - sql.Add('Where MainId=''' + Trim(FMainId) + ''''); + sql.Add('select A.*,BuyConNo=(select Top 1 BuyConNo from Trade_Plan_Sub X where X.MainId=A.MainId) '); + sql.Add(' from Trade_Plan_Main A Where MainId=''' + Trim(FMainId) + ''''); // ShowMessage(sql.Text); Open; end; diff --git a/B04采购计划管理/U_PurTradePlanSel.dfm b/B04采购计划管理/U_PurTradePlanSel.dfm index 1adf5ae..e02ad77 100644 --- a/B04采购计划管理/U_PurTradePlanSel.dfm +++ b/B04采购计划管理/U_PurTradePlanSel.dfm @@ -70,7 +70,6 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - ExplicitTop = 32 object Label3: TLabel Left = 39 Top = 10 @@ -445,6 +444,7 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel DataBinding.FieldName = 'WPQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Styles.Header = cxStyle1 end object v1PRTOrderQty: TcxGridDBColumn Caption = #35746#21333#25968#37327 @@ -4821,12 +4821,13 @@ inherited frmPurTradePlanSel: TfrmPurTradePlanSel Top = 144 PixelsPerInch = 96 object cxStyle1: TcxStyle - AssignedValues = [svFont] + AssignedValues = [svFont, svTextColor] Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] + TextColor = clBlue end end object PopupMenu1: TPopupMenu diff --git a/B04采购计划管理/U_PurTradePlanSel.pas b/B04采购计划管理/U_PurTradePlanSel.pas index 0ee7646..2408447 100644 --- a/B04采购计划管理/U_PurTradePlanSel.pas +++ b/B04采购计划管理/U_PurTradePlanSel.pas @@ -212,8 +212,8 @@ begin begin Close; sql.Clear; - sql.Add('select A.* from Trade_Plan_Main A '); - sql.Add('Where MainId=''' + Trim(FMainId) + ''''); + sql.Add('select A.*,BuyConNo=(select Top 1 BuyConNo from Trade_Plan_Sub X where X.MainId=A.MainId) '); + sql.Add('from Trade_Plan_Main A Where MainId=''' + Trim(FMainId) + ''''); // ShowMessage(sql.Text); Open; end; diff --git a/B04采购计划管理/U_RSTradePlanSel.dfm b/B04采购计划管理/U_RSTradePlanSel.dfm index ca54486..bc69228 100644 --- a/B04采购计划管理/U_RSTradePlanSel.dfm +++ b/B04采购计划管理/U_RSTradePlanSel.dfm @@ -70,7 +70,6 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - ExplicitTop = 44 object Label3: TLabel Left = 39 Top = 10 @@ -437,6 +436,7 @@ inherited frmRSTradePlanSel: TfrmRSTradePlanSel DataBinding.FieldName = 'WPQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Styles.Header = DataLink_PurchasePlan.FontBlue end object v1PRTOrderQty: TcxGridDBColumn Caption = #35746#21333#25968#37327 diff --git a/B04采购计划管理/U_RSTradePlanSel.pas b/B04采购计划管理/U_RSTradePlanSel.pas index 4e2e951..7e488d0 100644 --- a/B04采购计划管理/U_RSTradePlanSel.pas +++ b/B04采购计划管理/U_RSTradePlanSel.pas @@ -211,8 +211,8 @@ begin begin Close; sql.Clear; - sql.Add('select A.* from Trade_Plan_Main A '); - sql.Add('Where MainId=''' + Trim(FMainId) + ''''); + sql.Add('select A.*,BuyConNo=(select Top 1 BuyConNo from Trade_Plan_Sub X where X.MainId=A.MainId) '); + sql.Add('from Trade_Plan_Main A Where MainId=''' + Trim(FMainId) + ''''); // ShowMessage(sql.Text); Open; end; diff --git a/T00贸易通用窗体/U_TradeSalesContractSel.dfm b/T00贸易通用窗体/U_TradeSalesContractSel.dfm index f2a43df..b44223a 100644 --- a/T00贸易通用窗体/U_TradeSalesContractSel.dfm +++ b/T00贸易通用窗体/U_TradeSalesContractSel.dfm @@ -128,8 +128,10 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 75 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -171,6 +173,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object TV1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -179,36 +182,42 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object TV1Column1: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column6: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object TV1Column5: TcxGridDBColumn Caption = #32463#33829#21333#20301 DataBinding.FieldName = 'SellName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column3: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'BuyName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column4: TcxGridDBColumn Caption = #20013#38388#21830 DataBinding.FieldName = 'MiddleName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object v1Column5: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -216,6 +225,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object TV1Column2: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -223,6 +233,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object VC_SCSCode: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -237,6 +248,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -244,6 +256,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn3: TcxGridDBColumn Caption = #20135#21697#33521#25991#21517 DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -258,6 +271,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -265,6 +279,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -272,6 +287,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 57 @@ -279,6 +295,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn7: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 @@ -286,6 +303,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object cxGridDBColumn8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -300,6 +318,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object v1Column6: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -313,6 +332,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object v1Column7: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -326,6 +346,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'ConQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -334,6 +355,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object v1OrderUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'ConUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -347,6 +369,7 @@ inherited frmTradeSalesContractSel: TfrmTradeSalesContractSel object v1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'ConSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 diff --git a/T00贸易通用窗体/U_TradeSalesContractSel.pas b/T00贸易通用窗体/U_TradeSalesContractSel.pas index 4a821b5..b5abd53 100644 --- a/T00贸易通用窗体/U_TradeSalesContractSel.pas +++ b/T00贸易通用窗体/U_TradeSalesContractSel.pas @@ -11,7 +11,7 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit, - cxDropDownEdit, cxCheckBox, Vcl.Menus; + cxDropDownEdit, cxCheckBox, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradeSalesContractSel = class(TfrmBaseHelp) @@ -93,7 +93,7 @@ type procedure InitGrid(); { Private declarations } public - FCoType, FAuthority: string; + FCoType, FAuthority,canshu2: string; { Public declarations } end; @@ -152,6 +152,10 @@ begin sql.Clear; sql.Add('select A.*,B.* from BS_Contract_Main A inner join BS_Contract_Sub B on A.ConMId=B.ConMId '); sql.Add(' and isnull(A.status,''0'')=''9'' Order by A.ConDate'); + if canshu2='' then + begin + sql.add(' and A.Tallyer= ' + QuotedStr(Trim(DName))); + end; Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/T01贸易生产计划/U_GetDllForm.pas b/T01贸易生产计划/U_GetDllForm.pas index 828f93b..15174f8 100644 --- a/T01贸易生产计划/U_GetDllForm.pas +++ b/T01贸易生产计划/U_GetDllForm.pas @@ -76,7 +76,8 @@ 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 := '¼'; +// Parameters2 := ''; // DName:='ADMIN'; end else diff --git a/T01贸易生产计划/U_TradePlanInPut.pas b/T01贸易生产计划/U_TradePlanInPut.pas index 975bcd1..27e4f59 100644 --- a/T01贸易生产计划/U_TradePlanInPut.pas +++ b/T01贸易生产计划/U_TradePlanInPut.pas @@ -219,7 +219,7 @@ type PState, CopyInt, PriceFlag: Integer; FMainId, FFMainId, FOrderNo: string; FXS: Integer; - canshu1: string; + canshu1, canshu2: string; fFlileFlag: string; { Public declarations } end; @@ -522,7 +522,7 @@ begin SQL.Add('select Right(''' + Trim(maxno) + ''',Len(''' + Trim(maxno) + ''')-3) AS S'); Open; end; - FOrderNo := Trim(FDate)+ADOQuery1.FieldByName('S').ASString; + FOrderNo := Trim(Fdate) + ADOQuery1.FieldByName('S').ASString; if ProcessingType.text = '˾' then begin @@ -598,7 +598,6 @@ begin while not Eof do begin - if Trim(CDS_1.fieldbyname('SubId').AsString) = '' then begin if GetLSNo(ADOCmd, Smaxno, 'JS', 'Trade_Plan_Sub', 4, 1) = False then @@ -758,13 +757,13 @@ begin Exit; end; - if ProcessingType.text='' then + if ProcessingType.text = '' then begin - if ConNo.Text = '' then - begin - Application.MessageBox('ͬŲΪ!', 'ʾ', 0); - Exit; - end; + if ConNo.Text = '' then + begin + Application.MessageBox('ͬŲΪ!', 'ʾ', 0); + Exit; + end; end; if OurCoName.Text = '' then @@ -855,13 +854,13 @@ begin Open; end; with ADOQuery1 do - begin - Close; - sql.Clear; - sql.Add('select * from Pur_ClothPlan_Main A left join Pur_ClothPlan_Sub B on A.PurMid=B.PurMid'); - sql.Add('where Status<>''-1'' and isnull(PurSid,'''')<>'''' and Subid=''' + Trim(CDS_1.fieldbyname('SubId').AsString) + ''''); - Open; - end; + begin + Close; + sql.Clear; + sql.Add('select * from Pur_ClothPlan_Main A left join Pur_ClothPlan_Sub B on A.PurMid=B.PurMid'); + sql.Add('where Status<>''-1'' and isnull(PurSid,'''')<>'''' and Subid=''' + Trim(CDS_1.fieldbyname('SubId').AsString) + ''''); + Open; + end; if ADOTemp.IsEmpty = False then begin @@ -1064,6 +1063,10 @@ begin begin self.CustName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); + self.Saleser.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('SalesId').AsString); + self.Saleser.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Saleser').AsString); + self.Tallyer.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('TallyId').AsString); + self.Tallyer.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Tallyer').AsString); end; end; @@ -1343,6 +1346,7 @@ begin with frmTradeSalesContractSel do begin // fconNo := ConNo.Text; + canshu2 := self.canshu2; if ShowModal = 1 then begin while CDS_1.locate('SSel', true, []) do diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index 2edbf21..0712ee7 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -105,16 +105,24 @@ inherited frmTradePlanList: TfrmTradePlanList ImageIndex = 4 OnClick = ToolButton3Click end - object ToolButton4: TToolButton + object ToolButton9: TToolButton Left = 687 Top = 0 AutoSize = True + Caption = #25253#20851#36164#26009#34917#24405 + ImageIndex = 4 + OnClick = ToolButton9Click + end + object ToolButton4: TToolButton + Left = 806 + Top = 0 + AutoSize = True Caption = #38468#20214 ImageIndex = 22 OnClick = ToolButton4Click end object TBTJ: TToolButton - Left = 758 + Left = 877 Top = 0 AutoSize = True Caption = #25552#20132 @@ -878,8 +886,8 @@ inherited frmTradePlanList: TfrmTradePlanList end end object Panel3: TPanel [6] - Left = -49 - Top = 201 + Left = -216 + Top = 353 Width = 1177 Height = 634 Color = clBtnHighlight @@ -1024,7 +1032,7 @@ inherited frmTradePlanList: TfrmTradePlanList end object DBNote: TBtnEditC Tag = 2 - Left = 415 + Left = 408 Top = 72 Width = 440 Height = 20 @@ -1046,7 +1054,7 @@ inherited frmTradePlanList: TfrmTradePlanList end object tj: TMemo Tag = 2 - Left = 407 + Left = 408 Top = 217 Width = 440 Height = 130 @@ -1055,7 +1063,7 @@ inherited frmTradePlanList: TfrmTradePlanList end object cm: TMemo Tag = 2 - Left = 406 + Left = 408 Top = 360 Width = 440 Height = 130 @@ -1064,7 +1072,7 @@ inherited frmTradePlanList: TfrmTradePlanList end object jm: TMemo Tag = 2 - Left = 407 + Left = 408 Top = 501 Width = 440 Height = 80 @@ -1242,6 +1250,339 @@ inherited frmTradePlanList: TfrmTradePlanList OnBtnDnClick = PZNoteBtnDnClick end end + object Panel4: TPanel [7] + Left = 869 + Top = 363 + Width = 663 + Height = 634 + Hint = 'BGName/'#25253#20851#21697#21517 + TabOrder = 7 + Visible = False + object Label7: TLabel + Left = 385 + Top = 12 + Width = 52 + Height = 12 + Caption = #25253#20851#21697#21517 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label8: TLabel + Left = 385 + Top = 46 + Width = 52 + Height = 12 + Caption = #25253#20851#25104#20998 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label9: TLabel + Left = 385 + Top = 79 + Width = 39 + Height = 12 + Caption = #25253#20851#20215 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label10: TLabel + Left = 385 + Top = 110 + Width = 40 + Height = 12 + Caption = #23454' '#20215 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label11: TLabel + Left = 385 + Top = 142 + Width = 52 + Height = 12 + Caption = #25253#20851#38376#24133 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label13: TLabel + Left = 385 + Top = 172 + Width = 52 + Height = 12 + Caption = #25253#20851#20811#37325 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label14: TLabel + Left = 385 + Top = 302 + Width = 52 + Height = 12 + Caption = #25253#20851#31859#25968 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label15: TLabel + Left = 385 + Top = 203 + Width = 52 + Height = 12 + Caption = #25253#20851#31435#26041 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label16: TLabel + Left = 385 + Top = 235 + Width = 52 + Height = 12 + Caption = #25253#20851#27611#37325 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label17: TLabel + Left = 385 + Top = 266 + Width = 52 + Height = 12 + Caption = #25253#20851#20928#37325 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label18: TLabel + Left = 385 + Top = 336 + Width = 39 + Height = 12 + Caption = #25910#36135#20154 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label19: TLabel + Left = 391 + Top = 367 + Width = 13 + Height = 30 + Caption = #33337#13#10#21787 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label20: TLabel + Tag = 2 + Left = 391 + Top = 507 + Width = 13 + Height = 30 + Caption = #21367#13#10#21787 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object ADO_BG: TRichEdit + Left = 1 + Top = 1 + Width = 356 + Height = 632 + Align = alLeft + Color = clInfoBk + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [fsBold] + Lines.Strings = ( + 'ADO_BG') + ParentFont = False + TabOrder = 0 + Zoom = 100 + ExplicitHeight = 607 + end + object BGComposition: TEdit + Tag = 2 + Left = 447 + Top = 42 + Width = 188 + Height = 20 + TabOrder = 1 + end + object BGPrice: TEdit + Tag = 2 + Left = 447 + Top = 75 + Width = 188 + Height = 20 + TabOrder = 2 + end + object SJPrice: TEdit + Tag = 2 + Left = 447 + Top = 107 + Width = 188 + Height = 20 + TabOrder = 3 + end + object BGWidth: TEdit + Tag = 2 + Left = 447 + Top = 138 + Width = 188 + Height = 20 + TabOrder = 4 + end + object BGGramWeight: TEdit + Tag = 2 + Left = 447 + Top = 169 + Width = 188 + Height = 20 + TabOrder = 5 + end + object BGMeter: TEdit + Tag = 2 + Left = 447 + Top = 298 + Width = 188 + Height = 20 + TabOrder = 6 + end + object BGLF: TEdit + Tag = 2 + Left = 447 + Top = 200 + Width = 188 + Height = 20 + TabOrder = 7 + end + object BGGrossWeight: TEdit + Tag = 2 + Left = 447 + Top = 231 + Width = 188 + Height = 20 + TabOrder = 8 + end + object BGNetWeight: TEdit + Tag = 2 + Left = 447 + Top = 263 + Width = 188 + Height = 20 + TabOrder = 9 + end + object consignee: TEdit + Tag = 2 + Left = 447 + Top = 333 + Width = 188 + Height = 20 + TabOrder = 10 + end + object Button3: TButton + Left = 395 + Top = 600 + Width = 97 + Height = 25 + Caption = #20445#23384 + TabOrder = 11 + OnClick = Button3Click + end + object Button4: TButton + Left = 530 + Top = 600 + Width = 97 + Height = 25 + Caption = #20851#38381 + TabOrder = 12 + OnClick = Button4Click + end + object BGMainID: TEdit + Tag = 1 + Left = 203 + Top = 490 + Width = 102 + Height = 20 + TabOrder = 13 + Visible = False + OnKeyPress = OrderNoKeyPress + end + object BGName: TBtnEditC + Left = 447 + Top = 9 + Width = 188 + Height = 20 + Hint = 'BGName/'#25253#20851#21697#21517 + TabOrder = 14 + OnBtnUpClick = BGNameBtnUpClick + end + object BGCM: TMemo + Tag = 1 + Left = 447 + Top = 366 + Width = 188 + Height = 130 + ScrollBars = ssVertical + TabOrder = 15 + end + object BGJM: TMemo + Tag = 1 + Left = 447 + Top = 507 + Width = 188 + Height = 80 + ScrollBars = ssVertical + TabOrder = 16 + end + end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TradePlan.ADOLink Left = 257 @@ -1255,21 +1596,21 @@ inherited frmTradePlanList: TfrmTradePlanList object cxgrdpmn1: TcxGridPopupMenu Grid = cxGrid1 PopupMenus = <> - Left = 1142 - Top = 292 + Left = 606 + Top = 316 end object ADOQueryCmd: TADOQuery Connection = DataLink_TradePlan.ADOLink Parameters = <> - Left = 1153 - Top = 195 + Left = 593 + Top = 243 end object ADOQueryMain: TADOQuery Connection = DataLink_TradePlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 420 - Top = 216 + Left = 396 + Top = 160 end object ADOQueryTemp: TADOQuery Connection = DataLink_TradePlan.ADOLink @@ -1286,8 +1627,8 @@ inherited frmTradePlanList: TfrmTradePlanList object Order_Main: TClientDataSet Aggregates = <> Params = <> - Left = 1198 - Top = 283 + Left = 542 + Top = 243 end object ADOQuerySub: TADOQuery Connection = DataLink_TradePlan.ADOLink @@ -1358,8 +1699,8 @@ inherited frmTradePlanList: TfrmTradePlanList Top = 424 end object PM_1: TPopupMenu - Left = 1204 - Top = 217 + Left = 548 + Top = 297 object N1: TMenuItem Caption = #22797#21046 OnClick = N1Click @@ -1367,19 +1708,19 @@ inherited frmTradePlanList: TfrmTradePlanList end object GPM_3: TcxGridPopupMenu PopupMenus = <> - Left = 1103 - Top = 206 + Left = 647 + Top = 390 end object CDS_3: TClientDataSet Aggregates = <> Params = <> - Left = 1200 - Top = 379 + Left = 1096 + Top = 347 end object DataSource3: TDataSource DataSet = CDS_3 - Left = 1265 - Top = 375 + Left = 1105 + Top = 399 end object ADOCmd: TADOQuery Connection = DataLink_TradePlan.ADOLink @@ -1391,14 +1732,14 @@ inherited frmTradePlanList: TfrmTradePlanList Connection = DataLink_TradePlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 1287 - Top = 196 + Left = 551 + Top = 380 end object ADOQuery2: TADOQuery Connection = DataLink_TradePlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 1296 - Top = 243 + Left = 672 + Top = 251 end end diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index cdef228..e238d66 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -163,6 +163,38 @@ type ToolButton8: TToolButton; Tv1Column20: TcxGridDBColumn; Tv1Column21: TcxGridDBColumn; + Panel4: TPanel; + ADO_BG: TRichEdit; + Label7: TLabel; + Label8: TLabel; + BGComposition: TEdit; + Label9: TLabel; + BGPrice: TEdit; + Label10: TLabel; + SJPrice: TEdit; + Label11: TLabel; + BGWidth: TEdit; + Label13: TLabel; + BGGramWeight: TEdit; + Label14: TLabel; + BGMeter: TEdit; + Label15: TLabel; + BGLF: TEdit; + Label16: TLabel; + BGGrossWeight: TEdit; + Label17: TLabel; + BGNetWeight: TEdit; + Label18: TLabel; + consignee: TEdit; + Button3: TButton; + Button4: TButton; + BGMainID: TEdit; + ToolButton9: TToolButton; + BGName: TBtnEditC; + Label19: TLabel; + Label20: TLabel; + BGCM: TMemo; + BGJM: TMemo; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -213,13 +245,20 @@ type procedure ToolButton6Click(Sender: TObject); procedure ToolButton7Click(Sender: TObject); procedure ToolButton8Click(Sender: TObject); + procedure ToolButton9Click(Sender: TObject); + procedure Button4Click(Sender: TObject); + procedure Button3Click(Sender: TObject); + procedure BGNameBtnUpClick(Sender: TObject); private DQdate: TDateTime; FOrderNo, FCustName, FConNo, FBuyConNo, FC_Code, FC_Name, FHXYS, FCPMC, FKZPZ, FOrdQty, FOrdUnit: string; + FWidth, FGramWeight, FConPrice, FJGSY: string; procedure InitGrid(); procedure InitBl(); + procedure InitBG(); procedure InitHZ(); procedure SetBlList(); + procedure SetBGList(); procedure InitForm(); function DelData(): Boolean; procedure InitGridFH(); @@ -414,6 +453,25 @@ begin ADO_BL.Text := ADO_BL.Text + ':' + FOrdQty + #13; end; +procedure TfrmTradePlanList.SetBGList(); +begin + ADO_BG.Text := ''; + ADO_BG.Text := ADO_BG.Text + 'ָʾ:' + FOrderNo + #13; + ADO_BG.Text := ADO_BG.Text + 'ͻ:' + FCustName + #13; + ADO_BG.Text := ADO_BG.Text + 'ͬ:' + FConNo + #13; + ADO_BG.Text := ADO_BG.Text + 'ͻ:' + FBuyConNo + #13; + ADO_BG.Text := ADO_BG.Text + 'Ʒ:' + FC_Code + #13; + ADO_BG.Text := ADO_BG.Text + 'Ʒ:' + FC_Name + #13; + ADO_BG.Text := ADO_BG.Text + 'ɫ:' + FHXYS + #13; + ADO_BG.Text := ADO_BG.Text + 'Ʒ׳:' + FCPMC + #13; + ADO_BG.Text := ADO_BG.Text + 'Ʒ:' + FKZPZ + #13; + ADO_BG.Text := ADO_BG.Text + ':' + FOrdQty + #13; + ADO_BG.Text := ADO_BG.Text + 'ŷ:' + FWidth + #13; + ADO_BG.Text := ADO_BG.Text + ':' + FGramWeight + #13; + ADO_BG.Text := ADO_BG.Text + '۸:' + FJGSY + #13; + ADO_BG.Text := ADO_BG.Text + ':' + FConPrice + #13; +end; + procedure TfrmTradePlanList.InitHZ(); var MMeter, MKG: Double; @@ -505,6 +563,60 @@ begin SInitCDSData(ADOQueryTemp, CDS_3); end; +procedure TfrmTradePlanList.InitBG(); +begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + SQL.Add('select A.OrderNo,A.CustName,B.ConNo,B.BuyConNo,B.C_Code,B.C_Name,A.HXYS,A.CPMC,A.KZPZ,SUM(B.OrdQty) OrdQty,B.OrdUnit'); + SQL.Add(',C_Width=(select Top 1 C_Width from Bs_Contract_Sub X where X.ConMid=B.ConMid)'); + SQL.Add(',C_GramWeight=(select Top 1 C_GramWeight from Bs_Contract_Sub X where X.ConMid=B.ConMid)'); + SQL.Add(',ConPrice=(select Top 1 ConPrice from Bs_Contract_Sub X where X.ConMid=B.ConMid)'); + SQL.Add(',JGSY=(select jiagesy from Bs_Contract_Main X where X.ConMid=B.ConMid)'); + SQL.Add('from Trade_Plan_Main A left join Trade_plan_Sub B on B.MainId=A.MainId'); + sql.Add('where A.mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); + Sql.Add('GROUP BY A.OrderNo,A.CustName,B.ConNo,B.BuyConNo,B.C_Code,B.C_Name,A.HXYS,A.CPMC,A.KZPZ,B.OrdUnit,B.ConMid'); + + // ShowMessage(sql.Text); + Open; + end; + if ADOQueryTemp.IsEmpty = False then + begin + FOrderNo := Trim(ADOQueryTemp.fieldbyname('OrderNo').AsString); + FCustName := Trim(ADOQueryTemp.fieldbyname('CustName').AsString); + FConNo := Trim(ADOQueryTemp.fieldbyname('ConNo').AsString); + FBuyConNo := Trim(ADOQueryTemp.fieldbyname('BuyConNo').AsString); + FC_Code := Trim(ADOQueryTemp.fieldbyname('C_Code').AsString); + FC_Name := Trim(ADOQueryTemp.fieldbyname('C_Name').AsString); + FHXYS := Trim(ADOQueryTemp.fieldbyname('HXYS').AsString); + FCPMC := Trim(ADOQueryTemp.fieldbyname('CPMC').AsString); + FKZPZ := Trim(ADOQueryTemp.fieldbyname('KZPZ').AsString); + FOrdQty := Trim(ADOQueryTemp.fieldbyname('OrdQty').AsString + ADOQueryTemp.fieldbyname('OrdUnit').AsString); + FWidth := Trim(ADOQueryTemp.fieldbyname('C_Width').AsString); + FGramWeight := Trim(ADOQueryTemp.fieldbyname('C_GramWeight').AsString); + FConPrice := Trim(ADOQueryTemp.fieldbyname('ConPrice').AsString); + FJGSY := Trim(ADOQueryTemp.fieldbyname('JGSY').AsString); + SetBGList(); + end; + + with ADOQueryTemp do + begin + Close; + sql.Clear; + SQL.Add('select * from Trade_Plan_Main'); +// SQL.Add('from Trade_Plan_Main A left join Trade_plan_Sub B on B.MainId=A.MainId'); + sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); +// Sql.Add('GROUP BY A.OrderNo,A.CustName,B.ConNo,B.BuyConNo,B.C_Code,B.C_Name,A.HXYS,A.CPMC,A.KZPZ,B.OrdUnit'); + // ShowMessage(sql.Text); + Open; + end; + SCSHData(ADOQueryTemp, Panel4, 2); +// BGMainID.text:=ADOQueryTemp.FieldByName('MainID').AsString; + BGCM.text:=ADOQueryTemp.FieldByName('CM').AsString; + BGJM.text:=ADOQueryTemp.FieldByName('JM').AsString; +end; + procedure TfrmTradePlanList.InitGrid(); var STRwhere, Pwhere: string; @@ -578,7 +690,14 @@ begin if canshu1 = '¼' then begin - sql.add(' and (A.Filler= ' + QuotedStr(Trim(DName)) + ' or A.KHSaleser =' + quotedstr(trim(DName)) + ')'); + if canshu2 = '' then + begin + sql.add(' and A.Tallyer= ' + QuotedStr(Trim(DName))); + end + else + begin + sql.add(' and (A.Filler= ' + QuotedStr(Trim(DName)) + ' or A.KHSaleser =' + quotedstr(trim(DName)) + ')'); + end; end; sql.add(' ' + STRwhere); @@ -715,6 +834,7 @@ begin FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString); FOrderNo := Trim(Self.Order_Main.fieldbyname('OrderNo').AsString); canshu1 := self.canshu1; + canshu2 := self.canshu2; if ShowModal = 1 then begin @@ -891,6 +1011,7 @@ begin PState := 0; FMainId := ''; canshu1 := self.canshu1; + canshu2 := self.canshu2; if ShowModal = 1 then begin InitGrid(); @@ -954,6 +1075,7 @@ procedure TfrmTradePlanList.FormShow(Sender: TObject); begin inherited; canshu1 := self.fParameters1; + canshu2 := self.fParameters2; fFlileFlag := UserDataFlag + 'HX'; cxTabControl1.TabIndex := 0; InitForm(); @@ -1054,6 +1176,75 @@ begin Panel3.Visible := False; end; +procedure TfrmTradePlanList.Button3Click(Sender: TObject); +begin + if BGMainId.Text <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('UPdate Trade_Plan_Main '); + sql.Add(' Set BGName=''' + Trim(BGName.Text) + ''''); + sql.Add(',BGComposition=''' + Trim(BGComposition.Text) + ''''); + sql.Add(',BGPrice=''' + Trim(BGPrice.Text) + ''''); + sql.Add(',SJPrice=''' + Trim(SJPrice.Text) + ''''); + SQL.Add(',BGWidth=''' + Trim(BGWidth.Text) + ''''); + sql.Add(',BGGramWeight=''' + Trim(BGGramWeight.Text) + ''''); + sql.Add(',BGGrossWeight=''' + Trim(BGGrossWeight.Text) + ''''); + sql.Add(',BGNetWeight=''' + Trim(BGNetWeight.Text) + ''''); + sql.Add(',BGLF=''' + Trim(BGLF.Text) + ''''); + sql.Add(',BGMeter=''' + Trim(BGMeter.Text) + ''''); + sql.Add(',consignee=''' + Trim(consignee.Text) + ''''); + sql.Add(',cm=''' + Trim(BGcm.Text) + ''''); + sql.Add(',jm=''' + Trim(BGjm.Text) + ''''); + SQL.Add(',Editer=''' + Trim(DName) + ''''); + SQL.Add(',EditId=''' + Trim(DCode) + ''''); +// SQL.Add(',Edittime=''' + Trim(DCode) + ''''); + SQL.Add(' where MainId=''' + Trim(BGMainId.Text) + ''''); +// ShowMessage(SQL.text); + execsql; + end; + + end; + + Application.MessageBox('ɹ!', 'ʾ', 0); + Button4.Click; + +end; + +procedure TfrmTradePlanList.Button4Click(Sender: TObject); +begin + FOrderNo := ''; + FCustName := ''; + FConNo := ''; + FBuyConNo := ''; + FC_Code := ''; + FC_Name := ''; + FHXYS := ''; + FCPMC := ''; + FKZPZ := ''; + FOrdQty := ''; + FWidth := ''; + FGramWeight := ''; + FConPrice := ''; + FJGSY := ''; + BGName.text := ''; + BGWidth.text := ''; + BGMeter.text := ''; + BGGrossWeight.text := ''; + BGNetWeight.text := ''; + BGComposition.text := ''; + SJPrice.text := ''; + BGGramWeight.text := ''; + consignee.text := ''; + BGLF.text := ''; + +// WriteCxGrid('ָʾбFF1', Tv3, 'ָʾ'); + Panel4.Visible := False; + +end; + procedure TfrmTradePlanList.CheckBox1Click(Sender: TObject); begin InitGrid(); @@ -1153,6 +1344,29 @@ begin end; +procedure TfrmTradePlanList.BGNameBtnUpClick(Sender: TObject); +var + fsj: string; + FWZ: Integer; +begin + fsj := Trim(TEdit(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 + TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + end; + end; + finally + frmZDYHelp.Free; + end; +end; + procedure TfrmTradePlanList.btnCopyClick(Sender: TObject); begin if Order_Main.IsEmpty then @@ -1166,6 +1380,7 @@ begin CopyInt := 99; FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString); canshu1 := self.canshu1; + canshu2 := self.canshu2; if ShowModal = 1 then begin @@ -1370,6 +1585,17 @@ begin end; +procedure TfrmTradePlanList.ToolButton9Click(Sender: TObject); +begin + + BGMainId.text := trim(Order_Main.fieldbyname('mainID').AsString); + Panel4.Left := (self.width - Panel4.width) div 2; + Panel4.Top := 37; + Panel4.Visible := True; + InitBG(); + +end; + procedure TfrmTradePlanList.cxGridDBColumn8PropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local index fff35d3..47b096c 100644 --- a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local +++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local @@ -1,41 +1,41 @@  - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.295,=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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 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.974,=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.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm - 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj - 1899-12-30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas - 1899-12-30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.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.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.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas + 1899-12-30 00:00:00.000.202,=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.478,=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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm 1899-12-30 00:00:00.000.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj + 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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/T02贸易汇总仓库/U_TradeFinishClothInList.dfm b/T02贸易汇总仓库/U_TradeFinishClothInList.dfm index 6fddf4c..69a7b47 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInList.dfm +++ b/T02贸易汇总仓库/U_TradeFinishClothInList.dfm @@ -115,6 +115,7 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Color = clWhite ParentBackground = False TabOrder = 1 + ExplicitTop = 32 object Label1: TLabel Left = 28 Top = 12 @@ -171,6 +172,13 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList Height = 12 Caption = #25209' '#21495 end + object Label6: TLabel + Left = 660 + Top = 12 + Width = 48 + Height = 12 + Caption = #35745#21010#21333#21495 + end object BegDate: TDateTimePicker Left = 77 Top = 8 @@ -253,6 +261,15 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList TabOrder = 7 OnChange = FromCoNameChange end + object FromOrdNo: TEdit + Tag = 2 + Left = 710 + Top = 8 + Width = 100 + Height = 20 + TabOrder = 8 + OnChange = FromCoNameChange + end end object cxGrid1: TcxGrid [2] Left = 0 diff --git a/T02贸易汇总仓库/U_TradeFinishClothInList.pas b/T02贸易汇总仓库/U_TradeFinishClothInList.pas index 13ddd28..ca80ec1 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothInList.pas +++ b/T02贸易汇总仓库/U_TradeFinishClothInList.pas @@ -85,6 +85,8 @@ type Tv1Column11: TcxGridDBColumn; Tv1Column12: TcxGridDBColumn; Tv1Column13: TcxGridDBColumn; + Label6: TLabel; + FromOrdNo: TEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm b/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm index d0c015c..a0fd631 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm @@ -10,6 +10,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose + ExplicitLeft = -381 ExplicitWidth = 1556 ExplicitHeight = 497 PixelsPerInch = 96 @@ -24,6 +25,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -55,6 +57,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -62,6 +65,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column2: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -71,21 +75,22 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column4: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.DropDownRows = 20 Properties.Items.Strings = ( - #37319#36141#20837#24211 - #21152#24037#20837#24211 - #29983#20135#36864#22238 - #30424#30408#20837#24211 - #38144#21806#36864#22238) + #23458#38656#24320#21457 + #33258#20027#24320#21457 + #22823#36135#30041#26679 + #20854#23427#30041#26679) HeaderAlignmentHorz = taCenter Width = 87 end object v1FactoryName: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -101,6 +106,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object Tv1Column1: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -115,6 +121,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object Tv1Column4: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -129,6 +136,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object Tv1Column8: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -141,6 +149,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1SPName: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -154,6 +163,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1SPSpec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -168,24 +178,28 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit 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 Tv1Column5: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.Items.Strings = ( #21367#26679 @@ -196,6 +210,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column1: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter VisibleForCustomization = False Width = 92 @@ -203,6 +218,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v2Column6: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 92 @@ -210,6 +226,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1QtyUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -223,6 +240,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column5: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -237,6 +255,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit object v1Column7: TcxGridDBColumn Caption = #36710#38388 DataBinding.FieldName = 'Workshop' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -248,42 +267,63 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit 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 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 + object Tv1Column12: TcxGridDBColumn + Caption = #25104#26412#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column13: TcxGridDBColumn + Caption = #25104#26412#37329#39069 + DataBinding.FieldName = 'CBMoney' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas b/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas index b870aa3..401d9ea 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothInEdit.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 TfrmTradeSampleClothInEdit = class(TfrmBaseInput) @@ -58,6 +58,8 @@ type ToolButton2: TToolButton; Label1: TLabel; BCIID: TEdit; + Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeSampleClothInList.dfm b/T02贸易汇总仓库/U_TradeSampleClothInList.dfm index ff2398e..fef6938 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothInList.dfm @@ -4,6 +4,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Caption = #20837#24211#21015#34920 ClientHeight = 478 ClientWidth = 1540 + ExplicitLeft = -381 ExplicitWidth = 1556 ExplicitHeight = 517 PixelsPerInch = 96 @@ -263,6 +264,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -303,6 +305,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object Tv1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -311,6 +314,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -319,6 +323,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'ioTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -329,6 +334,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -342,6 +348,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -357,6 +364,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -370,6 +378,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 79 @@ -377,6 +386,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter VisibleForCustomization = False Width = 89 @@ -384,12 +394,14 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList 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 @@ -397,6 +409,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object v1Column11: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -404,6 +417,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object Tv1Column6: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -412,6 +426,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 85 @@ -420,6 +435,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -433,6 +449,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Tag = 2 Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -447,12 +464,14 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList 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 @@ -460,23 +479,29 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object Tv1Column1: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 end object Tv1Column3: TcxGridDBColumn Caption = #31867#22411 + DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 55 end 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 @@ -484,6 +509,7 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object Tv1Column8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -491,10 +517,25 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList object Tv1Column9: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 end + object Tv1Column5: TcxGridDBColumn + Caption = #25104#26412#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 61 + end + object Tv1Column11: TcxGridDBColumn + Caption = #25104#26412#37329#39069 + DataBinding.FieldName = 'CBmoney' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T02贸易汇总仓库/U_TradeSampleClothInList.pas b/T02贸易汇总仓库/U_TradeSampleClothInList.pas index 9645d1f..4b45e1a 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInList.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothInList.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 TfrmTradeSampleClothInList = class(TfrmBaseList) @@ -78,6 +79,8 @@ type Tv1Column9: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; + Tv1Column5: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm index b2c8a66..089ee55 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm @@ -84,9 +84,11 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit Height = 411 Align = alClient TabOrder = 1 + ExplicitTop = 44 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -120,6 +122,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column13: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'ToOrdNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -133,6 +136,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 91 @@ -140,6 +144,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column2: TcxGridDBColumn Caption = #20986#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -149,6 +154,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1CRType: TcxGridDBColumn Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.DropDownRows = 20 @@ -165,6 +171,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column1: TcxGridDBColumn Caption = #37319#36141#21152#24037#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -181,6 +188,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column2: TcxGridDBColumn Caption = #20986#21040#21333#20301 DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -195,6 +203,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column3: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -202,6 +211,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column5: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -209,6 +219,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v2Column1: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -222,6 +233,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column8: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -230,6 +242,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column10: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 67 @@ -237,12 +250,14 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column7: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 57 end object v1Column11: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -250,6 +265,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column7: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 @@ -257,6 +273,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1CheJian: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -265,13 +282,16 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v2Column6: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v2Column6PropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 85 end object v1Column3: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -279,17 +299,21 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object v1Column12: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 79 end object Tv1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column4: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -297,6 +321,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -304,12 +329,14 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column6: TcxGridDBColumn Caption = #26579#21378#32568#21495 DataBinding.FieldName = 'FtyPCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -317,6 +344,7 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column9: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -324,10 +352,50 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit object Tv1Column10: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end + object Tv1Column11: TcxGridDBColumn + Caption = #25104#26412#21333#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object Tv1Column12: TcxGridDBColumn + Caption = #25104#26412#37329#39069 + DataBinding.FieldName = 'CBMoney' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object Tv1Column13: TcxGridDBColumn + Caption = #21333#20215 + DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v2Column6PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 46 + end + object Tv1Column14: TcxGridDBColumn + Caption = #37329#39069 + DataBinding.FieldName = 'Money' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column15: TcxGridDBColumn + Caption = #19994#21153#21592 + DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas index be2255c..2055eb6 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, - U_BaseInput, System.ImageList, Vcl.ImgList; + U_BaseInput, System.ImageList, Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradeSampleClothOutEdit = class(TfrmBaseInput) @@ -55,6 +55,11 @@ type Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; + Tv1Column15: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -64,6 +69,7 @@ type procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure ToolButton1Click(Sender: TObject); procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure v2Column6PropertiesEditValueChanged(Sender: TObject); private { Private declarations } function SaveCKData(): Boolean; @@ -145,7 +151,8 @@ begin FieldByName('C_Pattern').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Pattern').Value; FieldByName('C_Composition').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Composition').Value; FieldByName('C_StyleNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_StyleNo').Value; - + FieldByName('CBPrice').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('CBPrice').Value; + FieldByName('CBMoney').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('CBMoney').Value; end; frmTradeSampleClothStkSel.CDS_Main.Delete; end; @@ -387,7 +394,14 @@ begin frmCompanySel := TfrmCompanySel.Create(Application); with frmCompanySel do begin - FCoType := 'Ӧ'; + if (Self.CDS_sub.fieldbyname('IOType').AsString = '') or (CDS_1.fieldbyname('IOType').AsString = '۳') then + begin + FCoType := 'ͻ'; + end + else + begin + FCoType := 'Ӧ'; + end; if ShowModal = 1 then begin with Self.CDS_Sub do @@ -395,6 +409,7 @@ begin Edit; FieldByName('ToCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString); FieldByName('ToCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString); + FieldByName('Saleser').Value := Trim(CDS_1.fieldbyname('Saleser').AsString); end; end; end; @@ -434,5 +449,39 @@ begin end; end; +procedure TfrmTradeSampleClothOutEdit.v2Column6PropertiesEditValueChanged(Sender: TObject); +var + mvalue, FFieldName: string; + FQty, FPrice, FMoney: Double; //ۣ, Ԥɱ +begin + mvalue := TcxTextEdit(Sender).EditingText; + if Trim(mvalue) = '' then + begin + mvalue := '0'; + end; + FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); + + with CDS_Sub do + begin + Edit; + FieldByName(FFieldName).Value := Trim(mvalue); + Post; + FQty := Fieldbyname('Qty').AsFloat; + FPrice := Fieldbyname('Price').AsFloat; + end; + FMoney := RoundFloat(FQty * FPrice, 2); + + with CDS_Sub do + begin + Edit; + FieldByName('Qty').Value := FQty; + FieldByName('Price').Value := FPrice; + FieldByName('Money').Value := FMoney; + Post; + end; + + tv1.Controller.EditingController.ShowEdit(); +end; + end. diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm b/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm index 610c946..9892d8c 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm @@ -3,9 +3,9 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Top = 98 Caption = #20986#24211#21015#34920 ClientHeight = 537 - ClientWidth = 1575 + ClientWidth = 1540 Position = poScreenCenter - ExplicitWidth = 1591 + ExplicitWidth = 1556 ExplicitHeight = 576 PixelsPerInch = 96 TextHeight = 12 @@ -13,7 +13,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 1 Left = 0 Top = 0 - Width = 1575 + Width = 1540 Height = 38 AutoSize = True ButtonHeight = 38 @@ -108,7 +108,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Panel1: TPanel [1] Left = 0 Top = 38 - Width = 1575 + Width = 1540 Height = 61 Align = alTop BevelInner = bvRaised @@ -288,13 +288,16 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object cxGrid1: TcxGrid [2] Left = 0 Top = 99 - Width = 1575 + Width = 1540 Height = 438 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitLeft = 213 + ExplicitTop = 105 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = < @@ -339,6 +342,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -347,6 +351,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -355,6 +360,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #20986#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -366,6 +372,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -380,6 +387,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #25152#23646#31867#22411 DataBinding.FieldName = 'SSType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -394,16 +402,25 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column1: TcxGridDBColumn Caption = #37319#36141#21333#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False VisibleForCustomization = False Width = 85 end + object Tv1Column16: TcxGridDBColumn + Caption = #20986#21040#21333#20301 + DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 75 + end object v1Column14: TcxGridDBColumn Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -419,6 +436,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column13: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -426,12 +444,14 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column16: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object v1Column17: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -442,6 +462,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -455,6 +476,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column20: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'SPCode' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -465,6 +487,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -473,6 +496,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -482,12 +506,14 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end object v1Column7: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -495,12 +521,14 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column7: TcxGridDBColumn Caption = #26579#21378#32568#21495 DataBinding.FieldName = 'FtyPCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end object v1Column18: TcxGridDBColumn Caption = #20986#21040#35745#21010#21333 DataBinding.FieldName = 'ToOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -508,14 +536,23 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column1: TcxGridDBColumn Caption = #26469#33258#35745#21010#21333 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 96 end + object Tv1Column2: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -525,6 +562,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 58 @@ -532,6 +570,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column8: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 52 end @@ -539,12 +578,14 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True Options.Editing = False Width = 79 end object Tv1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -552,6 +593,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column9: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -559,6 +601,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column10: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -566,10 +609,46 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList object Tv1Column11: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end + object Tv1Column3: TcxGridDBColumn + Caption = #25104#26412#21333#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column12: TcxGridDBColumn + Caption = #25104#26412#37329#39069 + DataBinding.FieldName = 'CBMoney' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column13: TcxGridDBColumn + Caption = #21333#20215 + DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column14: TcxGridDBColumn + Caption = #37329#39069 + DataBinding.FieldName = 'Money' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column15: TcxGridDBColumn + Caption = #19994#21153#21592 + DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutList.pas b/T02贸易汇总仓库/U_TradeSampleClothOutList.pas index cc67a57..89e3cc1 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutList.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothOutList.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 TfrmTradeSampleClothOutList = class(TfrmBaseList) @@ -86,6 +87,13 @@ type Tv1Column9: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; Tv1Column11: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; + Tv1Column15: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm b/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm index 59ae716..36d21ad 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm @@ -5,6 +5,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList ClientHeight = 472 ClientWidth = 1400 Position = poDefault + ExplicitLeft = -241 ExplicitWidth = 1416 ExplicitHeight = 511 PixelsPerInch = 96 @@ -151,6 +152,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -214,6 +216,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -222,6 +225,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -238,6 +242,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -251,6 +256,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object Tv1Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -259,6 +265,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -267,6 +274,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object v1Column4: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -274,6 +282,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -281,6 +290,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 @@ -288,12 +298,14 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object v1Column11: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 end object v1Column9: TcxGridDBColumn Caption = #20837#24211#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 63 end @@ -301,15 +313,18 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'stkqty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False + Styles.Header = cxStyle1 Width = 74 end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -323,6 +338,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -330,6 +346,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object Tv1Column1: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -337,18 +354,49 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList object Tv1Column4: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column5: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column6: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column7: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end + object Tv1Column8: TcxGridDBColumn + Caption = #24211#20301 + DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1Column9: TcxGridDBColumn + Caption = #25104#26412#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 57 + end + object Tv1Column10: TcxGridDBColumn + Caption = #25104#26412#37329#39069 + DataBinding.FieldName = 'CBMoney' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -413,4 +461,12 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Left = 368 Top = 240 end + object cxStyleRepository1: TcxStyleRepository + PixelsPerInch = 96 + object cxStyle1: TcxStyle + AssignedValues = [svColor, svTextColor] + Color = clMenu + TextColor = clBlue + end + end end diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkList.pas b/T02贸易汇总仓库/U_TradeSampleClothStkList.pas index b0ecd87..d6ab00f 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkList.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothStkList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradeSampleClothStkList = class(TfrmBaseList) @@ -58,6 +59,12 @@ type Tv1Column4: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; + Tv1Column7: TcxGridDBColumn; + cxStyleRepository1: TcxStyleRepository; + cxStyle1: TcxStyle; + Tv1Column8: TcxGridDBColumn; + Tv1Column9: TcxGridDBColumn; + Tv1Column10: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm b/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm index d00151f..e657790 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm @@ -178,8 +178,10 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 80 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -249,6 +251,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column17: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -258,6 +261,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column11: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -265,6 +269,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -273,6 +278,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -289,6 +295,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -303,6 +310,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -311,6 +319,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column4: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -318,6 +327,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -325,13 +335,22 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 end + object Tv1Column5: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'C_Pack' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end object v1Column7: TcxGridDBColumn Caption = #20837#24211#21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 62 @@ -339,6 +358,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v1Column9: TcxGridDBColumn Caption = #20837#24211#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 63 @@ -347,12 +367,14 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Tag = 2 Caption = #21305#37325 DataBinding.FieldName = 'PieceWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object v1Column1: TcxGridDBColumn Caption = #24211#23384#21305#25968 DataBinding.FieldName = 'StkPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -360,16 +382,19 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object v2Column6: TcxGridDBColumn Tag = 2 Caption = #24211#23384#25968#37327 - DataBinding.FieldName = 'STYQty' + DataBinding.FieldName = 'StkQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False + Styles.Header = cxStyle1 Width = 74 end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -383,21 +408,38 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel object Tv1Column2: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column3: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column4: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end + object Tv1Column6: TcxGridDBColumn + Caption = #24211#20301 + DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 77 + end + object Tv1Column7: TcxGridDBColumn + Caption = #25104#26412#20215 + DataBinding.FieldName = 'CBPrice' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 55 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -467,4 +509,16 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel OnClick = N2Click end end + object cxStyleRepository1: TcxStyleRepository + PixelsPerInch = 96 + object cxStyle1: TcxStyle + AssignedValues = [svTextColor] + TextColor = clBlue + end + end + object cxStyleRepository2: TcxStyleRepository + PixelsPerInch = 96 + object cxStyle2: TcxStyle + end + end end diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas b/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas index d3939fa..9b22b84 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradeSampleClothStkSel = class(TfrmBaseHelp) @@ -65,6 +65,13 @@ type Tv1Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; Tv1Column4: TcxGridDBColumn; + Tv1Column5: TcxGridDBColumn; + cxStyleRepository1: TcxStyleRepository; + cxStyle1: TcxStyle; + cxStyleRepository2: TcxStyleRepository; + cxStyle2: TcxStyle; + Tv1Column6: TcxGridDBColumn; + Tv1Column7: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); diff --git a/T04贸易明细仓库/U_TradeClothInEdit.dfm b/T04贸易明细仓库/U_TradeClothInEdit.dfm index 0c646e4..705ee5f 100644 --- a/T04贸易明细仓库/U_TradeClothInEdit.dfm +++ b/T04贸易明细仓库/U_TradeClothInEdit.dfm @@ -21,8 +21,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit Height = 423 Align = alClient TabOrder = 0 - ExplicitLeft = -3 - ExplicitTop = 41 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.dfm b/T04贸易明细仓库/U_TradeClothStkListNew.dfm index 1c9281a..4104a4b 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.dfm +++ b/T04贸易明细仓库/U_TradeClothStkListNew.dfm @@ -150,6 +150,7 @@ Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change + ExplicitTop = 44 ClientRectBottom = 554 ClientRectRight = 1540 ClientRectTop = 32 @@ -529,6 +530,7 @@ ParentFont = False PopupMenu = PM_2 TabOrder = 1 + ExplicitTop = 59 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.pas b/T04贸易明细仓库/U_TradeClothStkListNew.pas index ed99aa4..ddcfee2 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.pas +++ b/T04贸易明细仓库/U_TradeClothStkListNew.pas @@ -316,6 +316,16 @@ begin ToolButton8.Visible := False; end; + end else + begin + TV2Column12.visible:=False; + TV2Column12.VisibleForCustomization:=False; + TV2Column11.visible:=False; + TV2Column11.VisibleForCustomization:=False; + TV1Column13.visible:=False; + TV1Column14.visible:=False; + TV1Column13.VisibleForCustomization:=False; + TV1Column14.VisibleForCustomization:=False; end; end; @@ -475,7 +485,10 @@ procedure TfrmTradeClothStkListNew.TBExportClick(Sender: TObject); begin if ADOQueryMain.IsEmpty then exit; + if cxPageControl1.ActivePageIndex = 1 then TcxGridToExcel(Self.Caption, cxGrid1); + if cxPageControl1.ActivePageIndex = 0 then + TcxGridToExcel(Self.Caption, cxGrid2); end; procedure TfrmTradeClothStkListNew.orderNoKeyPress(Sender: TObject; var Key: Char); diff --git a/T04贸易明细仓库/U_TradeClothWaitStorage.dfm b/T04贸易明细仓库/U_TradeClothWaitStorage.dfm index ae62562..cebd728 100644 --- a/T04贸易明细仓库/U_TradeClothWaitStorage.dfm +++ b/T04贸易明细仓库/U_TradeClothWaitStorage.dfm @@ -87,10 +87,12 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage Width = 1203 Height = 464 Align = alClient + PopupMenu = PM_1 TabOrder = 1 - ExplicitTop = 88 + ExplicitTop = 95 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -128,15 +130,24 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object v2Column3: TcxGridDBColumn Caption = #36873#20013 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter Width = 45 end + object Tv2Column6: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 84 + end object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -144,12 +155,14 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object Tv2Column2: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object cxGridDBColumn2: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -157,18 +170,21 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object Tv2Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv2Column4: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object v2Column8: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -176,6 +192,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -183,6 +200,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object Tv2Column1: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -190,6 +208,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -197,6 +216,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -204,6 +224,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object v1PRTMF: TcxGridDBColumn Caption = #26410#20837#24211#21305#25968 DataBinding.FieldName = 'ZPPS' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 97 @@ -211,6 +232,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object v1PRTKZ: TcxGridDBColumn Caption = #26410#20837#24211#25968#37327 DataBinding.FieldName = 'ZPQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 117 @@ -218,6 +240,7 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage object Tv2Column5: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 53 end @@ -289,8 +312,8 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage end object DataSource1: TDataSource DataSet = CDS_OrderSel - Left = 680 - Top = 224 + Left = 624 + Top = 280 end object ADOQueryTemp: TADOQuery Connection = DataLink_TradeClothStk.ADOLink @@ -318,4 +341,16 @@ object frmTradeClothWaitStorage: TfrmTradeClothWaitStorage Left = 760 Top = 336 end + object PM_1: TPopupMenu + Left = 616 + Top = 336 + object N1: TMenuItem + Caption = #20840#36873 + OnClick = N1Click + end + object N2: TMenuItem + Caption = #20840#24323 + OnClick = N2Click + end + end end diff --git a/T04贸易明细仓库/U_TradeClothWaitStorage.pas b/T04贸易明细仓库/U_TradeClothWaitStorage.pas index b07938c..804f523 100644 --- a/T04贸易明细仓库/U_TradeClothWaitStorage.pas +++ b/T04贸易明细仓库/U_TradeClothWaitStorage.pas @@ -10,7 +10,7 @@ uses cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, - dxBarBuiltInMenu, Vcl.ToolWin; + dxBarBuiltInMenu, Vcl.ToolWin, dxSkinWXI, dxScrollbarAnnotations, Vcl.Menus; type TfrmTradeClothWaitStorage = class(TForm) @@ -49,6 +49,10 @@ type Tv2Column3: TcxGridDBColumn; Tv2Column4: TcxGridDBColumn; Tv2Column5: TcxGridDBColumn; + PM_1: TPopupMenu; + N1: TMenuItem; + N2: TMenuItem; + Tv2Column6: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormDestroy(Sender: TObject); procedure FormShow(Sender: TObject); @@ -58,6 +62,8 @@ type procedure ToolButton7Click(Sender: TObject); procedure ToolButton8Click(Sender: TObject); procedure ToolButton1Click(Sender: TObject); + procedure N1Click(Sender: TObject); + procedure N2Click(Sender: TObject); private { Private declarations } @@ -118,6 +124,16 @@ begin end; end; +procedure TfrmTradeClothWaitStorage.N1Click(Sender: TObject); +begin + SelOKNo(CDS_OrderSel, True); +end; + +procedure TfrmTradeClothWaitStorage.N2Click(Sender: TObject); +begin + SelOKNo(CDS_OrderSel, False); +end; + procedure TfrmTradeClothWaitStorage.OrderNoChange(Sender: TObject); begin SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));