Skip to content

Commit c276b02

Browse files
committed
RELEASE: 2.0.2.2
1 parent 7f96bfd commit c276b02

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

Src/Apps/Desktop/ScalesDesktop/Platforms/Windows/Package.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
1212
IgnorableNamespaces="uap rescap uap3 uap6 iot uap4 uap2">
1313

14-
<Identity Name="maui-package-name-placeholder" Publisher="CN=Владимирский Стандарт" Version="2.0.2.7" />
14+
<Identity Name="maui-package-name-placeholder" Publisher="CN=Владимирский Стандарт" Version="2.0.2.2" />
1515

1616
<mp:PhoneIdentity PhoneProductId="EC66F7DD-78BD-4919-99F7-6D5AD5A05E41" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1717

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"FullScreenMode": true,
33
"Api": {
4-
"BaseUrl": "https://scales-desktop-api-dev.kolbasa-vs.local"
4+
"BaseUrl": "https://scales-api.kolbasa-vs.local/api/desktop"
55
}
66
}

Src/Apps/Desktop/Ws.Desktop.Api/App/Features/Plu/Impl/Weight/PluWeightService.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public List<PluWeight> GetAllWeightByArm(Guid uid)
5555

5656
#region Commands
5757

58+
// FIX: dto naming
5859
public WeightLabel GenerateLabel(Guid armId, Guid pluId, CreateWeightLabelDto dto)
5960
{
6061
Arm line = armService.GetItemByUid(armId);
@@ -63,7 +64,7 @@ public WeightLabel GenerateLabel(Guid armId, Guid pluId, CreateWeightLabelDto dt
6364
{
6465
Plu = pluService.GetItemByUid(pluId),
6566
Line = line,
66-
Weight = dto.WeightNet,
67+
Weight = dto.WeightNet-dto.WeightTare,
6768
Kneading = (short)dto.Kneading,
6869
ProductDt = dto.ProductDt
6970
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project>
6+
<PropertyGroup>
7+
<WebPublishMethod>MSDeploy</WebPublishMethod>
8+
9+
<DeployIisAppPath>SCALES-DESKTOP-API</DeployIisAppPath>
10+
<MSDeployServiceURL>https://DIISM01:8172/msdeploy.axd</MSDeployServiceURL>
11+
12+
<LastUsedBuildConfiguration>ReleaseVS</LastUsedBuildConfiguration>
13+
</PropertyGroup>
14+
<Import Project="../.wpp.targets" />
15+
</Project>

Src/Apps/Web/DeviceControl/appsettings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"Microsoft.AspNetCore": "Warning"
66
}
77
},
8-
"": {
8+
"Oidc": {
99
"ClientId": "blazor-client",
1010
"Realm": "blazor",
1111
"ClientSecret": "8XOoLh9GSbMfyee97EHmnJ2udv3Vt3pw",
1212
"Authority": "http://10.0.204.55:80",
1313
"RequireHttpsMetadata": false
1414
},
15-
"WebApi": "https://scales-api-dev.kolbasa-vs.local/api/device-control",
15+
"WebApi": "https://scales-api.kolbasa-vs.local/api/device-control",
1616
"LabelaryApi": "http://api.labelary.com",
1717
"AllowedHosts": "*"
1818
}

0 commit comments

Comments
 (0)