From e25363c25a7e12bd337d5f6a09228ae63b8cd67f Mon Sep 17 00:00:00 2001
From: davay-popozhe <davay.popozhe@yandex.ru>
Date: Fri, 12 Jul 2024 14:23:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-839=20=D0=BE=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=82=2027.?=
 =?UTF-8?q?06.24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/panels/eqs_prfrm/filter_dialog.js |  5 +++--
 db/PKG_P8PANELS_EQUIPSRV.pck          | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/panels/eqs_prfrm/filter_dialog.js b/app/panels/eqs_prfrm/filter_dialog.js
index 9f79a6e..831c270 100644
--- a/app/panels/eqs_prfrm/filter_dialog.js
+++ b/app/panels/eqs_prfrm/filter_dialog.js
@@ -52,9 +52,10 @@ const selectJuridicalPersons = (showDictionary, callBack) => {
 };
 
 //Выбор производственного объекта
-const selectEquipConfiguration = (showDictionary, callBack) => {
+const selectEquipConfiguration = (showDictionary, callBack, jurPersCode) => {
     showDictionary({
         unitCode: "EquipConfiguration",
+        inputParameters: jurPersCode ? [{ name: "in_JUR_PERS_CODE", value: jurPersCode }] : null,
         callBack: res => (res.success === true ? callBack(res.outParameters.out_CODE) : callBack(null))
     });
 };
@@ -126,7 +127,7 @@ const FilterDialog = ({ initial, onCancel, onOk }) => {
                             elementCode="prodObj"
                             elementValue={filter.prodObj}
                             labelText="Производственный объект"
-                            dictionary={callBack => selectEquipConfiguration(pOnlineShowDictionary, callBack)}
+                            dictionary={callBack => selectEquipConfiguration(pOnlineShowDictionary, callBack, filter.belong)}
                             required={true}
                             onChange={handleFilterItemChange}
                         />
diff --git a/db/PKG_P8PANELS_EQUIPSRV.pck b/db/PKG_P8PANELS_EQUIPSRV.pck
index 22d188c..e748fc5 100644
--- a/db/PKG_P8PANELS_EQUIPSRV.pck
+++ b/db/PKG_P8PANELS_EQUIPSRV.pck
@@ -124,7 +124,8 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
     /* Если графики ТОиР */
     if (NWORKTYPE = 0) then
       for C in (select T.RN,
-                       T.COMPANY
+                       T.COMPANY,
+                       T.CRN
                   from EQTCHSRV       T,
                        JURPERSONS     J,
                        EQTECSRVKIND   SK,
@@ -162,7 +163,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
                                  NDOCUMENT    => C.RN,
                                  SUNITCODE    => 'EquipTechServices',
                                  SACTIONCODE  => null,
-                                 NCRN         => null,
+                                 NCRN         => C.CRN,
                                  NDOCUMENT1   => null,
                                  SUNITCODE1   => null,
                                  SACTIONCODE1 => null,
@@ -171,7 +172,8 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
       /* Иначе ремонтные ведомости */
     else
       for C in (select T.RN,
-                       T.COMPANY
+                       T.COMPANY,
+                       T.CRN
                   from EQRPSHEETS   T,
                        JURPERSONS   J,
                        EQTECSRVKIND SK,
@@ -199,7 +201,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
                                  NDOCUMENT    => C.RN,
                                  SUNITCODE    => 'EquipRepairSheets',
                                  SACTIONCODE  => null,
-                                 NCRN         => null,
+                                 NCRN         => C.CRN,
                                  NDOCUMENT1   => null,
                                  SUNITCODE1   => null,
                                  SACTIONCODE1 => null,
@@ -303,10 +305,13 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
                                   EQS.RN            NEQS_RN
                              from EQTCHSRV   EQV,
                                   JURPERSONS J,
+                                  EQCONFIG   EC,
                                   DOCLINKS   DL,
                                   EQRPSHEETS EQS
                             where EQV.JUR_PERS = J.RN
                               and J.CODE = SBELONG
+                              and EQV.EQCONFIG = EC.RN
+                              and EC.CODE = SPRODOBJ
                               and EQV.RN = DL.IN_DOCUMENT(+)
                               and DL.OUT_UNITCODE(+) = 'EquipRepairSheets'
                               and DL.OUT_DOCUMENT = EQS.RN(+)) B,
@@ -340,13 +345,16 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as
                                   EQS.EQCONFIG     NEQCONFIG,
                                   EQS.TECSRVKIND   NTECSRVKIND
                              from EQRPSHEETS EQS,
-                                  JURPERSONS J
+                                  JURPERSONS J,
+                                  EQCONFIG   EC
                             where not exists (select 1
                                      from DOCLINKS DL
                                     where DL.OUT_DOCUMENT = EQS.RN
                                       and DL.IN_UNITCODE = 'EquipTechServices')
                               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
                     where B.NEQS_RN = C.PRN(+)) TT,
                   EQTECSRVKIND EK,