Compare commits

..

No commits in common. "147114a4ae7770bbd1bbcfe63496408eabb16a0c" and "68a3e8b2be94eaded77c6dafdd31d8d2209d605d" have entirely different histories.

3 changed files with 9 additions and 9 deletions

View File

@ -107,7 +107,7 @@ const PlanSpecInfo = ({ planSpec }) => {
<Box sx={STYLES.PLAN_INFO_MAIN}> <Box sx={STYLES.PLAN_INFO_MAIN}>
<Box sx={STYLES.PLAN_INFO_SUB}> <Box sx={STYLES.PLAN_INFO_SUB}>
<Typography variant="PlanSpecInfo" mt={1}> <Typography variant="PlanSpecInfo" mt={1}>
Номер изделия: Номер борта:
</Typography> </Typography>
<Typography variant="subtitle2">{planSpec.SNUMB}</Typography> <Typography variant="subtitle2">{planSpec.SNUMB}</Typography>
</Box> </Box>

View File

@ -70,11 +70,11 @@ const PlanSpecsListItem = ({ card, cardIndex, onClick }) => {
return ( return (
<Box sx={STYLES.CONTAINER} onClick={() => (onClick ? onClick(card, cardIndex) : null)}> <Box sx={STYLES.CONTAINER} onClick={() => (onClick ? onClick(card, cardIndex) : null)}>
<PlanSpecsListItemImage card={card} /> <PlanSpecsListItemImage card={card} />
<Box textAlign="center" height="70px"> <Box textAlign="center">
<Typography variant="PlanSpecInfo" sx={STYLES.TEXT_INFO_FIELD}> <Typography variant="PlanSpecInfo" sx={STYLES.TEXT_INFO_FIELD}>
Номер изделия Номер борта
</Typography> </Typography>
<Typography variant="h2">{card.SNUMB || "-"}</Typography> <Typography variant="h2">{card.SNUMB}</Typography>
</Box> </Box>
<ProgressBox <ProgressBox
progress={card.NPROGRESS} progress={card.NPROGRESS}
@ -84,12 +84,12 @@ const PlanSpecsListItem = ({ card, cardIndex, onClick }) => {
progressVariant={"h3"} progressVariant={"h3"}
detailVariant={"PlanSpecProgressDetail"} detailVariant={"PlanSpecProgressDetail"}
/> />
<Box height="70px"> <Box>
<Typography variant="PlanSpecInfo" sx={STYLES.TEXT_INFO_FIELD}> <Typography variant="PlanSpecInfo" sx={STYLES.TEXT_INFO_FIELD}>
Год выпуска: Год выпуска:
</Typography> </Typography>
<Typography variant="subtitle1" mt={-1}> <Typography variant="subtitle1" mt={-1}>
{card.NYEAR || "-"} {card.NYEAR}
</Typography> </Typography>
</Box> </Box>
</Box> </Box>

View File

@ -6195,11 +6195,11 @@ create or replace package body PKG_P8PANELS_MECHREC as
/* Определяем детализацию по прогрессу */ /* Определяем детализацию по прогрессу */
case case
when (NPROGRESS >= 70) then when (NPROGRESS >= 70) then
SRESULT := 'Основная сборка'; SRESULT := 'Основная сборка: Стыковка агрегатов выполнена';
when (NPROGRESS >= 40) then when (NPROGRESS >= 40) then
SRESULT := 'Изготовление агрегатов'; SRESULT := 'Изготовление агрегатов: Фюзеляж и ОЧК не переданы в цех ОС';
when (NPROGRESS >= 10) then when (NPROGRESS >= 10) then
SRESULT := 'Изготовление ДСЕ'; SRESULT := 'Изготовление ДСЕ: Фюзеляж и ОЧК не укомлектованы ДСЕ';
else else
SRESULT := 'Изготовление ДСЕ не начато'; SRESULT := 'Изготовление ДСЕ не начато';
end case; end case;