pharmdata/elfisa-pharmacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

v1.0.3: передача item_name и item_code при отправке заказа на сервер

Browse Source
This commit is contained in:
Exest 2026-07-21 13:16:11 +03:00
parent 7f3bc2eb35
commit 4b3b2c8ca8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ElectronicPharmacy/Classes/DataSender.cs
View File

@ -162,6 +162,8 @@ namespace Электронная_Фармация.Classes
SELECT SELECT
Orders.Id_Order, Orders.Id_Order,
OrderItems.supplier_price_id, OrderItems.supplier_price_id,
OrderItems.DrugName,
OrderItems.es_code,
OrderItems.Zakaz, OrderItems.Zakaz,
Orders.Comment Orders.Comment
FROM Orders FROM Orders
@ -188,6 +190,8 @@ WHERE Orders.OrderState = 'НОВЫЙ'
{ {
string orderId = reader["Id_Order"].ToString().Trim(); string orderId = reader["Id_Order"].ToString().Trim();
string supplierPriceId = reader["supplier_price_id"].ToString().Trim(); string supplierPriceId = reader["supplier_price_id"].ToString().Trim();
string drugName = reader["DrugName"] == DBNull.Value ? null : reader["DrugName"].ToString().Trim();
string esCode = reader["es_code"] == DBNull.Value ? null : reader["es_code"].ToString().Trim();
decimal qty = ReadDecimal(reader["Zakaz"]); decimal qty = ReadDecimal(reader["Zakaz"]);
if (string.IsNullOrWhiteSpace(supplierPriceId)) if (string.IsNullOrWhiteSpace(supplierPriceId))
@ -214,7 +218,9 @@ WHERE Orders.OrderState = 'НОВЫЙ'
order.Items.Add(new BuyerOrderItem order.Items.Add(new BuyerOrderItem
{ {
SupplierPriceId = supplierPriceId, SupplierPriceId = supplierPriceId,
Qty = qty Qty = qty,
ItemName = string.IsNullOrWhiteSpace(drugName) ? null : drugName,
ItemCode = string.IsNullOrWhiteSpace(esCode) ? null : esCode
}); });
} }
} }
@ -344,5 +350,11 @@ WHERE Orders.OrderState = 'НОВЫЙ'
[JsonPropertyName("qty")] [JsonPropertyName("qty")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
[JsonPropertyName("item_name")]
public string ItemName { get; set; }
[JsonPropertyName("item_code")]
public string ItemCode { get; set; }
} }
} }

4
src/ElectronicPharmacy/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Можно задать все значения или принять номера сборки и редакции по умолчанию // Можно задать все значения или принять номера сборки и редакции по умолчанию
// используя "*", как показано ниже: // используя "*", как показано ниже:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.3.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.3.0")]