Browse Source

1

updatebug
506583276@qq.com 2 years ago
parent
commit
a8175c7b46
  1. 5
      BBWYB.Client/APIServices/PackPurchaseTaskService.cs
  2. 2
      BBWYB.Client/APIServices/PurchaseService.cs
  3. 5
      BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
  4. 6
      BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs
  5. 76
      BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs
  6. 9
      BBWYB.Client/ViewModels/Order/OrderViewModel.cs
  7. 115
      BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
  8. 71
      BBWYB.Client/Views/Order/OrderList.xaml
  9. 2
      BBWYB.Server.API/Controllers/OrderController.cs
  10. 4
      BBWYB.Server.Business/Order/OrderBusiness.cs
  11. 4
      BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  12. 3
      BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs
  13. 9
      BBWYB.Server.Model/Db/Order/OrderSku.cs
  14. 5
      BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs

5
BBWYB.Client/APIServices/PackPurchaseTaskService.cs

@ -56,11 +56,12 @@ namespace BBWYB.Client.APIServices
return SendRequest<long>(globalContext.QKApiHost, "api/PackPurchaseTask/UpdatePurchaseTask", updatePurchaseTaskRequest, null, HttpMethod.Post);
}
public ApiResponse<ConfigPackResponse> GetConfigPack(string skuId, string skuPurchaseSchemeId)
public ApiResponse<ConfigPackResponse> GetConfigPack(string skuId, string skuPurchaseSchemeId,string orderId)
{
return SendRequest<ConfigPackResponse>(globalContext.QKApiHost, "api/PackPurchaseTask/GetConfigPack", new {
skuId,
skuPurchaseSchemeId
skuPurchaseSchemeId,
orderId
}
, null, HttpMethod.Post);
}

2
BBWYB.Client/APIServices/PurchaseService.cs

@ -87,7 +87,7 @@ namespace BBWYB.Client.APIServices
{
return SendRequest<PurchaseSkuBasicInfoResponse>("http://bbwyb.qiyue666.com", $"Api/PurchaseScheme/GetPurchaseSkuBasicInfo", new {
return SendRequest<PurchaseSkuBasicInfoResponse>(globalContext.BBWYApiHost, $"Api/PurchaseScheme/GetPurchaseSkuBasicInfo", new {
purchaseProductId,
platform,
priceMode,

5
BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs

@ -145,8 +145,11 @@ namespace BBWYB.Client.Models
/// </summary>
public IList<OrderCostDetailResponse> OrderCostDetailList { get; set; }
/// <summary>
/// 产品打包配置
/// </summary>
public PackConfigState? PackConfigState { get; set; }
}
public class OrderListResponse

6
BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs

@ -43,5 +43,11 @@ namespace BBWYB.Client.Models
/// 来源Sku
/// </summary>
public string BelongSkuId { get; set; }
/// <summary>
/// 产品打包配置
/// </summary>
public PackConfigState? PackConfigState { get; set; }
}
}

76
BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs

@ -12,53 +12,57 @@ namespace BBWYB.Client.Models.APIModel
/// </summary>
public class ConfigPackResponse
{
/// <summary>
/// 货号品名
/// </summary>
public string BrandName { get; set; }
/// <summary>
/// 组合类型(单件=0,多件=1)
/// </summary>
public int PackType { get; set; }
///// <summary>
///// 货号品名
///// </summary>
//public string BrandName { get; set; }
///// <summary>
///// 组合类型(单件=0,多件=1)
///// </summary>
//public int PackType { get; set; }
/// <summary>
/// 基础包装(快递袋=0,纸箱=1,麻袋=2)
/// </summary>
public int BasicPack { get; set; }
///// <summary>
///// 基础包装(快递袋=0,纸箱=1,麻袋=2)
///// </summary>
//public int BasicPack { get; set; }
/// <summary>
/// 增量耗材
/// </summary>
public string Increment1 { get; set; }
///// <summary>
///// 增量耗材
///// </summary>
//public string Increment1 { get; set; }
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1)
/// </summary>
public int? CertificatePosition { get; set; }
///// <summary>
///// 合格证位置(外部包装=0,产品包装=1)
///// </summary>
//public int? CertificatePosition { get; set; }
/// <summary>
/// sku配件商品名称
/// </summary>
public string SkuGoodsTitle { get; set; }
///// <summary>
///// sku配件商品名称
///// </summary>
//public string SkuGoodsTitle { get; set; }
/// <summary>
/// 配件数量
/// </summary>
public int GoodsNumber { get; set; }
/// <summary>
/// 是否需要条形码
/// </summary>
public bool? NeedBar { get; set; }
/// <summary>
/// 是否需要合格证
/// </summary>
public bool? NeedCer { get; set; }
///// <summary>
///// 配件数量
///// </summary>
//public int GoodsNumber { get; set; }
///// <summary>
///// 是否需要条形码
///// </summary>
//public bool? NeedBar { get; set; }
///// <summary>
///// 是否需要合格证
///// </summary>
//public bool? NeedCer { get; set; }
/// <summary>
/// 配件列表
/// </summary>
public PurchaseSku[] PurchaseSkus { get; set; }
/// <summary>
/// 采购方案id
/// </summary>
public string SkuPurchaseSchemeId { get; set; }
/// <summary>
/// 条形码
/// </summary>

9
BBWYB.Client/ViewModels/Order/OrderViewModel.cs

@ -90,7 +90,7 @@ namespace BBWYB.Client.ViewModels
OnlinePurchaseCommand = new RelayCommand<Order>(OnlinePurchase);
CancelOrderCommand = new RelayCommand<string>(CancelOrder);
EditPriceCommand = new RelayCommand<Order>(OpenEditPrice);
EditPackConfigCommand = new RelayCommand<Order>(EditPackConfig);
EditPackConfigCommand = new RelayCommand<Object>(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();

115
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
/// </summary>
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<IncreateModel>();
//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
}

71
BBWYB.Client/Views/Order/OrderList.xaml

@ -21,6 +21,7 @@
<sys:Int32 x:Key="d15">14</sys:Int32>
<sys:Int32 x:Key="d30">29</sys:Int32>
<ctr:SaleGrossProfitConverter x:Key="sgpConverter"/>
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
</Page.Resources>
<Grid>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
@ -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}"/>
<c:BButton Width="100"
<c:BButton Width="100"
Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:#8080FF:#F2F2F2}"
Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:White:#4A4A4A}"
Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待付款}">
@ -517,19 +518,19 @@
<TextBlock>
<Run Text="采购方式:"/>
<Run Text="{Binding PurchaseMethod}"/>
</TextBlock>
<TextBlock>
</TextBlock>
<TextBlock>
<Run Text="采购平台:"/>
<Run Text="{Binding PurchasePlatform}"/>
</TextBlock>
<TextBlock>
</TextBlock>
<TextBlock>
<Run Text="采购商家:"/>
<Run Text="{Binding PurchaserName}"/>
</TextBlock>
<TextBlock>
</TextBlock>
<TextBlock>
<Run Text="采购账号:"/>
<Run Text="{Binding PurchaseAccountName}"/>
</TextBlock>
</TextBlock>
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="采购单号:"/>
<c:BButton Style="{StaticResource LinkButton}" Content="{Binding PurchaseOrderId}" Margin="5,0,0,0"
@ -540,7 +541,7 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Border x:Name="bd_costbg" Background="#FCECEE" Grid.Column="2" Margin="0,0,1,0"
Visibility="{Binding IsCostException,ConverterParameter=true:Visible:Collapsed}"/>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,10">
@ -712,44 +713,54 @@
Visibility="{Binding PackConfigState ,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
</StackPanel>-->
<ListBox Grid.Column="7"
<ListBox Grid.Column="7" x:Name ="lbSet"
Visibility="{Binding IsPurchased,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"
ItemsSource="{Binding ItemList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
Style="{StaticResource NoScrollViewListBoxStyle}"
HorizontalAlignment="Center"
VerticalAlignment="Center">
>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid>
<StackPanel DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" MinHeight="90" Grid.Column="7" Orientation="Horizontal" HorizontalAlignment="Center">
<c:BButton Content="取消" Style="{StaticResource LinkButton}"
<Grid Width="{Binding ActualWidth,ElementName=lbSet}" MinHeight="90">
<StackPanel Orientation="Vertical" Grid.Column="7" VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal" DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}">
<c:BButton Content="取消" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CancelOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding Id}">
<!--OrderId-->
<c:BButton.Visibility>
<MultiBinding Converter="{StaticResource mobjConverter}"
<!--OrderId-->
<c:BButton.Visibility>
<MultiBinding Converter="{StaticResource mobjConverter}"
ConverterParameter="已取消;true:|:Collapsed:Visible:1">
<Binding Path="OrderState" />
<Binding Path="IsPurchased"/>
</MultiBinding>
</c:BButton.Visibility>
</c:BButton>
<c:BButton Content="改价" Margin="5,0,0,0"
<Binding Path="OrderState" />
<Binding Path="IsPurchased"/>
</MultiBinding>
</c:BButton.Visibility>
</c:BButton>
<c:BButton Content="改价" Margin="5,0,0,0"
Command="{Binding DataContext.EditPriceCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page }}}"
CommandParameter="{Binding }"
Style="{StaticResource LinkButton}"
Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
</StackPanel>
<c:BButton Content="配置" Margin="5,0,0,0"
<StackPanel Margin="0 5 0 0" Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=待配置:Visible:Collapsed}">
<c:BButton Content="{Binding PackConfigState,Converter={StaticResource objConverter},ConverterParameter=已配置:修改配置:配置}" Margin="5,0,0,0"
Command="{Binding DataContext.EditPackConfigCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }"
Style="{StaticResource LinkButton}"
Visibility="{Binding PackConfigState ,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
>
<c:BButton.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter }">
<Binding Path="DataContext.SourceShopName" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
<Binding Path=""/>
</MultiBinding>
</c:BButton.CommandParameter>
</c:BButton>
</StackPanel>
</StackPanel>
<Border Grid.ColumnSpan="2" Margin="-20 0 -20 0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
Visibility="{Binding ItemList.Count,Converter={StaticResource objConverter},ConverterParameter=1:Collapsed:Visible}"/>
</Grid>
@ -772,7 +783,7 @@
</ListBox.ItemTemplate>
</ListBox>
</Grid>
<c:PageControl PageIndex="{Binding PageIndex}"
PageSize="{Binding PageSize}"
RecordCount="{Binding OrderCount}"

2
BBWYB.Server.API/Controllers/OrderController.cs

@ -62,5 +62,7 @@ namespace BBWYB.Server.API.Controllers
{
orderBusiness.EditPrice(request);
}
}
}

4
BBWYB.Server.Business/Order/OrderBusiness.cs

@ -54,7 +54,7 @@ namespace BBWYB.Server.Business
}
select = select.WhereIf(request.OrderState != null && request.OrderState != Enums.OrderState., (o, ocs, oct) => 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,
};
}

4
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,
});
}

3
BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs

@ -64,6 +64,7 @@ namespace BBWYB.Server.Model.Db
/// </summary>
public long? SchemeId { get; set; }
}
}
}

9
BBWYB.Server.Model/Db/Order/OrderSku.cs

@ -69,6 +69,13 @@ namespace BBWYB.Server.Model.Db
public string Title { get; set; }
}
/// <summary>
/// 打包配置状态(0=待配置, 1=已配置)
/// </summary>
[Column(DbType = "int(1)", MapType = typeof(int?))]
public Enums.PackConfigState? PackConfigState { get; set; }
}
}

5
BBWYB.Server.Model/Dto/Response/Order/OrderSkuResponse.cs

@ -4,5 +4,10 @@ namespace BBWYB.Server.Model.Dto
{
public class OrderSkuResponse : OrderSku
{
// /// <summary>
// /// 采购方案
// /// </summary>
//public long SchemeId { get;set; }
}
}

Loading…
Cancel
Save