diff --git a/复合检验管理/U_DataLink.pas b/复合检验管理/U_DataLink.pas index 54c5229..8e27ed0 100644 --- a/复合检验管理/U_DataLink.pas +++ b/复合检验管理/U_DataLink.pas @@ -4,7 +4,21 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, - Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses; + Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, 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; var DConString:String; {ȫַ} server, dtbase, user, pswd: String; {ݿӲ} diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 452cb8d..a893dbf 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -668,9 +668,9 @@ begin Th := LoadLibrary(Pchar(trim(DllName))); if Th > 0 then begin - try + try Tp := GetProcAddress(Th, 'CommOpen'); - if Tp <> nil then + if Tp <> nil then begin Tf := TMyFunc(Tp); newh := Tf(self.Handle, 'Comm1', 500, 1); @@ -704,13 +704,13 @@ var Tp: TFarProc; Th: Thandle; begin - // closeCom(FComFile); + // closeCom(FComFile); Th := LoadLibrary(Pchar(trim(DllNameT))); if Th > 0 then begin try - Tp := GetProcAddress(Th, 'CommOpen'); - if Tp <> nil then + Tp := GetProcAddress(Th, 'CommOpen'); + if Tp <> nil then begin Tf := TMyFunc(Tp); newh := Tf(self.Handle, 'Comm1', 500, 1); @@ -1782,7 +1782,11 @@ begin application.MessageBox('ȻܶΪ㣡', 'ʾϢ', 0); exit; end; - + if (strtofloatdef(trim(MJMaoZ.Text), 0) <10) or (strtofloatdef(trim(mjqty4.Text), 0) <10) then + begin + application.MessageBox('С10', 'ʾϢ', 0); + exit; + end; if Trim(FAPID) = '' then Exit;