From a8175c7b46384cdf66a5a0e3cac7de6fc2473529 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 18 May 2023 19:47:42 +0800 Subject: [PATCH] 1 --- .../APIServices/PackPurchaseTaskService.cs | 5 +- BBWYB.Client/APIServices/PurchaseService.cs | 2 +- .../APIModel/Response/Order/OrderResponse.cs | 5 +- .../Response/Order/OrderSkuResponse.cs | 6 + .../PackPurchaseTask/ConfigPackResponse.cs | 76 ++++++------ .../ViewModels/Order/OrderViewModel.cs | 9 +- .../UpdatePurchaseTaskViewModel.cs | 115 +++++++----------- BBWYB.Client/Views/Order/OrderList.xaml | 71 ++++++----- .../Controllers/OrderController.cs | 2 + BBWYB.Server.Business/Order/OrderBusiness.cs | 4 +- .../PurchaseOrder/PurchaseOrderBusiness.cs | 4 +- .../Db/Order/OrderPurchaseRelationinfo.cs | 3 +- BBWYB.Server.Model/Db/Order/OrderSku.cs | 9 +- .../Dto/Response/Order/OrderSkuResponse.cs | 5 + 14 files changed, 163 insertions(+), 153 deletions(-) diff --git a/BBWYB.Client/APIServices/PackPurchaseTaskService.cs b/BBWYB.Client/APIServices/PackPurchaseTaskService.cs index b70269d..eaf17f8 100644 --- a/BBWYB.Client/APIServices/PackPurchaseTaskService.cs +++ b/BBWYB.Client/APIServices/PackPurchaseTaskService.cs @@ -56,11 +56,12 @@ namespace BBWYB.Client.APIServices return SendRequest(globalContext.QKApiHost, "api/PackPurchaseTask/UpdatePurchaseTask", updatePurchaseTaskRequest, null, HttpMethod.Post); } - public ApiResponse GetConfigPack(string skuId, string skuPurchaseSchemeId) + public ApiResponse GetConfigPack(string skuId, string skuPurchaseSchemeId,string orderId) { return SendRequest(globalContext.QKApiHost, "api/PackPurchaseTask/GetConfigPack", new { skuId, - skuPurchaseSchemeId + skuPurchaseSchemeId, + orderId } , null, HttpMethod.Post); } diff --git a/BBWYB.Client/APIServices/PurchaseService.cs b/BBWYB.Client/APIServices/PurchaseService.cs index 5473b54..97d5f06 100644 --- a/BBWYB.Client/APIServices/PurchaseService.cs +++ b/BBWYB.Client/APIServices/PurchaseService.cs @@ -87,7 +87,7 @@ namespace BBWYB.Client.APIServices { - return SendRequest("http://bbwyb.qiyue666.com", $"Api/PurchaseScheme/GetPurchaseSkuBasicInfo", new { + return SendRequest(globalContext.BBWYApiHost, $"Api/PurchaseScheme/GetPurchaseSkuBasicInfo", new { purchaseProductId, platform, priceMode, diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs index 92f3e94..082641a 100644 --- a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs @@ -145,8 +145,11 @@ namespace BBWYB.Client.Models /// public IList OrderCostDetailList { get; set; } - + /// + /// 产品打包配置 + /// public PackConfigState? PackConfigState { get; set; } + } public class OrderListResponse diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs index 18a7cde..d9bd585 100644 --- a/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs @@ -43,5 +43,11 @@ namespace BBWYB.Client.Models /// 来源Sku /// public string BelongSkuId { get; set; } + /// + /// 产品打包配置 + /// + public PackConfigState? PackConfigState { get; set; } + + } } diff --git a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs index b2be897..dad4af1 100644 --- a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs @@ -12,53 +12,57 @@ namespace BBWYB.Client.Models.APIModel /// public class ConfigPackResponse { - /// - /// 货号品名 - /// - public string BrandName { get; set; } - /// - /// 组合类型（单件=0，多件=1） - /// - public int PackType { get; set; } + ///// + ///// 货号品名 + ///// + //public string BrandName { get; set; } + ///// + ///// 组合类型（单件=0，多件=1） + ///// + //public int PackType { get; set; } - /// - /// 基础包装（快递袋=0，纸箱=1，麻袋=2） - /// - public int BasicPack { get; set; } + ///// + ///// 基础包装（快递袋=0，纸箱=1，麻袋=2） + ///// + //public int BasicPack { get; set; } - /// - /// 增量耗材 - /// - public string Increment1 { get; set; } + ///// + ///// 增量耗材 + ///// + //public string Increment1 { get; set; } - /// - /// 合格证位置（外部包装=0，产品包装=1） - /// - public int? CertificatePosition { get; set; } + ///// + ///// 合格证位置（外部包装=0，产品包装=1） + ///// + //public int? CertificatePosition { get; set; } - /// - /// sku配件商品名称 - /// - public string SkuGoodsTitle { get; set; } + ///// + ///// sku配件商品名称 + ///// + //public string SkuGoodsTitle { get; set; } - /// - /// 配件数量 - /// - public int GoodsNumber { get; set; } - /// - /// 是否需要条形码 - /// - public bool? NeedBar { get; set; } - /// - /// 是否需要合格证 - /// - public bool? NeedCer { get; set; } + ///// + ///// 配件数量 + ///// + //public int GoodsNumber { get; set; } + ///// + ///// 是否需要条形码 + ///// + //public bool? NeedBar { get; set; } + ///// + ///// 是否需要合格证 + ///// + //public bool? NeedCer { get; set; } /// /// 配件列表 /// public PurchaseSku[] PurchaseSkus { get; set; } + /// + /// 采购方案id + /// + public string SkuPurchaseSchemeId { get; set; } /// /// 条形码 /// diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs index 1a54548..69ab09e 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -90,7 +90,7 @@ namespace BBWYB.Client.ViewModels OnlinePurchaseCommand = new RelayCommand(OnlinePurchase); CancelOrderCommand = new RelayCommand(CancelOrder); EditPriceCommand = new RelayCommand(OpenEditPrice); - EditPackConfigCommand = new RelayCommand(EditPackConfig); + EditPackConfigCommand = new RelayCommand(EditPackConfig); PageIndex = 1; PageSize = 10; EndDate = DateTime.Now; @@ -100,11 +100,12 @@ namespace BBWYB.Client.ViewModels Task.Factory.StartNew(() => LoadOrder(PageIndex)); } - private void EditPackConfig(Order order) + private void EditPackConfig(Object obj) { + ViewModelLocator view = new (); - var updatePackTask = view.UpdatePurchaseTask; - updatePackTask.Test(order); + var updatePackTask = view.UpdatePurchaseTask; + updatePackTask.SearchSku(obj); UpdatePurchaseTaskWindow packTask = new(); packTask.ShowDialog(); diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs index 3b4746a..1d8aa33 100644 --- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs @@ -325,7 +325,7 @@ namespace BBWYB.Client.ViewModels public string ShopId { get; set; } public string UserName { get; set; } - public void Test(Order order) + public void Test(OrderSku order) { SearchSku(order); @@ -432,21 +432,23 @@ namespace BBWYB.Client.ViewModels /// public void SearchSku(object obj) { - - Order order = (Order)obj; - - SkuId = order.SourceSku; - OrderId = order.Id; - SkuPurchaseSchemeId = "416647656341573"; - OriginShopName = order.SourceShopName; + InitData(); + var objList = (object[])obj; + + //SkuPurchaseSchemeId = "416647656341573"; + OriginShopName = (string)objList[0]; + OrderSku order= (OrderSku)objList[1]; + + SkuId = order.BelongSkuId; + OrderId = order.OrderId; //string PurchaseProductId = "687352811674"; - Platform = order.Platform; - ShopId = "11"; - UserName = order.BuyerAccount; + //Platform = order.Platform; + //ShopId = "11"; + //UserName = order.BuyerAccount; var shopList = globalContext.User.ShopList; var shop = shopList.SingleOrDefault(s => s.ShopName == OriginShopName); - Logo = order.ItemList[0].Logo; - SkuName = order.ItemList[0].Title; + Logo = order.Logo; + SkuName = order.Title; if (string.IsNullOrEmpty(SkuId)) return; @@ -478,11 +480,16 @@ namespace BBWYB.Client.ViewModels Brand = productApiResponse.Data.Items[0].BrandName; } - var productSku = packPurchaseTaskService.GetConfigPack(SkuId, SkuPurchaseSchemeId); + var productSku = packPurchaseTaskService.GetConfigPack(SkuId, "", OrderId); + if (productSku == null || !productSku.Success || productSku.Data == null) + { + new TipsWindow(productSku.Msg).Show(); return; - BrandName = productSku.Data.BrandName; + } + + SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId; BarCodeModel = productSku.Data.BarCode; if (BarCodeModel == null) { @@ -521,7 +528,7 @@ namespace BBWYB.Client.ViewModels { var config = productSku.Data.PackConfig; SkuTitle = config.SkuGoodsTitle; - brandName = config.BrandName; + BrandName = config.BrandName; GoodsNumber = config.GoodsNumber; PackType = (PackType)config.PackType; BasicPack = (BasicPack)config.BasicPack; @@ -603,55 +610,19 @@ namespace BBWYB.Client.ViewModels public void InitData() { - //IncreateList = new ObservableCollection(); - //SpuId = string.Empty; - - //SaveTask = "保存"; - //Logo = model.ItemList[0].Logo; - //SearchSkuId = model.SkuId; - //SkuId = model.SkuId; - //SkuCount = model.SkuCount; - //SkuName = model.ItemList[0].SkuName; - //ProductNo = model.ItemList[0].GoodsNo; - //Brand = model.Brand; - //BrandName = model.ItemList[0].BrandName; - //this.MarkMessage = model.MarkMessage; - //IsSetBarCode = model.BarCodeModel != null ? false : true; - //IsSetCertificate = model.CertificateModel != null ? false : true; - //BarCodeModel = model.BarCodeModel; - //CertificateModel = model.CertificateModel; - //SkuTitle = model.SkuTitle; - //GoodsNumber = model.GoodsNumber; - //Availability = model.Availability; - //IsWorry = model.IsWorry; - //PositionType = model.PositionType; - //PackType = model.PackType; - //BasicPack = model.BasicPack; - //IsNeedBarCode = model.BarCodeModel == null ? Need.不需要 : Need.需要; - //IsNeedCertificateModel = model.CertificateModel == null ? Need.不需要 : Need.需要; - //CertificatePosition = model.CertificatePosition; - //TaskId = model.TaskId; - //string[] increateDatas = model.Increment1.Split(','); - - //bool isTrue = false; - //foreach (var item in increates) - //{ - // isTrue = false; - // if (increateDatas.Contains(item)) - // { - // isTrue = true; - // } - // App.Current.Dispatcher.Invoke(() => - // { - // IncreateList.Add(new IncreateModel - // { - // IncreateName = item, - // IsSelected = isTrue - // }); - // }); - //} - // SearchSku(SkuId); - + IsSetBarCode = true; + SkuTitle = ""; + BrandName = ""; + GoodsNumber = 0; + PackType = PackType.单件; + BasicPack = BasicPack.快递袋; + // Availability = (TaskState.)config.Availability; + //MarkMessage = config.MarkMessage; + CertificatePosition = CertificatePosition.无; + // Increment1 = config.Increment1; + + IsNeedBarCode = Need.需要 ; + IsNeedCertificateModel = Need.不需要; } private void OpenSkuDetail(object param) { @@ -691,12 +662,11 @@ namespace BBWYB.Client.ViewModels Availability = (int)Availability, BasicPack = (int)BasicPack, SkuId = SkuId, - //CreateTime = DateTime.Now, Increment1 = increateStr, - //Increment2 = (int)Increment2, + CertificatePosition = (int)CertificatePosition, PackType = (int)PackType, - MarkMessage = MarkMessage, + // MarkMessage = MarkMessage, PositionType = (int)PositionType, GoodsNumber = GoodsNumber, SkuGoodsTitle = SkuTitle, @@ -711,12 +681,6 @@ namespace BBWYB.Client.ViewModels //IsWorry = IsWorry }; - - - - - - if (IsNeedBarCode == Need.需要) { if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0) @@ -746,7 +710,10 @@ namespace BBWYB.Client.ViewModels var win = obj as System.Windows.Window; win.Close(); + return; } + + MessageBox.Show(res.Msg); } #endregion } diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml index 1d24355..0366cc1 100644 --- a/BBWYB.Client/Views/Order/OrderList.xaml +++ b/BBWYB.Client/Views/Order/OrderList.xaml @@ -21,6 +21,7 @@ 14 29 + @@ -135,7 +136,7 @@ Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}" Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:#8080FF:#F2F2F2}" Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:White:#4A4A4A}"/> - @@ -517,19 +518,19 @@ - - + + - - + + - - + + - + - + @@ -712,44 +713,54 @@ Visibility="{Binding PackConfigState ,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}"/> --> - + > - - - + + + - - - + + - - - - - - + + + + + + - + - + > + + + + + + + + - @@ -772,7 +783,7 @@ - + o.OrderState == request.OrderState) - .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) => o.PackConfigState != null&&o.OrderState!=Enums.OrderState.已取消) + .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) =>o.OrderState != Enums.OrderState.已取消)//&&o.OrderState> Enums.OrderState.等待采购 .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate) .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate) .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId) @@ -113,7 +113,7 @@ namespace BBWYB.Server.Business Profit = oct.Profit, PurchaseAmount = oct.PurchaseAmount, IsManualEdited = oct.IsManualEdited, - PackConfigState= o.PackConfigState, + //PackConfigState= o.PackConfigState, }; } diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 57d9af9..f8df871 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -239,7 +239,9 @@ namespace BBWYB.Server.Business PurchaseSkuId = cargoParam.SkuId, PurchaseSpecId = cargoParam.SpecId, Quantity = cargoParam.Quantity, - SchemeId = cargoParam.SchemeId + SchemeId = cargoParam.SchemeId, + + }); } diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs index c541335..9051545 100644 --- a/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs @@ -64,6 +64,7 @@ namespace BBWYB.Server.Model.Db /// public long? SchemeId { get; set; } - } + + } } diff --git a/BBWYB.Server.Model/Db/Order/OrderSku.cs b/BBWYB.Server.Model/Db/Order/OrderSku.cs index 2bf664c..b11e856 100644 --- a/BBWYB.Server.Model/Db/Order/OrderSku.cs +++ b/BBWYB.Server.Model/Db/Order/OrderSku.cs @@ -69,6 +69,13 @@ namespace BBWYB.Server.Model.Db public string Title { get; set; } - } + + /// + /// 打包配置状态(0=待配置, 1=已配置) + /// + [Column(DbType = "int(1)", MapType = typeof(int?))] + public Enums.PackConfigState? PackConfigState { get; set; } + + } } diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs index 32a0b3c..bd3325d 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs @@ -4,5 +4,10 @@ namespace BBWYB.Server.Model.Dto { public class OrderSkuResponse : OrderSku { + // /// + // /// 采购方案 + // /// + //public long SchemeId { get;set; } + } }