From 08c9459f40101adaef522182e01bbae0ff812c0b Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 18 Apr 2024 18:21:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=94:=20=D0=9F=D0=B0=D0=BD=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=20"=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2"=20-=20=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=B0=D1=8F=20=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=B0=D1=82=D1=8B=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?= =?UTF-8?q?=D0=B0=20(=D0=BF=D0=BE=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5?= =?UTF-8?q?=D0=B9=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?)=20=D0=B8=20=D0=B4=D0=B0=D1=82=D1=8B=20=D1=84=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B0=20(=D0=BF=D0=BE=20"=D0=9F=D0=BB=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=D0=BC=20=D0=B8=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0=D0=BC=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/PKG_P8PANELS_PROJECTS.pck | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/db/PKG_P8PANELS_PROJECTS.pck b/db/PKG_P8PANELS_PROJECTS.pck index 0e70042..4be75bf 100644 --- a/db/PKG_P8PANELS_PROJECTS.pck +++ b/db/PKG_P8PANELS_PROJECTS.pck @@ -6123,10 +6123,20 @@ text="Проверить, что для расчётных полей дата- if (DBEGIN is null) then DBEGIN := TRUNC(sysdate, 'yyyy'); else - DBEGIN := TRUNC(DBEGIN, 'yyyy'); + DBEGIN := TRUNC(DBEGIN, 'mm'); end if; /* Обработаем дату факта */ - DFACT := TO_DATE('01.01.2022', 'DD.MM.YYYY'); + if (DFACT is null) then + select LAST_DAY(TRUNC(COALESCE(max(ENP.ENDDATE), DBEGIN), 'mm')) + into DFACT + from PRJDEPLAN T, + ENPERIOD ENP + where T.COMPANY = NCOMPANY + and T.STATE = 2 + and T.PERIOD = ENP.RN; + else + DFACT := LAST_DAY(TRUNC(DFACT, 'mm')); + end if; /* Обработаем единицу измерения длительности (пока - она всегда должна быть "день", по умолчанию) */ NDURATION_MEAS := NJB_DURATION_MEAS; /* Обработаем единицу измерения трудоёмкости (пока - она всегда должна быть "ч/ч", по умолчанию) */