diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-07 20:53:07 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-07 20:53:07 +0300 |
| commit | 031fdf36d4b96c581860032e6539470e132dbd07 (patch) | |
| tree | bb154515e415bf37bb411ad4fe13fdaa698da5f2 /Software/Visual_Studio/PPC | |
| parent | 956950cc0fd27415cbf32523c1bf8a86c011b86c (diff) | |
| download | Tango-031fdf36d4b96c581860032e6539470e132dbd07.tar.gz Tango-031fdf36d4b96c581860032e6539470e132dbd07.zip | |
Job weight calcualtion is incorrect
Related Work Items: #8380
Diffstat (limited to 'Software/Visual_Studio/PPC')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs index e523ad73e..e36dd3c63 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/LengthToWeightConverter.cs @@ -17,8 +17,8 @@ namespace Tango.PPC.Jobs.Converters { double length = System.Convert.ToDouble(values[0]); double coef = System.Convert.ToDouble(values[1]); - int spools = System.Convert.ToInt32(values[2]); - var weight = ((double)length * spools * coef) / (1000);//(g) + //int spools = System.Convert.ToInt32(values[2]); + var weight = ((double)length * coef) / (1000);//(g) return weight; } catch (Exception ex) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml index 545b380e5..369544e9f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml @@ -1204,8 +1204,7 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" > <Binding Path="JobModel.Length" Mode="OneWay"/> <Binding Path="JobModel.GramPerLength" Mode="OneWay"/> - <Binding Path="JobModel.NumberSpools" Mode="OneWay"/> - </MultiBinding> + </MultiBinding> </Run.Text> </Run> <Run Text="g" FontWeight="DemiBold"></Run> @@ -1222,8 +1221,7 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" > <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/> <Binding Path="JobModel.GramPerLength" Mode="OneWay"/> - <Binding Path="JobModel.NumberSpools" Mode="OneWay"/> - </MultiBinding> + </MultiBinding> </Run.Text> </Run> <Run Text="g" FontWeight="DemiBold"></Run> @@ -1267,8 +1265,7 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" > <Binding Path="JobModel.Length" Mode="OneWay"/> <Binding Path="JobModel.GramPerLength" Mode="OneWay"/> - <Binding Path="JobModel.NumberSpools" Mode="OneWay"/> - </MultiBinding> + </MultiBinding> </Run.Text> </Run> <Run Text="g" FontWeight="DemiBold"></Run> @@ -1289,8 +1286,7 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" > <Binding Path="JobModel.LengthIncludingNumberOfUnitsAndSpools" Mode="OneWay"/> <Binding Path="JobModel.GramPerLength" Mode="OneWay"/> - <Binding Path="JobModel.NumberSpools" Mode="OneWay"/> - </MultiBinding> + </MultiBinding> </Run.Text> </Run> <Run Text="g" FontWeight="DemiBold"></Run> @@ -1318,7 +1314,6 @@ <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" > <Binding Path="JobModel.LengthIncludingNumberOfUnits" Mode="OneWay"/> <Binding Path="JobModel.GramPerLength" Mode="OneWay"/> - <Binding Path="JobModel.NumberSpools" Mode="OneWay"/> </MultiBinding> </Run.Text> </Run> |