Dollerok/P8-Panels
1
0
Fork 0
forked from CITKParus/P8-Panels
Code Issues Pull Requests Projects Releases Wiki Activity

ЦИТК-839 отработка примечания от 27.06.24

Browse Source
This commit is contained in:
Vladislav 2024-07-12 14:23:53 +03:00
parent 8d12d71cad
commit e25363c25a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/panels/eqs_prfrm/filter_dialog.js
View File

@ -52,9 +52,10 @@ const selectJuridicalPersons = (showDictionary, callBack) => {
}; };
//Выбор производственного объекта //Выбор производственного объекта
const selectEquipConfiguration = (showDictionary, callBack) => { const selectEquipConfiguration = (showDictionary, callBack, jurPersCode) => {
showDictionary({ showDictionary({
unitCode: "EquipConfiguration", unitCode: "EquipConfiguration",
inputParameters: jurPersCode ? [{ name: "in_JUR_PERS_CODE", value: jurPersCode }] : null,
callBack: res => (res.success === true ? callBack(res.outParameters.out_CODE) : callBack(null)) callBack: res => (res.success === true ? callBack(res.outParameters.out_CODE) : callBack(null))
}); });
}; };
@ -126,7 +127,7 @@ const FilterDialog = ({ initial, onCancel, onOk }) => {
elementCode="prodObj" elementCode="prodObj"
elementValue={filter.prodObj} elementValue={filter.prodObj}
labelText="Производственный объект" labelText="Производственный объект"
dictionary={callBack => selectEquipConfiguration(pOnlineShowDictionary, callBack)} dictionary={callBack => selectEquipConfiguration(pOnlineShowDictionary, callBack, filter.belong)}
required={true} required={true}
onChange={handleFilterItemChange} onChange={handleFilterItemChange}
/> />

20
db/PKG_P8PANELS_EQUIPSRV.pck
View File

@ -124,7 +124,8 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
/* Если графики ТОиР */ /* Если графики ТОиР */
if (NWORKTYPE = 0) then if (NWORKTYPE = 0) then
for C in (select T.RN, for C in (select T.RN,
T.COMPANY T.COMPANY,
T.CRN
from EQTCHSRV T, from EQTCHSRV T,
JURPERSONS J, JURPERSONS J,
EQTECSRVKIND SK, EQTECSRVKIND SK,
@ -162,7 +163,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
NDOCUMENT => C.RN, NDOCUMENT => C.RN,
SUNITCODE => 'EquipTechServices', SUNITCODE => 'EquipTechServices',
SACTIONCODE => null, SACTIONCODE => null,
NCRN => null, NCRN => C.CRN,
NDOCUMENT1 => null, NDOCUMENT1 => null,
SUNITCODE1 => null, SUNITCODE1 => null,
SACTIONCODE1 => null, SACTIONCODE1 => null,
@ -171,7 +172,8 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
/* Иначе ремонтные ведомости */ /* Иначе ремонтные ведомости */
else else
for C in (select T.RN, for C in (select T.RN,
T.COMPANY T.COMPANY,
T.CRN
from EQRPSHEETS T, from EQRPSHEETS T,
JURPERSONS J, JURPERSONS J,
EQTECSRVKIND SK, EQTECSRVKIND SK,
@ -199,7 +201,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
NDOCUMENT => C.RN, NDOCUMENT => C.RN,
SUNITCODE => 'EquipRepairSheets', SUNITCODE => 'EquipRepairSheets',
SACTIONCODE => null, SACTIONCODE => null,
NCRN => null, NCRN => C.CRN,
NDOCUMENT1 => null, NDOCUMENT1 => null,
SUNITCODE1 => null, SUNITCODE1 => null,
SACTIONCODE1 => null, SACTIONCODE1 => null,
@ -303,10 +305,13 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
EQS.RN NEQS_RN EQS.RN NEQS_RN
from EQTCHSRV EQV, from EQTCHSRV EQV,
JURPERSONS J, JURPERSONS J,
EQCONFIG EC,
DOCLINKS DL, DOCLINKS DL,
EQRPSHEETS EQS EQRPSHEETS EQS
where EQV.JUR_PERS = J.RN where EQV.JUR_PERS = J.RN
and J.CODE = SBELONG and J.CODE = SBELONG
and EQV.EQCONFIG = EC.RN
and EC.CODE = SPRODOBJ
and EQV.RN = DL.IN_DOCUMENT(+) and EQV.RN = DL.IN_DOCUMENT(+)
and DL.OUT_UNITCODE(+) = 'EquipRepairSheets' and DL.OUT_UNITCODE(+) = 'EquipRepairSheets'
and DL.OUT_DOCUMENT = EQS.RN(+)) B, and DL.OUT_DOCUMENT = EQS.RN(+)) B,
@ -340,13 +345,16 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
EQS.EQCONFIG NEQCONFIG, EQS.EQCONFIG NEQCONFIG,
EQS.TECSRVKIND NTECSRVKIND EQS.TECSRVKIND NTECSRVKIND
from EQRPSHEETS EQS, from EQRPSHEETS EQS,
JURPERSONS J JURPERSONS J,
EQCONFIG EC
where not exists (select 1 where not exists (select 1
from DOCLINKS DL from DOCLINKS DL
where DL.OUT_DOCUMENT = EQS.RN where DL.OUT_DOCUMENT = EQS.RN
and DL.IN_UNITCODE = 'EquipTechServices') and DL.IN_UNITCODE = 'EquipTechServices')
and EQS.JURPERSONS = J.RN and EQS.JURPERSONS = J.RN
and J.CODE = SBELONG) B, and J.CODE = SBELONG
and EQS.EQCONFIG = EC.RN
and EC.CODE = SPRODOBJ) B,
EQRPSHWRK C EQRPSHWRK C
where B.NEQS_RN = C.PRN(+)) TT, where B.NEQS_RN = C.PRN(+)) TT,
EQTECSRVKIND EK, EQTECSRVKIND EK,