Dalsi zmeny
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
unit uSvc_Vyroba;
|
||||
unit uSvc_Vyroba;
|
||||
|
||||
interface
|
||||
{$I 'GlobalDefs.inc'}
|
||||
@ -56,25 +56,33 @@ const
|
||||
+ '(SELECT TOP(1) pracoviste FROM ' + tblCPrac + ' WHERE ID=main.IDPracoviste) AS KodPracoviste,'
|
||||
+ '(SELECT TOP(1) Nazev FROM ' + tblCPrac + ' WHERE ID=main.IDPracoviste) AS NazevPracoviste';
|
||||
|
||||
selNazevOperaceEvidROpR = '(SELECT TOP(1) Nazev FROM ' + tblPrPost + ' WHERE IDOdchylkyDo IS NULL AND Doklad=main.DokladPrPostup AND Alt=main.AltPrPostup'
|
||||
+ ' AND IDPrikaz=main.IDPrikaz /*AND Priorita=0*/ ) AS NazevOperace, (SELECT TOP(1) k.Nazev1 FROM ' + tblPrikaz + ' p INNER JOIN '
|
||||
+ tblKZ + ' k ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS Nazev1Dilce, (SELECT TOP(1) k.SkupZbo FROM ' + tblPrikaz + ' p INNER JOIN '
|
||||
+ tblKZ + ' k ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS SkupZboDilce, (SELECT TOP(1) k.RegCis FROM ' + tblPrikaz + ' p INNER JOIN '
|
||||
+ tblKZ + ' k ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS RegCisDilce';
|
||||
selNazevOperaceEvidROpR = '(SELECT TOP(1) Nazev FROM ' + tblPrPost + ' WITH(NOLOCK) WHERE IDOdchylkyDo IS NULL AND Doklad=main.DokladPrPostup AND Alt=main.AltPrPostup'
|
||||
+ ' AND IDPrikaz=main.IDPrikaz /*AND Priorita=0*/ ) AS NazevOperace, (SELECT TOP(1) k.Nazev1 FROM ' + tblPrikaz + ' p JOIN '
|
||||
+ tblKZ + ' k WITH(NOLOCK) ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS Nazev1Dilce, (SELECT TOP(1) k.SkupZbo FROM ' + tblPrikaz + ' p JOIN '
|
||||
+ tblKZ + ' k WITH(NOLOCK) ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS SkupZboDilce, (SELECT TOP(1) k.RegCis FROM ' + tblPrikaz + ' p JOIN '
|
||||
+ tblKZ + ' k WITH(NOLOCK) ON (k.ID=p.IDTabKmen) WHERE p.ID=main.IDPrikaz) AS RegCisDilce'
|
||||
+ ', CONVERT(bit, ISNULL( (SELECT Odvadeci FROM ' + tblPrPost + ' WITH(NOLOCK) WHERE IDOdchylkyDo IS NULL AND Doklad=main.DokladPrPostup'
|
||||
+ ' AND Alt=main.AltPrPostup AND IDPrikaz=main.IDPrikaz), 0)) AS Odvadeci'
|
||||
+ ', ISNULL( (SELECT Operace FROM ' + tblPrPost + ' WITH(NOLOCK) WHERE IDOdchylkyDo IS NULL AND Doklad=main.DokladPrPostup'
|
||||
+ ' AND Alt=main.AltPrPostup AND IDPrikaz=main.IDPrikaz), N'''') AS Operace'
|
||||
{$IFDEF CUSTOM_CTRL_INCOSystems}
|
||||
+ ', dbo.ef_Vyroba_EvidROpR_MamNeuzavrenouPredchozi (main.IDPrikaz, main.DokladPrPostup, main.AltPrPostup) AS MamNeuzavrenePredchozi'
|
||||
{$ENDIF}
|
||||
;
|
||||
|
||||
selOperaceSpec = '(SELECT COUNT(ID) FROM ' + tblKPLHlav + ' WHERE DruhDokladu=5 AND IDOperace=TabPrPostup.ID) AS PocetKP'
|
||||
selOperaceSpec = '(SELECT COUNT(ID) FROM ' + tblKPLHlav + ' WITH(NOLOCK) WHERE DruhDokladu=5 AND IDOperace=TabPrPostup.ID) AS PocetKP'
|
||||
+ ', TabPrPostup.Kusy_zad AS _info_Kusy_zad, TabPrPostup.Kusy_nepotrebne AS _info_Kusy_nepotrebne, TabPrPostup.Kusy_pozadovane AS _info_Kusy_pozadovane'
|
||||
+ ', TabPrPostup.ProcSplneni AS _info_ProcSplneni, TabPrPostup.Kusy_zive AS _info_Kusy_zive, TabPrPostup.Kusy_odv AS _info_Kusy_odv'
|
||||
+ ', TabPrPostup.Kusy_zmet AS _info_Kusy_zmet, TabPrPostup.Kusy_zmet_opr_IO AS _info_Kusy_zmet_opr_IO, TabPrPostup.Kusy_zmet_neopr AS _info_Kusy_zmet_neopr'
|
||||
+ ', (SELECT s.Nazev FROM ' + tblCisStroj + ' s WHERE s.ID=main.IDStroje) AS StrojNazev, (SELECT s.Kod FROM ' + tblCisStroj + ' s WHERE s.ID=main.IDStroje) AS StrojKod';
|
||||
+ ', (SELECT s.Nazev FROM ' + tblCisStroj + ' s WITH(NOLOCK) WHERE s.ID=main.IDStroje) AS StrojNazev, (SELECT s.Kod FROM ' + tblCisStroj + ' s WHERE s.ID=main.IDStroje) AS StrojKod';
|
||||
|
||||
|
||||
selPolKoopObjSpec = '';
|
||||
|
||||
selVyrCisPrikazSpec = '';
|
||||
|
||||
selEvidOperace = '(SELECT IDEvidRozpracOper FROM ' + tblRozpracOperR + ' WHERE ID=main.IDEvidRozpracOperR) AS IDEvidRozpracOper'
|
||||
+ ', (SELECT nazev FROM ' + tblPrPost + ' WHERE IDPrikaz=main.IDPrikaz AND Doklad=main.DokladPrPostup AND Alt=main.AltPrPostup AND IDOdchylkyDo IS NULL) AS NazevOperace';
|
||||
selEvidOperace = '(SELECT IDEvidRozpracOper FROM ' + tblRozpracOperR + ' WITH(NOLOCK) WHERE ID=main.IDEvidRozpracOperR) AS IDEvidRozpracOper'
|
||||
+ ', (SELECT nazev FROM ' + tblPrPost + ' WITH(NOLOCK) WHERE IDPrikaz=main.IDPrikaz AND Doklad=main.DokladPrPostup AND Alt=main.AltPrPostup AND IDOdchylkyDo IS NULL) AS NazevOperace';
|
||||
|
||||
selTPVStroj = 'p.pracoviste';
|
||||
|
||||
@ -810,8 +818,8 @@ uses
|
||||
{ TVyrobniPrikazService }
|
||||
|
||||
function TVyrobniPrikazService.GetByID (const AID: integer; params: TDictionary<string,string>=nil): TVyrobniPrikaz;
|
||||
var lSQL, strTemp: string;
|
||||
id, rNum: integer;
|
||||
var lSQL, strTemp, stav: string;
|
||||
id, rNum, iStav: integer;
|
||||
p: TDictionary<string, string>;
|
||||
debug, stopDebug, operace, material: boolean;
|
||||
lOper: TObjectList<TVyrobniOperace>;
|
||||
@ -847,7 +855,7 @@ uses
|
||||
lQry.Connection:= sqlConnX;
|
||||
lQry.Open(lSQL, [AID]);
|
||||
if (lQry.RecordCount>0) then
|
||||
extInfoStr:= lQry.AsJSONObjectString;
|
||||
extInfoStr:= lQry.AsJSONObject;
|
||||
finally
|
||||
lQry.Free;
|
||||
end;
|
||||
@ -858,8 +866,13 @@ uses
|
||||
material:= false;
|
||||
debug:= false;
|
||||
stopDebug:= false;
|
||||
stav:= '';
|
||||
|
||||
if (params<>nil) then
|
||||
begin
|
||||
if (params.ContainsKey('stav')) then
|
||||
if (params.Items['stav']<>'') then
|
||||
stav:= params.Items['stav'];
|
||||
if (params.ContainsKey('operace')) then
|
||||
if (params.Items['operace']='1') then
|
||||
operace:= true;
|
||||
@ -879,6 +892,13 @@ uses
|
||||
lSQL:= 'SELECT ' + GetTabCols('', tblVPr, 'main', false) + IfThen(selPrikazSpec<>'', ',' + selPrikazSpec, '') + ' FROM ' + tblVPr + ' main'
|
||||
+ ' INNER JOIN ' + tblKZ + ' kz ON (kz.ID=main.IDTabKmen) LEFT JOIN ' + tblZak + ' zak ON (zak.ID=main.IDZakazka)'
|
||||
+ ' LEFT JOIN ' + tblZakazModif + ' zmod ON (zmod.ID=main.IDZakazModif) WHERE main.ID=:ID';
|
||||
if (stav<>'') then
|
||||
begin
|
||||
if not(TryStrToInt(stav, iStav)) then
|
||||
iStav:= 0;
|
||||
if (iStav>0) then
|
||||
lSQL:= lSQL + ' AND main.StavPrikazu=' + iStav.ToString;
|
||||
end;
|
||||
if (selPrikazSpec='') then
|
||||
lSQL:= lSQL.Replace('TabPrikaz.', 'main.');
|
||||
|
||||
@ -1596,7 +1616,7 @@ uses
|
||||
lQry.Connection:= sqlConnX;
|
||||
lQry.Open(lSQL, [AID]);
|
||||
if (lQry.RecordCount>0) then
|
||||
extInfoStr:= lQry.AsJSONObjectString;
|
||||
extInfoStr:= lQry.AsJSONObject;
|
||||
finally
|
||||
lQry.Free;
|
||||
end;
|
||||
@ -2262,7 +2282,7 @@ uses
|
||||
try
|
||||
lQry.Open(lSQL, [AID]);
|
||||
if (lQry.RecordCount>0) then
|
||||
extInfoStr:= lQry.AsJSONObjectString;
|
||||
extInfoStr:= lQry.AsJSONObject;
|
||||
finally
|
||||
lQry.Free;
|
||||
end;
|
||||
|
||||
Reference in New Issue
Block a user