From c84b96f21e39bad230341a0335a886f4977264c9 Mon Sep 17 00:00:00 2001 From: Dollerino Date: Thu, 28 Nov 2024 18:18:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-930=20-=20=D0=94=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D1=8C=20"=D0=9C=D0=BE=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8=D0=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/plan_detail.js | 13 +++++- .../components/plans_list_item.js | 2 +- .../mech_rec_assembly_mon.js | 44 +++++++++++-------- db/PKG_P8PANELS_MECHREC.pck | 26 +++++------ 4 files changed, 48 insertions(+), 37 deletions(-) diff --git a/app/panels/mech_rec_assembly_mon/components/plan_detail.js b/app/panels/mech_rec_assembly_mon/components/plan_detail.js index c11481f..4292263 100644 --- a/app/panels/mech_rec_assembly_mon/components/plan_detail.js +++ b/app/panels/mech_rec_assembly_mon/components/plan_detail.js @@ -15,6 +15,7 @@ import { P8PSVG } from "../../../components/p8p_svg"; //Интерактивны import { P8P_DATA_GRID_CONFIG_PROPS } from "../../../config_wrapper"; //Подключение компонентов к настройкам приложения import { useCostProductComposition, useProductDetailsTable } from "../hooks"; //Вспомогательные хуки import { ProgressBox } from "./progress_box"; //Информация по прогрессу объекта +import { APP_STYLES } from "../../../../app.styles"; //Типовые стили //--------- //Константы @@ -26,6 +27,7 @@ const STYLES = { border: "1px solid", borderRadius: "25px", height: "35vh", + minHeight: "250px", backgroundColor: "background.detail_table" }, BOX_INFO_SUB: isMessage => ({ @@ -47,6 +49,7 @@ const STYLES = { border: "1px solid", borderRadius: "25px", height: "17vh", + minHeight: "120px", backgroundColor: "background.detail_info" }, PRODUCT_SELECTOR_CONTAINER: { @@ -57,6 +60,7 @@ const STYLES = { border: "1px solid", borderRadius: "25px", height: "53vh", + minHeight: "379px", marginTop: "16px", backgroundColor: "background.product_selector" }, @@ -72,7 +76,12 @@ const STYLES = { width: "280px", borderBottom: "1px solid" }, - TABLE_DETAILS: { backgroundColor: "background.detail_table", height: "240px" }, + TABLE_DETAILS: { + backgroundColor: "background.detail_table", + height: "28vh", + minHeight: "187px", + ...APP_STYLES.SCROLL + }, TABLE_DETAILS_HEADER_CELL: maxWidth => ({ backgroundColor: "background.detail_table", color: "text.detail_table.fontColor", @@ -107,7 +116,7 @@ const PlanSpecInfo = ({ planSpec }) => { - Номер изделия: + Номер заказа: {planSpec.SNUMB} diff --git a/app/panels/mech_rec_assembly_mon/components/plans_list_item.js b/app/panels/mech_rec_assembly_mon/components/plans_list_item.js index b652882..a8c04a9 100644 --- a/app/panels/mech_rec_assembly_mon/components/plans_list_item.js +++ b/app/panels/mech_rec_assembly_mon/components/plans_list_item.js @@ -72,7 +72,7 @@ const PlanSpecsListItem = ({ card, cardIndex, onClick }) => { - Номер изделия + Номер заказа {card.SNUMB || "-"} diff --git a/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js b/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js index 156dd7c..46225a3 100644 --- a/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js +++ b/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js @@ -240,26 +240,32 @@ const MechRecAssemblyMon = () => { {state.init == true ? ( state.selectedPlanCtlg.NRN ? ( - <> - - {title} + state.planSpecs.length !== 0 ? ( + <> + + {title} + + {state.planSpecsLoaded == true ? ( + state.selectedPlanSpec.NRN ? ( + + ) : ( + + + + ) + ) : null} + + ) : ( + + В каталоге планов отсутствуют записи подходящих первичных документов - {state.planSpecsLoaded == true ? ( - state.selectedPlanSpec.NRN ? ( - - ) : ( - - - - ) - ) : null} - + ) ) : ( Укажите каталог планов для отображения спецификаций diff --git a/db/PKG_P8PANELS_MECHREC.pck b/db/PKG_P8PANELS_MECHREC.pck index d85e03f..74db9ce 100644 --- a/db/PKG_P8PANELS_MECHREC.pck +++ b/db/PKG_P8PANELS_MECHREC.pck @@ -6218,16 +6218,18 @@ create or replace package body PKG_P8PANELS_MECHREC as D_YEAR(SP.REP_DATE_TO) NYEAR, COALESCE(SP.LABOUR_FACT, 0) NLABOUR_FACT, COALESCE(SP.LABOUR_PLAN, 0) NLABOUR_PLAN - from FCPRODPLAN P - left outer join FCPRODPLANSP SP - on P.RN = SP.PRN - and ((SP.LABOUR_PLAN is not null) or (SP.LABOUR_FACT is not null)), FINSTATE FS, ENPERIOD EN + from FCPRODPLAN P, + FCPRODPLANSP SP, + FINSTATE FS, + ENPERIOD EN where P.CRN = NCRN and P.CATEGORY = NFCPRODPLAN_CATEGORY_MON and P.STATUS = NFCPRODPLAN_STATUS_MON and FS.RN = P.TYPE and FS.CODE = SFCPRODPLAN_TYPE_MON and EN.RN = P.CALC_PERIOD + and SP.PRN = P.RN + and ((SP.LABOUR_PLAN is not null) or (SP.LABOUR_FACT is not null)) and exists (select /*+ INDEX(UP I_USERPRIV_JUR_PERS_ROLEID) */ null from USERPRIV UP @@ -6327,6 +6329,10 @@ create or replace package body PKG_P8PANELS_MECHREC as and P.CATEGORY = NFCPRODPLAN_CATEGORY_MON and P.STATUS = NFCPRODPLAN_STATUS_MON and P.COMPANY = GET_SESSION_COMPANY() + and exists (select null + from FCPRODPLANSP S + where S.PRN = P.RN + and ((S.LABOUR_PLAN is not null) or (S.LABOUR_FACT is not null))) and exists (select /*+ INDEX(UP I_USERPRIV_JUR_PERS_ROLEID) */ null from USERPRIV UP @@ -6424,17 +6430,7 @@ create or replace package body PKG_P8PANELS_MECHREC as into NRESULT from FCPRODPLAN T, FCPRODPLANSP S - where T.RN = (select P.RN - from DOCLINKS L, - FCPRODPLAN P, - FCPRODPLANSP SP - where SP.RN = NFCPRODPLANSP - and L.IN_DOCUMENT = SP.PRN - and L.IN_UNITCODE = 'CostProductPlans' - and L.OUT_UNITCODE = 'CostProductPlans' - and P.RN = L.OUT_DOCUMENT - and P.CATEGORY = 1 - and ROWNUM = 1) + where S.PRN_NODE = NFCPRODPLANSP and S.PRN = T.RN and S.PRODCMPSP = NPRODCMPSP; exception