From 4b3b2c8ca8f1f902d09cf1ba4c2a355b640e41fc Mon Sep 17 00:00:00 2001 From: Exest Date: Tue, 21 Jul 2026 13:16:11 +0300 Subject: [PATCH] =?UTF-8?q?v1.0.3:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D1=87=D0=B0=20item=5Fname=20=D0=B8=20item=5Fcode=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=20=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ElectronicPharmacy/Classes/DataSender.cs | 14 +++++++++++++- src/ElectronicPharmacy/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ElectronicPharmacy/Classes/DataSender.cs b/src/ElectronicPharmacy/Classes/DataSender.cs index 37fb405..827a5e1 100644 --- a/src/ElectronicPharmacy/Classes/DataSender.cs +++ b/src/ElectronicPharmacy/Classes/DataSender.cs @@ -162,6 +162,8 @@ namespace Электронная_Фармация.Classes SELECT Orders.Id_Order, OrderItems.supplier_price_id, + OrderItems.DrugName, + OrderItems.es_code, OrderItems.Zakaz, Orders.Comment FROM Orders @@ -188,6 +190,8 @@ WHERE Orders.OrderState = 'НОВЫЙ' { string orderId = reader["Id_Order"].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"]); if (string.IsNullOrWhiteSpace(supplierPriceId)) @@ -214,7 +218,9 @@ WHERE Orders.OrderState = 'НОВЫЙ' order.Items.Add(new BuyerOrderItem { 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")] public decimal Qty { get; set; } + + [JsonPropertyName("item_name")] + public string ItemName { get; set; } + + [JsonPropertyName("item_code")] + public string ItemCode { get; set; } } } diff --git a/src/ElectronicPharmacy/Properties/AssemblyInfo.cs b/src/ElectronicPharmacy/Properties/AssemblyInfo.cs index 98b9daf..db6856a 100644 --- a/src/ElectronicPharmacy/Properties/AssemblyInfo.cs +++ b/src/ElectronicPharmacy/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.3.0")] +[assembly: AssemblyFileVersion("1.0.3.0")]