diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index d2d7a72..54110c5 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -1984,7 +1984,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Name = #23435#20307 Font.Style = [] ItemHeight = 24 - ItemIndex = 0 ParentFont = False TabOrder = 26 Text = #36890#29992#26631#31614 @@ -1993,7 +1992,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF #36890#29992#26631#31614 #36890#29992#26631#31614'('#37325#37327')' #36890#29992#26631#31614'('#38271#24230')' - #26417#24635) + #26417#24635 + #35167#34946) end object Button9: TButton Left = 384 diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index c912f18..7d794cf 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -1,6 +1,6 @@ unit U_MJManageNewFDNew; -interface +interface uses Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls, @@ -773,7 +773,7 @@ begin begin Close; SQL.Clear; - sql.Add('select '); + sql.Add('select '); //sql.Add('Case when isnull(MJType,'''')=''Ʒ'' then ''B''+RTrim(Cast(MJXH as varchar(20))) else Cast(MJXH as varchar(20)) end as MJXH ,'); sql.Add(' A.* from WFB_MJJY A where APID=''' + Trim(FAPID) + ''''); if Trim(SCXFlag) <> '' then @@ -790,10 +790,14 @@ end; procedure TfrmMJManageNewFDNewSF.TBCloseClick(Sender: TObject); begin close; + WriteCxGrid('̨', Tv3, '̨'); end; procedure TfrmMJManageNewFDNewSF.FormShow(Sender: TObject); +var + FSLBName: string; begin + ReadCxGrid('̨', Tv3, '̨'); InitJP(); with ADOTmp do begin @@ -817,6 +821,8 @@ begin Edit9.Visible := true; Label44.Visible := true; end; + FSLBName := 'select distinct(ZDYName ) name from KH_ZDY where Type=''SLBName'' '; + SInitComBoxBySql(ADOCmd, SLBName, False, FSLBName); S1 := False; end; @@ -1079,7 +1085,7 @@ begin begin with ADOCmd do begin - Close; + Close; sql.Clear; sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); sql.Add('from WFB_MJJY X where X.mainID=''' + trim(fmainId) + ''' '); @@ -1091,7 +1097,7 @@ begin begin with ADOCmd do begin - Close; + Close; sql.Clear; sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' '); @@ -1200,7 +1206,7 @@ begin FieldByName('MJstr4').Value := Trim(MJstr4.Text); FieldByName('MJstr5').Value := Trim(MJstr5.Text); FieldByName('mjxh').Value := Trim(mjxh.Text); -// FieldByName('BaoNO').Value := Trim(BaoNO.Text); + FieldByName('MJSLbName').Value := Trim(SLbName.Text); FieldByName('MJTypeOther').Value := Trim(Label9.Caption); FieldByName('MJStr1').Value := Trim(Label13.Caption); diff --git a/复合检验管理/U_OrderInPut.pas b/复合检验管理/U_OrderInPut.pas index a81327c..4be372a 100644 --- a/复合检验管理/U_OrderInPut.pas +++ b/复合检验管理/U_OrderInPut.pas @@ -12,7 +12,20 @@ uses cxCurrencyEdit, cxImage, Menus, cxLookAndFeelPainters, cxButtons, cxDBEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_Preview, - RM_DsgGridReport, RM_e_Graphic, RM_e_bmp; + RM_DsgGridReport, RM_e_Graphic, RM_e_bmp, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmOrderInPut = class(TForm) @@ -208,6 +221,7 @@ type procedure SLBNameBtnClick(Sender: TObject); procedure v1SOrddefstr1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1PRTHXPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private procedure InitData(); procedure ZDYHelp(FButn: TcxButtonEdit; LType: string); @@ -1732,5 +1746,28 @@ begin end; end; +procedure TfrmOrderInPut.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + flag := 'SLBName'; + flagname := 'ǩ'; +// V1Name.Caption := ''; +// V1Note.Caption := 'Ӣ'; + // MainType:=Trim(DName); +// fnote := True; + if ShowModal = 1 then + begin + Self.Order_Sub.Edit; + Self.Order_Sub.FieldByName('SLBName').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + end; + end; + finally + frmZDYHelp.Free; + end; +end; + end. diff --git a/复合检验管理/U_ProductOrderNewList.dfm b/复合检验管理/U_ProductOrderNewList.dfm index 83247c0..7275d96 100644 --- a/复合检验管理/U_ProductOrderNewList.dfm +++ b/复合检验管理/U_ProductOrderNewList.dfm @@ -23,7 +23,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList Width = 1366 AutoSize = True ButtonHeight = 30 - ButtonWidth = 95 + ButtonWidth = 107 Caption = 'ToolBar1' Color = clSkyBlue Flat = True @@ -159,8 +159,16 @@ object frmProductOrderNewList: TfrmProductOrderNewList Visible = False OnClick = ToolButton5Click end + object ToolButton7: TToolButton + Left = 1097 + Top = 0 + AutoSize = True + Caption = #20869#38144#26631#31614#31649#29702 + ImageIndex = 58 + OnClick = ToolButton7Click + end object ToolButton6: TToolButton - Left = 1085 + Left = 1208 Top = 0 AutoSize = True Caption = #26085#24535 @@ -168,7 +176,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList OnClick = ToolButton6Click end object TBClose: TToolButton - Left = 1148 + Left = 1271 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/复合检验管理/U_ProductOrderNewList.pas b/复合检验管理/U_ProductOrderNewList.pas index 324e2fd..691e04f 100644 --- a/复合检验管理/U_ProductOrderNewList.pas +++ b/复合检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, + dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, + dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm) @@ -148,6 +161,7 @@ type ToolButton6: TToolButton; TV2Column7: TcxGridDBColumn; TV2Column8: TcxGridDBColumn; + ToolButton7: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -188,6 +202,7 @@ type procedure TV2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure ToolButton5Click(Sender: TObject); procedure ToolButton6Click(Sender: TObject); + procedure ToolButton7Click(Sender: TObject); private DQdate: TDateTime; FMainId: string; @@ -831,7 +846,7 @@ begin Exit; RMDBMain.DataSet := CDS_Print; LBName := RadioGroup1.Items.Strings[RadioGroup1.ItemIndex]; - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; with ADOQueryPrint do begin Close; @@ -855,7 +870,7 @@ begin begin RM1.LoadFromFile(fPrintFile); RM1.ShowReport; - RMDBMain.DataSet :=nil; + RMDBMain.DataSet := nil; end else begin @@ -1032,7 +1047,7 @@ begin end; finally frmMJSJFX.Free; - end; + end; end; procedure TfrmProductOrderNewList.TV2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); @@ -1043,7 +1058,7 @@ end; procedure TfrmProductOrderNewList.ToolButton5Click(Sender: TObject); begin - try + try frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin @@ -1073,5 +1088,24 @@ begin end; end; +procedure TfrmProductOrderNewList.ToolButton7Click(Sender: TObject); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + flag := 'SLBName'; + flagname := 'ǩ'; + + if ShowModal = 1 then + begin + + end; + end; + finally + frmZDYHelp.Free; + end; +end; + end.