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

Patch level : 12.0 598

Browse Source 
Files correlati     : tp0.exe

Modificati il salvataggio dei pesi CONAI sulle bolle importate
This commit is contained in:
AlexBonazzi 2018-07-11 01:17:27 +02:00
parent 8d91712b08
commit c902ecd3e0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/tp0.vcxproj
View File

@ -43,7 +43,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|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'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@ -76,7 +76,7 @@
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture> <Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -89,6 +89,7 @@
<DataExecutionPrevention> <DataExecutionPrevention>
</DataExecutionPrevention> </DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -136,6 +137,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version> <Version>12.0</Version>
<ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>

8
src/tp/tp0102.cpp
View File

@ -842,8 +842,8 @@ bool TPack_ddt::trasferisci()
if (peso_imballo_ddt.is_zero()) if (peso_imballo_ddt.is_zero())
peso_imballo_ddt = peso_imballo_anamag; peso_imballo_ddt = peso_imballo_anamag;
if (pesi_anamag > 1) // Con imballi composti da vari materiali devo riportare o riproporzionare // if (pesi_anamag > 1) // Con imballi composti da vari materiali devo riportare o riproporzionare
{ // {
// Arrotondo la eventuale differenza di pesi al grammo // Arrotondo la eventuale differenza di pesi al grammo
real diff = peso_imballo_ddt - peso_imballo_anamag; diff.round(3); real diff = peso_imballo_ddt - peso_imballo_anamag; diff.round(3);
// Il peso in bolla e' diverso da quello in anagrafica: devo riproporzionarli // Il peso in bolla e' diverso da quello in anagrafica: devo riproporzionarli
@ -861,12 +861,12 @@ bool TPack_ddt::trasferisci()
FOR_EACH_CONFIGURED_CONAI_CLASS(cc) FOR_EACH_CONFIGURED_CONAI_CLASS(cc)
rdoc.put(conai_peso_name(cc), art.conai_weight(cc)); rdoc.put(conai_peso_name(cc), art.conai_weight(cc));
} }
} /* }
else else
{ {
// Caso semplice della sola carta // Caso semplice della sola carta
rdoc.put(conai_peso_name(CONAI_CARTA), peso_imballo_ddt); rdoc.put(conai_peso_name(CONAI_CARTA), peso_imballo_ddt);
} } */
rdoc.put("FAMILY", get_str("FamilyCode")); // Uso campo virtuale RG1:FAMILY rdoc.put("FAMILY", get_str("FamilyCode")); // Uso campo virtuale RG1:FAMILY
} }