diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 0525c7ad..1e4a577e 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -149,7 +149,8 @@ 备用金转入 = 15, 平台补贴 = 16, 快递赔付 = 17, - 自定义 = 18 + 自定义 = 18, + 备用金充值 = 19 } /// diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs index 8afdd015..4c3c1b09 100644 --- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs +++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs @@ -1,14 +1,18 @@ using System; +using System.Collections.Generic; +using System.Linq; namespace BBWY.Client.Models { public class AuditPayBill : NotifyObject { - public void Init() + public void Init(IList shopList) { isInited = true; if (!string.IsNullOrEmpty(CustomAuditCapitalType)) AuditCapitalTypeInputMode = 1; + if (!string.IsNullOrEmpty(BelongShop)) + BelongShopModel = shopList.FirstOrDefault(s => s.ShopName == BelongShop); } private AuditCapitalType? auditCapitalType; @@ -16,6 +20,8 @@ namespace BBWY.Client.Models private string errorMessage; private int auditCapitalTypeInputMode; private bool isInited; + private Shop belongShopModel; + /// /// 是否发生过变化 @@ -80,6 +86,8 @@ namespace BBWY.Client.Models /// public string BelongShop { get; set; } + + public string BelongFileName { get; set; } /// @@ -167,5 +175,17 @@ namespace BBWY.Client.Models } } + public Shop BelongShopModel + { + get => belongShopModel; + set + { + if (Set(ref belongShopModel, value) && value != null) + { + BelongShopId = value.ShopId; + BelongShop = value.ShopName; + } + } + } } } diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs index 98aa66b9..8d2f9797 100644 --- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -172,7 +172,7 @@ namespace BBWY.Client.ViewModels { foreach (var b in list) { - b.Init(); + b.Init(SelectedDepartment.ShopList); AuditPayBillList.Add(b); } SearchLocal(); @@ -276,8 +276,14 @@ namespace BBWY.Client.ViewModels payBill.RelationPurchaseOrderId = relationPurchaseOrder.PurchaseOrderId; payBill.RelationShopOrderId = relationPurchaseOrder.OrderId; - payBill.BelongShopId = relationPurchaseOrder.ShopId; - payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName; + + var belongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId); + if (belongShop != null) + { + //payBill.BelongShopId = relationPurchaseOrder.ShopId; + //payBill.BelongShop = belongShop?.ShopName; + payBill.BelongShopModel = belongShop; + } payBill.PurchasePlatform = relationPurchaseOrder.PurchasePlatform; payBill.OrderStartTime = relationPurchaseOrder.OrderStartTime; diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml index 902b8a5b..e79b1841 100644 --- a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml +++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml @@ -253,7 +253,15 @@ - + + + + + + + diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index e8776a49..bfa74787 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index ded1b555..480ebf10 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -193,7 +193,8 @@ 备用金转入 = 15, 平台补贴 = 16, 快递赔付 = 17, - 自定义 = 18 + 自定义 = 18, + 备用金充值 = 19 } } } diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 49e112ab..40aef1ea 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -62,7 +62,16 @@ namespace BBWY.Test AdsIbgUniversalJosServiceCampaignQueryResponse response6 = client.Execute(req6, token, DateTime.Now.ToLocalTime()); Console.WriteLine(JsonConvert.SerializeObject(response6)); + //Console.WriteLine("----------------------客服接待 2---------------------------"); + //var req = new ImPopReplystatGetRequest(); + //req.waiter = "布莱特玩具"; + //req.startTime = DateTime.Parse("2022-10-04"); + //req.endTime = DateTime.Now; + + + //ImPopReplystatGetResponse imResponse = client.Execute(req, "2ace3023200c4ea9aa682bbf8bffee18jztm", DateTime.Now.ToLocalTime()); + //Console.WriteLine(JsonConvert.SerializeObject(imResponse)); Console.ReadKey(); } }