admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#53547: MJOB: MJOB aanvullingen.

Browse Source 
svn path=/Database/trunk/; revision=38307
This commit is contained in:
Maykel Geerdink
2018-06-21 15:39:57 +00:00
parent 017e5f8a49
commit 4999f32fc0
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FAC/FAC_LCL.SRC
View File

@@ -1092,6 +1092,8 @@ FAC_LCL('lcl_mjb_inclbtw', 'Inclusief BTW', 'Including VAT')
FAC_LCL('lcl_mjb_dragdrop', 'Herplannen', 'Reschedule')
FAC_LCL('lcl_mjb_becancelled', 'Vervallen', 'Cancelled')
FAC_LCL('lcl_mjb_phasingout', 'Uitfasering', 'Phasing out')
FAC_LCL('lcl_mjb_completed', 'Uitgevoerd', 'Completed')
FAC_LCL('lcl_mjb_rejected', 'Afgewezen', 'Rejected')
FAC_LCL('lcl_mjb_status_mjob', 'Taakfilter', 'Task filter')
FAC_LCL('lcl_mjb_overruled_xcp', 'Aangepast', 'Overruled')
FAC_LCL('lcl_mjb_moved', 'Verschoven', 'Moved')
@@ -5026,7 +5028,6 @@ FAC_LCL('mgt_srtkenmerk_kenmerktype', 'Kenmerktype', 'Property type')
FAC_LCL('mgt_srtkenmerk_dimensie', 'Eenheid', 'Unit')
FAC_LCL('mgt_srtkenmerk_systeem', 'Systeemkenmerk', 'System property')
FAC_LCL('mgt_srtkenmerk_systeem_adv', 'Bijzonderheden', 'Special properties')
FAC_LCL('mgt_srtkenmerk_sysLOV', '0;Nee;1;Systeemkenmerk;2;In overzicht tonen;3;Systeemkenmerk en in lijst tonen', '0;No;1;System property;2;Show in overview;3;System property and show in list')
FAC_LCL('mgt_srtkenmerk_systeemLOV', '0;Nee;1;Systeemkenmerk;2;In overzicht tonen;3;Systeemkenmerk en in lijst tonen;4;Vertrouwelijk', '0;No;1;System property;2;Show in overview;3;System property and show in list;4;Confidential')
FAC_LCL('mgt_srtkenmerk_lengte', 'Lengte', 'Length')
FAC_LCL('mgt_srtkenmerk_dec', 'Decimalen', 'Decimals')

30
FAC/FAC_PAC.SRC
View File

@@ -4502,12 +4502,30 @@ CREATE OR REPLACE PACKAGE BODY fac AS
AND idsc.ins_deelsrtcontrole_status IN (5,6)
AND idsc.ins_scenario_key = 1
AND idsc.ins_deel_key = xcp.ins_deel_key
AND idsc.ins_deelsrtcontrole_key = (SELECT MAX(idsc2.ins_deelsrtcontrole_key)
FROM ins_deelsrtcontrole idsc2
WHERE idsc2.ins_deel_key = xcp.ins_deel_key
AND idsc2.ins_srtcontrole_key = xcp.ins_srtcontrole_key
AND idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1)), -- originele start, scenario 1
-- Voor mjob moeten de NIET succesvolle inspecties niet worden meegenomen.
-- Voor periodieke inspectie laten we het vooralsnog hetzelfde.
AND idsc.ins_deelsrtcontrole_key = (SELECT MAX(ins_deelsrtcontrole_key)
FROM (SELECT idsc2.ins_deelsrtcontrole_key
, idsc2.ins_deel_key
, idsc2.ins_srtcontrole_key
, 0 ctr_ismjob
FROM ins_deelsrtcontrole idsc2
WHERE idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1
UNION
SELECT idsc2.ins_deelsrtcontrole_key
, idsc2.ins_deel_key
, idsc2.ins_srtcontrole_key
, 1 ctr_ismjob
FROM ins_deelsrtcontrole idsc2,
ins_controlemode cm
WHERE idsc2.ins_controlemode_key = cm.ins_controlemode_key
AND idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1
AND cm.ins_controlemode_success = 1) aa
WHERE aa.ins_deel_key = xcp.ins_deel_key
AND aa.ins_srtcontrole_key = xcp.ins_srtcontrole_key
AND aa.ctr_ismjob = xcp.ctr_ismjob)),
xcp.ins_srtcontroledl_xcp_startdat,
xcp.ins_deel_aanmaak),
xcp.ins_srtcontrole_mode,

30
INS/INS_PAC.SRC
View File

@@ -223,12 +223,30 @@ CREATE OR REPLACE PACKAGE BODY ins AS
AND idsc.ins_deelsrtcontrole_status IN (5,6)
AND idsc.ins_scenario_key = 1
AND idsc.ins_deel_key = xcp.ins_deel_key
AND idsc.ins_deelsrtcontrole_key = (SELECT MAX(idsc2.ins_deelsrtcontrole_key)
FROM ins_deelsrtcontrole idsc2
WHERE idsc2.ins_deel_key = xcp.ins_deel_key
AND idsc2.ins_srtcontrole_key = xcp.ins_srtcontrole_key
AND idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1)),
-- Voor mjob moeten de NIET succesvolle inspecties niet worden meegenomen.
-- Voor periodieke inspectie laten we het vooralsnog hetzelfde.
AND idsc.ins_deelsrtcontrole_key = (SELECT MAX(ins_deelsrtcontrole_key)
FROM (SELECT idsc2.ins_deelsrtcontrole_key
, idsc2.ins_deel_key
, idsc2.ins_srtcontrole_key
, 0 ctr_ismjob
FROM ins_deelsrtcontrole idsc2
WHERE idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1
UNION
SELECT idsc2.ins_deelsrtcontrole_key
, idsc2.ins_deel_key
, idsc2.ins_srtcontrole_key
, 1 ctr_ismjob
FROM ins_deelsrtcontrole idsc2,
ins_controlemode cm
WHERE idsc2.ins_controlemode_key = cm.ins_controlemode_key
AND idsc2.ins_deelsrtcontrole_status IN (5,6)
AND idsc2.ins_scenario_key = 1
AND cm.ins_controlemode_success = 1) aa
WHERE aa.ins_deel_key = xcp.ins_deel_key
AND aa.ins_srtcontrole_key = xcp.ins_srtcontrole_key
AND aa.ctr_ismjob = xcp.ctr_ismjob)),
xcp.ins_srtcontroledl_xcp_startdat,
xcp.ins_deel_aanmaak),
xcp.ins_srtcontrole_mode,