Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Исправление обработки закрытия предприятия #403

Merged
merged 1 commit into from
Oct 16, 2020
Merged

Исправление обработки закрытия предприятия #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion epf/ЗакрытьПредприятие/ЗакрытьПредприятие.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
</Synonym>
<Comment/>
<DefaultForm>ExternalDataProcessor.ЗакрытьПредприятие.Form.Форма</DefaultForm>
<AuxiliaryForm/>
<AuxiliaryForm>ExternalDataProcessor.ЗакрытьПредприятие.Form.ФормаОбычная</AuxiliaryForm>
</Properties>
<ChildObjects>
<Form>Форма</Form>
<Form>ФормаОбычная</Form>
</ChildObjects>
</ExternalDataProcessor>
</MetaDataObject>
5 changes: 2 additions & 3 deletions epf/ЗакрытьПредприятие/ЗакрытьПредприятие/Forms/Форма/Ext/Form/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
&НаКлиенте
Процедура ПриОткрытии(Отказ)
Если Не ЭтоКонфигурацияНаБазеБСПСервер() Тогда
ЗавершитьРаботуСистемы(Ложь, Ложь);
ПрекратитьРаботуСистемы();
//Сообщить("Заглушка - завершаем работу системы");
Возврат;
КонецЕсли;
Expand Down Expand Up @@ -190,7 +190,7 @@

&НаКлиенте
Процедура ЗавершитьРаботу() Экспорт
ЗавершитьРаботуСистемы(Истина);
ПрекратитьРаботуСистемы();
КонецПроцедуры

&НаСервереБезКонтекста
Expand All @@ -211,7 +211,6 @@
Возврат Рез;
КонецФункции


СчетчикОжиданияРезультатов = 0;
МаксИтерацийОжиданияРезультатов = 5;
ИндикаторВыполнения = 0;
Expand Down
22 changes: 22 additions & 0 deletions epf/ЗакрытьПредприятие/ЗакрытьПредприятие/Forms/ФормаОбычная.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
<Form uuid="fa845783-8a44-4ef2-8899-875f1ccbbe77">
<Properties>
<Name>ФормаОбычная</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Форма обычная</v8:content>
</v8:item>
</Synonym>
<Comment/>
<FormType>Ordinary</FormType>
<IncludeHelpInContents>false</IncludeHelpInContents>
<UsePurposes>
<v8:Value xsi:type="app:ApplicationUsePurpose">PersonalComputer</v8:Value>
<v8:Value xsi:type="app:ApplicationUsePurpose">MobileDevice</v8:Value>
</UsePurposes>
<ExtendedPresentation/>
</Properties>
</Form>
</MetaDataObject>
Binary file added epf/ЗакрытьПредприятие/ЗакрытьПредприятие/Forms/ФормаОбычная/Ext/Form.bin
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions epf/ЗакрытьПредприятие/ЗакрытьПредприятие/Forms/ФормаОбычная/Ext/Form/Module.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

Процедура ПриОткрытии()

ПрекратитьРаботуСистемы();

КонецПроцедуры
119 changes: 119 additions & 0 deletions epf/ЗакрытьПредприятие/ЗакрытьПредприятие/Forms/ФормаОбычная/Ext/Form/form
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
{27,
{18,
{
{1,1,
{"ru","Обработка Закрыть предприятие при обновлении"}
},3,4294967295},
{09ccdc77-ea1a-4a6d-ab1c-3435eada2433,
{1,
{
{16,1,
{3,4,
{0}
},
{3,4,
{0}
},
{7,3,0,1,100},0,
{3,4,
{0}
},
{3,4,
{0}
},
{3,4,
{0}
},
{3,3,
{-7}
},
{3,3,
{-21}
},
{3,0,
{0},0,0,0,48312c09-257f-4b29-b280-284dd89efc1e},
{1,0},0,0,100,0,0},26,0,0,0,0,0,0,
{8,1,
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},100,0,0,0},0,1,
{1,1,
{4,
{1,1,
{"ru","Страница1"}
},
{8,0,
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},100,0,0,0},-1,1,1,"Страница1",1,
{3,4,
{0}
},
{3,4,
{0}
}
}
},1,1,0,4,
{2,8,1,1,1,0,0,0,0},
{2,8,0,1,2,0,0,0,0},
{2,317,1,1,3,0,0,8,0},
{2,35,0,1,4,0,0,8,0},0,4294967295,5,64,0,
{3,4,
{0}
},0,0,57,0,0},
{0}
},
{0}
},325,43,1,0,1,4,4,2,325,43,96},
{
{0},1,
{1,
{
{0},0,0,1,"ОбработкаОбъект",
{"Pattern",
{"#",62fa8549-434b-4610-8c50-5c7b6440a25b}
}
}
},
{0}
},
{59d6c227-97d3-46f6-84a0-584c5a2807e1,1,
{2,0,
{0,0},
{0},1}
},
{1,
{70001,e1692cc2-605b-4535-84dd-28440238746c,
{3,"ПриОткрытии",
{1,"ПриОткрытии",
{1,1,
{"ru","При открытии"}
},
{1,1,
{"ru","При открытии"}
},
{1,1,
{"ru","При открытии"}
},
{4,0,
{0},"",-1,-1,1,0,""},
{0,0,0}
}
}
}
},1,4,1,0,0,0,
{0},
{0},
{8,0,
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},
{4,0,
{0},"",-1,-1,1,0,""},100,0,0,0},1,2,0,0,1,1}