root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : 
Commento            : 
- Spostato Trasferimento dati in mr0
- Aggiunta voce di menù
- Sistemati progetti  mr

git-svn-id: svn://10.65.10.50/branches/R_10_00@23397 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2016-11-07 08:32:41 +00:00
parent 9ab30e1bbf
commit ca806f920d
13 changed files with 68 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/mr.sln
View File

@ -1,12 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr0", "mr0.vcxproj", "{92083925-A9A5-4539-95E2-39EA1511D912}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr1", "mr1.vcxproj", "{F8DC72EE-59C2-40AB-BE1D-583AEAE6793D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr2", "mr2.vcxproj", "{3FC30246-14E2-47AE-AD86-DD78BC3C202B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -25,6 +29,14 @@ Global
{3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Debug|Win32.Build.0 = Debug|Win32
{3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Release|Win32.ActiveCfg = Release|Win32
{3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Release|Win32.Build.0 = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

26
build/mr0.vcxproj
View File

@ -39,13 +39,14 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EmbedManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@ -59,7 +60,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
@ -154,6 +155,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\mr\mr0600.cpp" />
<ClCompile Include="..\src\mr\mrplib.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -178,6 +180,7 @@
<MskCompiler Include="..\src\mr\mr0500a.uml" />
<MskCompiler Include="..\src\mr\mr0500b.uml" />
<MskCompiler Include="..\src\mr\mr0500c.uml" />
<MskCompiler Include="..\src\mr\mr0600a.uml" />
<MskCompiler Include="..\src\mr\mrtbfia.uml" />
<MskCompiler Include="..\src\mr\mrtbimp.uml" />
<MskCompiler Include="..\src\mr\mrtblnp.uml" />
@ -188,6 +191,7 @@
<ClInclude Include="..\src\mr\mr0500a.h" />
<ClInclude Include="..\src\mr\mr0500b.h" />
<ClInclude Include="..\src\mr\mr0500c.h" />
<ClInclude Include="..\src\mr\mr0600a.h" />
<ClInclude Include="..\src\mr\mrplib.h" />
<ClInclude Include="..\src\mr\mrtbfia.h" />
<ClInclude Include="..\src\mr\mrtbimp.h" />
@ -234,16 +238,12 @@
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\AgaLibd.lib" />
<Library Include="..\lib\vedoc.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\vedocd.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Library>
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="vedoc.vcxproj">
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

15
build/mr0.vcxproj.filters
View File

@ -54,6 +54,9 @@
<ClCompile Include="..\src\ve\velib04e.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\mr\mr0600.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\mr\mr0400a.uml">
@ -77,6 +80,9 @@
<MskCompiler Include="..\src\mr\mrtblnp.uml">
<Filter>Masks</Filter>
</MskCompiler>
<MskCompiler Include="..\src\mr\mr0600a.uml">
<Filter>Masks</Filter>
</MskCompiler>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\mr\mr0.h">
@ -106,6 +112,9 @@
<ClInclude Include="..\src\mr\mrtblnp.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\mr\mr0600a.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\mr\f132.trr">
@ -147,10 +156,4 @@
<Filter>Image</Filter>
</GifCompiler>
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib" />
<Library Include="..\lib\vedoc.lib" />
<Library Include="..\lib\vedocd.lib" />
<Library Include="..\lib\AgaLibd.lib" />
</ItemGroup>
</Project>

30
build/mr1.vcxproj
View File

@ -39,10 +39,10 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
@ -102,7 +102,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;..\xvaga;..\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -197,22 +197,12 @@
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\AgaLibd.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\vedoc.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\vedocd.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Library>
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="vedoc.vcxproj">
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/mr1.vcxproj.filters
View File

@ -56,10 +56,4 @@
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib" />
<Library Include="..\lib\AgaLibd.lib" />
<Library Include="..\lib\vedoc.lib" />
<Library Include="..\lib\vedocd.lib" />
</ItemGroup>
</Project>

26
build/mr2.vcxproj
View File

@ -38,14 +38,15 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EmbedManifest>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@ -59,7 +60,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -249,19 +250,12 @@
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\AgaLibd.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\vedoc.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</Library>
<Library Include="..\lib\vedocd.lib" />
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="vedoc.vcxproj">
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/mr2.vcxproj.filters
View File

@ -131,10 +131,4 @@
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\AgaLib.lib" />
<Library Include="..\lib\AgaLibd.lib" />
<Library Include="..\lib\vedoc.lib" />
<Library Include="..\lib\vedocd.lib" />
</ItemGroup>
</Project>

1
src/mr/mr0.cpp
View File

@ -9,6 +9,7 @@ int main(int argc, char** argv)
{
case 3: mr0400(argc, argv); break; // parametri ditta
case 4: mr0500(argc, argv); break; // rilevazione produzione
case 5: mr0600(argc, argv); break; // Trasferimento a Compass
default: mr0100(argc, argv);break; // M.R.P.
}
return 0;

1
src/mr/mr0.h
View File

@ -6,6 +6,7 @@ int mr0100(int argc, char* argv[]);
//int mr0300(int argc, char* argv[]);
int mr0400(int argc, char* argv[]);
int mr0500(int argc, char* argv[]);
int mr0600(int argc, char* argv[]);
#endif

6
src/ca/ca2600.cpp → src/mr/mr0600.cpp
View File

@ -6,7 +6,7 @@
#include <utility.h>
#include <doc.h>
#include "ca2600a.h"
#include "mr0600a.h"
class TCampass_msk : public TAutomask
{
@ -46,7 +46,7 @@ bool TCampass_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
return true;
}
TCampass_msk::TCampass_msk() : TAutomask("ca2600a")
TCampass_msk::TCampass_msk() : TAutomask("mr0600a")
{
set(F_DSN, ini_get_string(CONFIG_DITTA, "Campo_Compass", "DSN"));
set(F_USR, ini_get_string(CONFIG_DITTA, "Campo_Compass", "User"));
@ -750,7 +750,7 @@ void TCampass_app::main_loop()
}
int ca2600(int argc, char* argv[])
int mr0600(int argc, char* argv[])
{
TCampass_app app;
// Imposto le tabelle da utilizzare

0
src/ca/ca2600a.h → src/mr/mr0600a.h
View File

2
src/ca/ca2600a.uml → src/mr/mr0600a.uml
View File

@ -1,4 +1,4 @@
#include "ca2600a.h"
#include "mr0600a.h"
TOOLBAR "topbar" 0 0 0 2

12
src/mr/mrmenu.men
View File

@ -8,11 +8,13 @@ Item_02 = "Pianificazione ordini", "mr2 -1", "F"
Item_03 = "M.R.P.", "mr2 -0", "F"
Item_04 = "Rilevazione produzione", "mr0 -4", "F"
Item_05 = "Pianificazione acquisti", "mr2 -3", "F"
Item_06 = "Stampe", [MRMENU_040]
Item_07 = "Archivi", [MRMENU_010]
Item_08 = "Stampe archivi", [MRMENU_020]
Item_09 = "Servizi", [MRMENU_030]
Item_10 = "Configurazione MRP", [MRMENU_080]
Item_06 = "Trasmissione a Compass", "mr0 -5", "F"
Item_07 = "Stampe", [MRMENU_040]
Item_08 = "Archivi", [MRMENU_010]
Item_09 = "Stampe archivi", [MRMENU_020]
Item_10 = "Servizi", [MRMENU_030]
Item_11 = "Configurazione MRP", [MRMENU_080]
[MRMENU_010]
Caption = "Gestione archivi"