Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
486759a8ac
  1. 21
      BBWY.Client/APIServices/BatchPurchaseService.cs
  2. 10
      BBWY.Client/APIServices/PackTaskService.cs
  3. 6
      BBWY.Client/BBWYAppSettings.json
  4. 1
      BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs
  5. 2
      BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs
  6. 33
      BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
  7. 7
      BBWY.Client/Models/PackTask/ConsumableModel.cs
  8. 11
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  9. 4
      BBWY.Client/ViewModels/BaseVM.cs
  10. 45
      BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs
  11. 23
      BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
  12. 25
      BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
  13. 2
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  14. 33
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  15. 55
      BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
  16. 17
      BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml.cs
  17. 2
      BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
  18. 2
      BBWY.Client/Views/MainWindow.xaml
  19. 2
      BBWY.Client/Views/PackTask/LookCerWindow.xaml
  20. 16
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  21. 19
      BBWY.Server.API/Controllers/BatchPurchaseController.cs
  22. 4
      BBWY.Server.API/Startup.cs
  23. 3
      BBWY.Server.API/appsettings.json
  24. 2
      BBWY.Server.Business/FreeSqlMultiDBManager.cs
  25. 61
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
  26. 79
      BBWY.Server.Model/Db/QK/FeesDetail.cs
  27. 192
      BBWY.Server.Model/Db/QK/PackTask.cs
  28. 15
      BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/UpdatePackStateRequest.cs
  29. 20
      BBWY.Server.Model/Enums.cs

21
BBWY.Client/APIServices/BatchPurchaseService.cs

@ -177,12 +177,27 @@ namespace BBWY.Client.APIServices
/// <param name="orderId"></param>
/// <param name="PackState"></param>
/// <returns></returns>
public ApiResponse<PayPurchaseOrderResponse> UpdatePackState(string orderId, PackState PackState)
public ApiResponse<PayPurchaseOrderResponse> UpdatePackMoney(string orderId, decimal PackMoney)
{
return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/UpdatePackState", new
return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/UpdatePackMoney", new
{
orderId,
PackState
PackMoney
}, null, HttpMethod.Post);
}
/// <summary>
/// 修改采购单状态
/// </summary>
/// <param name="orderId"></param>
/// <param name="PackState"></param>
/// <returns></returns>
public ApiResponse<PayPurchaseOrderResponse> UpdatePurchaseOrderState(string orderId, PurchaseOrderState PurchaseOrderState)
{
return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/UpdatePurchaseOrderState", new
{
orderId,
PurchaseOrderState
}, null, HttpMethod.Post);
}

10
BBWY.Client/APIServices/PackTaskService.cs

@ -136,13 +136,13 @@ namespace BBWY.Client.APIServices
, null, HttpMethod.Post);
}
public ApiResponse<object> UpdateTaskStatus(long id, int taskStatus)
public ApiResponse<object> UpdateTaskStatus(long id, int taskStatus,string orderId)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/UpdatePackTaskStatus", new
{
id,
taskStatus
taskStatus,
orderId
}
, null, HttpMethod.Post);
}
@ -305,6 +305,10 @@ namespace BBWY.Client.APIServices
public decimal? ConsumableFees { get; set; }
public decimal? DiscountPrice { get; set; }
public string OrderId { get; set; }
public string SkuId { get; set; }
}
public class PersonTaskModel

6
BBWY.Client/BBWYAppSettings.json

@ -1,9 +1,9 @@
{
"BBWYApiHost": "http://localhost:5000",
//"BBWYApiHost": "http://bbwytest.qiyue666.com",
//"BBWYApiHost": "http://localhost:5000",
"BBWYApiHost": "http://bbwytest.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "",
"1688ApiHost": "",
"QKApiHost": "http://localhost:8080"
// "QKApiHost": "http://qiku.qiyue666.com"
//"QKApiHost": "http://qiku.qiyue666.com"
}

1
BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs

@ -103,5 +103,6 @@ namespace BBWY.Client.Models.APIModel.Request
public Worry IsWorry { get; set; }
public string OrderId { get; set; }
public Platform Platform { get; set; }
}
}

2
BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs

@ -169,7 +169,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 品牌
/// </summary>
public string Brand { get; set; }
public string OrderId { get; set; }
}
//public class FeesItemTypeDTO :NotifyObject

33
BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@ -16,11 +16,41 @@ using System.Windows.Input;
namespace BBWY.Client.Models
{
//public class ComboxItem
//{
// public int { get; set; }
//}
public class BatchPublishTask : NotifyObject
{
#region 属性
private ObservableCollection<ComboBoxItem> positionTypeList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{IsSelected = false,Content = "本地仓"}, new ComboBoxItem{IsSelected = false,Content = "齐越仓"}, new ComboBoxItem{IsSelected = false,Content = "京东仓"}
};
public ObservableCollection<ComboBoxItem> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
private ObservableCollection<ComboBoxItem> packTypeList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="单件",IsSelected=false }, new ComboBoxItem{ Content="多件",IsSelected=false }
};
public ObservableCollection<ComboBoxItem> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } }
private ObservableCollection<ComboBoxItem> basicPackList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="快递袋",IsSelected=false }, new ComboBoxItem{ Content="纸箱",IsSelected=false }, new ComboBoxItem{ Content="麻袋",IsSelected=false }
};
public ObservableCollection<ComboBoxItem> BasicPackList { get => basicPackList; set { Set(ref basicPackList, value); } }
private ObservableCollection<ComboBoxItem> isNeedBarCodeList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{IsSelected = false,Content = "需要"}, new ComboBoxItem{IsSelected = false,Content = "不需要"}};
public ObservableCollection<ComboBoxItem> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
private ObservableCollection<ComboBoxItem> certificatePositionList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="无",IsSelected=false }, new ComboBoxItem{ Content="外部包装",IsSelected=false }, new ComboBoxItem{ Content="产品包装",IsSelected=false }
};
public ObservableCollection<ComboBoxItem> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
private ObservableCollection<ComboBoxItem> availabilityList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="已到货",IsSelected=false }, new ComboBoxItem{ Content="部分到货",IsSelected=false }, new ComboBoxItem{ Content="未到货",IsSelected=false }
};
public ObservableCollection<ComboBoxItem> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
private int skuCount;
/// <summary>
@ -247,6 +277,7 @@ namespace BBWY.Client.Models
SetCertificateCommand = new RelayCommand(SetCertificate);
LookBarCommand = new RelayCommand(LookBar);
LookCerCommand = new RelayCommand(LookCer);
}
#region 方法
public ICommand SetBarCodeCommand { get; set; }
@ -446,7 +477,7 @@ namespace BBWY.Client.Models
App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
return;
}
//查看有木有存在
}
public void SearSpuCer()

7
BBWY.Client/Models/PackTask/ConsumableModel.cs

@ -4,11 +4,13 @@ using BBWY.Client.ViewModels;
using BBWY.Client.Views.PackTask;
using BBWY.Common.Models;
using GalaSoft.MvvmLight.Command;
using HandyControl.Controls;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Resources;
using System.Text;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media.TextFormatting;
@ -95,6 +97,11 @@ namespace BBWY.Client.Models.PackTask
public void DeletedConsumable(ObservableCollection<ConsumableModel> list)
{
MessageBoxResult result =System.Windows. MessageBox.Show("是否删除?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return;
var res = consumableService.Deleted(Id);
if (res.Success)
{

11
BBWY.Client/Models/PackTask/PackTaskModel.cs

@ -108,12 +108,14 @@ namespace BBWY.Client.Models
var serviceViewModel = viewModelLocator.PackServiceList;
serviceViewModel.TaskCount = SkuCount;
serviceViewModel.TaskId = TaskId;
serviceViewModel.OrderId= OrderId;
serviceViewModel.SkuId =SkuId ;
serviceViewModel.LoadPackDatas();
serviceViewModel.SetAllFees = new Action<FeesItemResponse, List<string>>((feesItem, packUsers) =>
{
FeesItemResponse = feesItem;
PackUser = string.Join("\r\n", packUsers);
FeesItemResponse.DiscountAllFees = feesItem.disCount * feesItem.AllFees;
IsShowFees = feesItem.AllFees > 0 ? true : false;
});
service.Show();
@ -208,9 +210,12 @@ namespace BBWY.Client.Models
}
///修改完成
var model = packTaskService.UpdateTaskStatus(taskId, 1);
var model = packTaskService.UpdateTaskStatus(taskId, 1,"");
if (model != null && model.Success)
{
//var res = batchPurchaseService.UpdatePurchaseOrderState(id, Models.PurchaseOrderState.已完成 );
this.TaskStatus = TaskStateType.;
new TipsWindow("修改成功").Show();
}
@ -497,6 +502,8 @@ namespace BBWY.Client.Models
public FeesItemResponse FeesItemResponse { get => feesItemResponse; set { Set(ref feesItemResponse, value); } }
public IList<SkuMessage> ItemList { get; set; }
public string OrderId { get; set; }
}
public class SkuMessage : NotifyObject

4
BBWY.Client/ViewModels/BaseVM.cs

@ -22,11 +22,11 @@ namespace BBWY.Client.ViewModels
LoadCommand = new RelayCommand(Load);
UnloadCommand = new RelayCommand(Unload);
CopyTextCommand = new RelayCommand<string>(s =>
CopyTextCommand = new RelayCommand<object>(s =>
{
try
{
Clipboard.SetText(s);
Clipboard.SetText(s.ToString());
}
catch (Exception ex)
{

45
BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs

@ -11,6 +11,8 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using System.Linq;
using System.Windows;
using GalaSoft.MvvmLight.Messaging;
namespace BBWY.Client.ViewModels
{
@ -24,8 +26,8 @@ namespace BBWY.Client.ViewModels
private ObservableCollection<BatchPublishTask> batchPublishTasks;
public ObservableCollection<BatchPublishTask> BatchPublishTasks { get => batchPublishTasks; set { Set(ref batchPublishTasks, value); } }
// public ObservableCollection<BatchPublishTask> BatchPublishTasks;
public ICommand OpenSkuDetailCommand { get; set; }
public ICommand CreateTaskCommand { get; set; }
public BatchPublishTaskViewModel(PackTaskService packTaskService, ProductService productService, GlobalContext globalContext)
{
@ -33,12 +35,38 @@ namespace BBWY.Client.ViewModels
this.packTaskService = packTaskService;
this.productService = productService;
CreateTaskCommand = new RelayCommand<object>(CreateTask);
OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
this.globalContext = globalContext;
}
private void OpenSkuDetail(object param)
{
var paramList = (object[])param;
// var orderId = paramList[0].ToString();
var skuId = paramList[0].ToString();
var url = $"https://item.jd.com/{skuId}.html";
try
{
System.Diagnostics.Process.Start("explorer.exe", url);
}
catch (Exception ex)
{
Clipboard.SetText(url);
MessageBox.Show($"{ex.Message}\r\n调用浏览器失败,网页链接已复制到剪切板,请手动打开浏览器访问", "提示");
}
}
GlobalContext globalContext;
private void CreateTask(object obj)
{
foreach (var task in batchPublishTasks)
foreach (var task in BatchPublishTasks)
{
string increateStr = "";
var increates = task.IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName);
@ -67,7 +95,8 @@ namespace BBWY.Client.ViewModels
UserId = globalContext.User.Id.ToString(),
ShopId = PurchaserId,
IsWorry = task.IsWorry,
OrderId = orderId
OrderId = orderId,
Platform =platform
};
if (task.IsNeedBarCode == Need.)
{
@ -96,12 +125,16 @@ namespace BBWY.Client.ViewModels
return;
}
}
var win = obj as System.Windows.Window;
//var win = obj as System.Windows.Window;
Messenger.Default.Send(true, "CloseBatchPublishTaskWindow");
//win.Close();
if (PublishTask != null) PublishTask();
win.Close();
}
public Action PublishTask { get; set; }

23
BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs

@ -94,19 +94,27 @@ namespace BBWY.Client.ViewModels
var itemList = (List<PurchaseOrderSku>)parameters[2];//skuid 数量
var PurchaserId = (string)parameters[3];//采购商id
ViewModelLocator viewModelLocator = new ViewModelLocator();
ViewModelLocator viewModelLocator = new ViewModelLocator();
BatchPublishTaskViewModel batch = viewModelLocator.BatchPublishTask;
BatchPublishTaskWindow window = new BatchPublishTaskWindow();
batch.PublishTask = () => {
//修改状态
batchPurchaseService.UpdatePackState(id, PackState.);
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
var res = batchPurchaseService.UpdatePurchaseOrderState(id, Models.PurchaseOrderState.);
if (res.Success)
{
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
}
};
batch.AddSkus(PurchasePlatform, id, PurchaserId, itemList);
window.ShowDialog();
BatchPublishTaskWindow window = new BatchPublishTaskWindow();
window.Show();
@ -136,6 +144,8 @@ namespace BBWY.Client.ViewModels
}
if (res.Data != null)
MessageBox.Show(res.Data.Msg);
else
MessageBox.Show(res.Msg);
}
private void PayPurchaseOrder(object obj)
@ -157,6 +167,9 @@ namespace BBWY.Client.ViewModels
}
if (res.Data != null)
MessageBox.Show(res.Data.Msg);
else
MessageBox.Show(res.Msg);
}

25
BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@ -44,7 +44,7 @@ namespace BBWY.Client.ViewModels.PackTask
readonly PackTaskService packTaskService;
readonly ConsumableService consumableService;
readonly PackDetailService packDetailService;
readonly BatchPurchaseService batchPurchaseService;
private ObservableCollection<PackItemModel> increateList = new ObservableCollection<PackItemModel>();
public ObservableCollection<PackItemModel> IncreateList { get => increateList; set { Set(ref increateList, value); } } //
@ -75,7 +75,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public List<PackItemModel> LoadList = new List<PackItemModel>();
public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, PackServiceService packServiceService, PackDetailService packDetailService)//, long taskId
public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, PackServiceService packServiceService, PackDetailService packDetailService, BatchPurchaseService batchPurchaseService)//, long taskId
{
//TaskId = taskId;
this.consumableService = consumableService;
@ -159,6 +159,7 @@ namespace BBWY.Client.ViewModels.PackTask
AddConsumableCommand = new RelayCommand(AddConsumable);
UpLoadPackCommand = new RelayCommand<object>(UpLoadPack);
SetAllCountCommand = new RelayCommand<object>(SetAllCount);
this.batchPurchaseService = batchPurchaseService;
@ -246,7 +247,7 @@ namespace BBWY.Client.ViewModels.PackTask
}
LoadList.AddRange(IncreateList);
LoadList.AddRange(PackList);
Discount =res.Data.Discount.ToString();
Discount = res.Data.Discount.ToString();
}
});
@ -284,7 +285,8 @@ namespace BBWY.Client.ViewModels.PackTask
private int taskCount;
public int TaskCount { get => taskCount; set { Set(ref taskCount, value); } } //
public string OrderId { get; set; }
public string SkuId { get; set; }
/// <summary>
/// 上传数据 (判断是否超量) 统一上传
/// </summary>
@ -328,7 +330,7 @@ namespace BBWY.Client.ViewModels.PackTask
decimal AllFees = 0;
decimal price = 0;
decimal IncreateFees = 0,PackFees=0,ConsumableFees=0,DiscountPrice=0;
decimal IncreateFees = 0, PackFees = 0, ConsumableFees = 0, DiscountPrice = 0;
foreach (var item in IncreateList)//增值服务上传
{
if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0)
@ -528,13 +530,15 @@ namespace BBWY.Client.ViewModels.PackTask
}
uploadService.AddPackServices = addDatas;
uploadService.DeletedPackServices = del;
uploadService.AllFees = Convert.ToDecimal((AllFees).ToString("0.00")); ;
uploadService.SkuId = SkuId;
uploadService.OrderId= OrderId;
uploadService.AllFees = Convert.ToDecimal(AllFees.ToString("0.00"));
uploadService.SingleFees = singleFees;
uploadService.IncreaseFees = Convert.ToDecimal((IncreateFees).ToString("0.00"));
uploadService.PackFees = Convert.ToDecimal((PackFees).ToString("0.00"));
uploadService.ConsumableFees = Convert.ToDecimal((ConsumableFees).ToString("0.00"));
uploadService. DiscountPrice = Convert.ToDecimal( (AllFees * upDisCount).ToString("0.00"));
uploadService.DiscountPrice = Convert.ToDecimal((AllFees * upDisCount).ToString("0.00"));
var res = packDetailService.UploadService(uploadService);
if (res != null && res.Success)
{
@ -546,10 +550,15 @@ namespace BBWY.Client.ViewModels.PackTask
feesItem.DisCount = upDisCount;
if (SetAllFees != null)
SetAllFees(feesItem, packUsers);
if (!string.IsNullOrEmpty( OrderId))
batchPurchaseService.UpdatePackMoney(OrderId, uploadService.DiscountPrice.Value);
win.Close();
}
}
/// <summary>
/// 更新 打包员 和费用数据
/// </summary>

2
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs

@ -112,6 +112,8 @@ namespace BBWY.Client.ViewModels.PackTask
BatchSettleCommand = new RelayCommand(BatchSettle);
SettleCommand = new RelayCommand<long>(SettleTask);
ExportCommand = new RelayCommand(Export);
SearchTaskTotal();
}
private void Export()

33
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -146,7 +146,7 @@ namespace BBWY.Client.ViewModels.PackTask
private readonly WorkProcessService workProcessService;
private readonly PackTaskService packTaskService;
private readonly IncreateServiceService increateServiceService;
public WareHouseListViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService, ProductService productService)
public WareHouseListViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService, ProductService productService, BatchPurchaseService batchPurchaseService)
{
this.packTaskService = packTaskService;
this.consumableService = consumableService;
@ -181,13 +181,14 @@ namespace BBWY.Client.ViewModels.PackTask
StartTime = DateTime.Now.Date;
EndTime = DateTime.Now.Date;
IsLoading = false;
SetTaskStatusCommand = new RelayCommand<object>(SetTaskStatus);
//加载数据
SetTaskState(Models.TaskState.);
this.workProcessService = workProcessService;
this.increateServiceService = increateServiceService;
this.productService = productService;
this.batchPurchaseService = batchPurchaseService;
}
@ -199,6 +200,7 @@ namespace BBWY.Client.ViewModels.PackTask
#region 事件绑定
public ICommand SetTaskStatusCommand { get; set; }
/// <summary>
/// 打开图片链接
/// </summary>
@ -229,6 +231,28 @@ namespace BBWY.Client.ViewModels.PackTask
public ICommand TaskPageIndexChangedCommand { get; set; }
BatchPurchaseService batchPurchaseService;
public void SetTaskStatus(object obj )
{
var objList = (object[])obj;
long taskId = (long)objList[0];
string orderId=(string)objList[1];
///修改完成
var model = packTaskService.UpdateTaskStatus(taskId, 1,orderId);
if (model != null && model.Success&&!string.IsNullOrEmpty(orderId))
{
if (model.Data != null && Convert.ToBoolean(model.Data))
{
//var res = batchPurchaseService.UpdatePurchaseOrderState(orderId, Models.PurchaseOrderState.待结算);
//if (res.Success)
new TipsWindow("修改成功").Show();
}
}
}
public void SetTaskState(TaskState? taskState)
{
IsWorry = null;
@ -306,7 +330,10 @@ namespace BBWY.Client.ViewModels.PackTask
SkuTitle = item.SkuGoodsTitle,
TaskId = item.TaskId,
TaskStatus = (TaskStateType)item.TaskStatus,
EndTime = item.CreateTime
EndTime = item.CreateTime,
OrderId= item.OrderId,
SkuId = item.SkuId,
};

55
BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml

@ -48,7 +48,7 @@
</Grid>
<ListBox x:Name="listbox_order"
Grid.Row="1"
ItemsSource="{Binding BatchPublishTasks}"
ItemsSource="{Binding BatchPublishTasks,Mode=TwoWay}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1,1,1,1"
@ -72,8 +72,7 @@
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
<Binding Path="Id"/>
<Binding Path="SkuId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
@ -125,26 +124,25 @@
<TextBlock Text="数量:" VerticalAlignment="Center"/>
<c:BTextBox WaterRemark="打包数量" Height="25" Width="90" Text="{Binding SkuCount}" />
<TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/>
<ComboBox VerticalContentAlignment="Center" Text="{Binding Availability}" >
<ComboBoxItem Content="已到货" IsSelected="True" />
<ComboBoxItem Content="部分到货"/>
<ComboBoxItem Content="未到货"/>
<ComboBox VerticalContentAlignment="Center" ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}" >
</ComboBox>
<TextBlock Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
<TextBlock Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
<ComboBox VerticalContentAlignment="Center" Text="{Binding IsWorry}" >
<ComboBoxItem Content="否" IsSelected="True" />
<ComboBoxItem Content="是"/>
</ComboBox>
</StackPanel>
<hc:TextBox HorizontalAlignment="Left" VerticalAlignment="Top" Height="100" Width="350"
Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap"/>
<TextBox HorizontalAlignment="Left" Text="{Binding MarkMessage}" VerticalAlignment="Top" Height="100" Width="350"
Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap">
</TextBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Height="25"
Margin="19 118 0 0">
<TextBlock Text="落仓去向:" VerticalAlignment="Center"/>
<ComboBox VerticalContentAlignment="Center" Text="{Binding PositionType}" >
<ComboBoxItem Content="本地仓" IsSelected="True" />
<ComboBoxItem Content="齐越仓"/>
<ComboBoxItem Content="京东仓"/>
<ComboBox VerticalContentAlignment="Center" ItemsSource="{Binding PositionTypeList}" Text="{Binding PositionType}" >
</ComboBox>
</StackPanel>
@ -191,18 +189,15 @@
<Grid Grid.Row="1" Grid.Column="0" >
<ComboBox VerticalContentAlignment="Center" Margin="5" Text="{Binding PackType}" >
<ComboBoxItem Content="单件" IsSelected="True" />
<ComboBoxItem Content="多件"/>
<ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding PackTypeList}" Text="{Binding PackType}" >
</ComboBox>
</Grid>
<c:BTextBox BorderBrush="Transparent" Grid.Row="1" Grid.Column="1" Height="30" Margin="5" Text="{Binding GoodsNumber,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<c:BTextBox BorderBrush="Transparent" Grid.Row="1" Grid.Column="2" Height="30" Margin="5" Text="{Binding SkuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Grid Grid.Row="1" Grid.Column="3" >
<ComboBox BorderBrush="Transparent" VerticalContentAlignment="Center" Margin="5" Text="{Binding BasicPack}" >
<ComboBoxItem Content="快递袋" IsSelected="True" />
<ComboBoxItem Content="纸箱"/>
<ComboBoxItem Content="麻袋"/>
<ComboBox BorderBrush="Transparent" VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding BasicPackList}" Text="{Binding BasicPack}" >
</ComboBox>
</Grid>
@ -237,22 +232,18 @@
</Grid>
<Grid Grid.Row="1" Grid.Column="5" >
<ComboBox VerticalContentAlignment="Center" Margin="5" Text="{Binding IsNeedBarCode}">
<ComboBoxItem Content="需要" />
<ComboBoxItem Content="不需要" IsSelected="True"/>
<ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="6" >
<ComboBox VerticalContentAlignment="Center" Margin="5" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
<ComboBoxItem Content="需要" />
<ComboBoxItem Content="不需要" IsSelected="True"/>
<ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="7" >
<ComboBox VerticalContentAlignment="Center" Margin="5" Text="{Binding CertificatePosition}">
<ComboBoxItem Content="外部包装" />
<ComboBoxItem Content="产品包装"/>
<ComboBoxItem Content="无" IsSelected="True"/>
<ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding CertificatePositionList}" Text="{Binding CertificatePosition}">
</ComboBox>
</Grid>
</Grid>
@ -270,7 +261,7 @@
<Button Content="发布" Width="100" HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,2,5,2"
Command="{Binding CreateTaskCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/>
</Grid>

17
BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml.cs

@ -1,4 +1,6 @@
using BBWY.Controls;
using BBWY.Client.Models;
using BBWY.Controls;
using GalaSoft.MvvmLight.Messaging;
using System;
using System.Collections.Generic;
using System.Text;
@ -21,6 +23,19 @@ namespace BBWY.Client.Views.BatchPurchase
public BatchPublishTaskWindow()
{
InitializeComponent();
Messenger.Default.Register<bool>(this, "CloseBatchPublishTaskWindow", CloseWindow);
}
private void CloseWindow(bool obj)
{
Messenger.Default.Unregister(this);
if (obj)
{
this.Close();
}
}
}
}

2
BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml

@ -403,7 +403,7 @@
</c:BButton>
</StackPanel>
<Grid Visibility="{Binding PackState,Converter={StaticResource objConverter},ConverterParameter=待发布:Visible:Collapsed}">
<Grid >
<StackPanel Visibility="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待发货:Visible:Collapsed }" Orientation="Vertical" VerticalAlignment="Center">
<c:BButton x:Name="createTask" Content="发布任务" Style="{StaticResource LinkButton}"
Margin="5,0,0,10">

2
BBWY.Client/Views/MainWindow.xaml

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10095" Margin="5,0,0,0"/>
<TextBlock Text="v10099" Margin="5,0,0,0"/>
</StackPanel>
</Border>
<Grid Grid.Row="1">

2
BBWY.Client/Views/PackTask/LookCerWindow.xaml

@ -76,7 +76,7 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStanderFormatFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>

16
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -122,8 +122,20 @@
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
</StackPanel>
<c:BButton Grid.Column="11" Command="{Binding SetTaskStatusCommand}" CommandParameter="{Binding TaskId}"
HorizontalAlignment="Stretch" VerticalAlignment="Center" Content="完成" />
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" VerticalAlignment="Center" Content="完成" >
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId" />
<Binding Path="OrderId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>

19
BBWY.Server.API/Controllers/BatchPurchaseController.cs

@ -81,14 +81,27 @@ namespace BBWY.Server.API.Controllers
return batchPurchaseBusiness.CancelPurchaseOrder(request);
}
/// <summary>
/// 修改打包状态
/// 修改打包金额
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public UpdatePackStateResponse UpdatePackState([FromBody] UpdatePackStateRequest request)
public UpdatePackStateResponse UpdatePackMoney([FromBody] UpdatePackMoneyRequest request)
{
return batchPurchaseBusiness.UpdatePackState(request);
return batchPurchaseBusiness.UpdatePackMoney(request);
}
/// <summary>
/// 修改采购单状态
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public UpdatePackStateResponse UpdatePurchaseOrderState([FromBody] UpdatePurchaseOrderStateRequest request)
{
return batchPurchaseBusiness.UpdatePurchaseOrderState(request);
}
}
}

4
BBWY.Server.API/Startup.cs

@ -46,12 +46,14 @@ namespace BBWY.Server.API
var fsql2 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("MDSDB")).Build();
var fsql3 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("JDXX")).Build();
var fsql4 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("QK")).Build();
services.AddSingleton(new FreeSqlMultiDBManager()
{
BBWYfsql = fsql,
MDSfsql = fsql2,
JDXXfsql = fsql3
JDXXfsql = fsql3,
QKfsql = fsql4
});
services.AddSingleton<NLogManager>();
services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());

3
BBWY.Server.API/appsettings.json

@ -11,7 +11,8 @@
//"DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy;charset=utf8;sslmode=none;"
"DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy_test;charset=utf8;sslmode=none;",
"MDSDB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=mds;charset=utf8;sslmode=none;",
"JDXX": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=jdxx;charset=utf8;sslmode=none;"
"JDXX": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=jdxx;charset=utf8;sslmode=none;",
"QK": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=qiku;charset=utf8;sslmode=none;"
},
"GlobalSetting": {
"MdsApi": "http://mdsapi.qiyue666.com",

2
BBWY.Server.Business/FreeSqlMultiDBManager.cs

@ -10,5 +10,7 @@ namespace BBWY.Server.Business
public IFreeSql MDSfsql { get; set; }
public IFreeSql JDXXfsql { get; set; }
public IFreeSql QKfsql { get; set; }
}
}

61
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@ -1,6 +1,7 @@
using BBWY.Common.Models;
using BBWY.Server.Model;
using BBWY.Server.Model.Db;
using BBWY.Server.Model.Db.QK;
using BBWY.Server.Model.Dto;
using FreeSql;
using Jd.Api.Domain;
@ -10,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yitter.IdGenerator;
using static System.Net.Mime.MediaTypeNames;
@ -20,14 +22,18 @@ namespace BBWY.Server.Business
private ProductBusiness productBusiness;
private IEnumerable<PlatformSDKBusiness> platformSDKBusinessList;
private FreeSqlMultiDBManager freeSqlMultiDBManager;
public BatchPurchaseBusiness(IFreeSql fsql,
NLogManager nLogManager,
IIdGenerator idGenerator,
ProductBusiness productBusiness,
IEnumerable<PlatformSDKBusiness> platformSDKBusinessList) : base(fsql, nLogManager, idGenerator)
IEnumerable<PlatformSDKBusiness> platformSDKBusinessList,
FreeSqlMultiDBManager freeSqlMultiDBManager) : base(fsql, nLogManager, idGenerator)
{
this.productBusiness = productBusiness;
this.platformSDKBusinessList = platformSDKBusinessList;
this.freeSqlMultiDBManager = freeSqlMultiDBManager;
}
/// <summary>
@ -383,9 +389,32 @@ namespace BBWY.Server.Business
.ToList<PurchaseOrderV2Response>();
var purchaseOrderIdList = purchaseOrderList.Select(p => p.Id).ToList();
//获取订单 sku 费用
var orderList = freeSqlMultiDBManager.QKfsql.Select<PackTask>().Where(p => p.IsDeleted == 0)
.LeftJoin<FeesDetail>((p, f) => p.Id == f.TaskId).Where(d => purchaseOrderIdList.Contains(d.OrderId)).ToList<OrderTaskFees>();
var purchaseOrderSkuList = fsql.Select<PurchaseOrderSku>().Where(posku => purchaseOrderIdList.Contains(posku.PurchaseOrderId)).ToList<PurchaseOrderSkuResponse>();
if (orderList.Count > 0)
purchaseOrderSkuList.ForEach(p =>
{
var order = orderList.SingleOrDefault(o => o.OrderId == p.PurchaseOrderId && o.SkuId == p.SkuId);
if (order != null)
p.ConsumableAmount = order.DiscountPrice;//添加耗材费用
});
foreach (var purchaseOrder in purchaseOrderList)
{
purchaseOrder.ItemList = purchaseOrderSkuList.Where(posku => posku.PurchaseOrderId == purchaseOrder.Id).ToList();
purchaseOrder.ConsumableAmount =
purchaseOrderSkuList.Where(posku => posku.PurchaseOrderId == purchaseOrder.Id).Select(p => p.ConsumableAmount).Sum();
}
return new PurchaseOrderV2ListResponse() { Count = total, ItemList = purchaseOrderList };
}
@ -440,5 +469,35 @@ namespace BBWY.Server.Business
.ExecuteAffrows();
return new UpdatePackStateResponse();
}
public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request)
{
var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(order)
.Set(a => a.OrderState, request.PurchaseOrderState)
.ExecuteAffrows();
return new UpdatePackStateResponse();
}
public UpdatePackStateResponse UpdatePackMoney(UpdatePackMoneyRequest request)
{
var skuOrder = fsql.Select<PurchaseOrderSku>().Where(p => p.SkuId == request.SkuId && p.PurchaseOrderId == request.OrderId).ToOne();
fsql.Update<PurchaseOrderSku>(skuOrder)
.Set(p => p.ConsumableAmount, request.PackMoney)
.ExecuteAffrows();//设置sku耗材费
var orderSkus = fsql.Select<PurchaseOrderSku>().Where(p => p.PurchaseOrderId == request.OrderId).ToList();
var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(order)
.Set(a => a.ConsumableAmount, orderSkus.Select(o => o.ConsumableAmount).Sum())
.ExecuteAffrows();//设置订单耗材费
return new UpdatePackStateResponse();
}
}
}

79
BBWY.Server.Model/Db/QK/FeesDetail.cs

@ -0,0 +1,79 @@
using FreeSql.DataAnnotations;
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Server.Model.Db.QK
{
/// <summary>
/// 收费明细表
/// </summary>
[Table(Name = "feesdetail", DisableSyncStructure = true)]
public class FeesDetail
{
[Column(IsPrimary =true)]
public long Id { get; set; }
/// <summary>
/// 任务id
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 耗材ids
/// </summary>
public string ConsumableIds { get; set; }
/// <summary>
/// 耗材数量
/// </summary>
public string ConsumableNos { get; set; }
/// <summary>
/// 工序ids
/// </summary>
public string WorkProcessIds { get; set; }
/// <summary>
/// 工序数量
/// </summary>
public string WorkProcessNos { get; set; }
/// <summary>
/// 增值服务ids
/// </summary>
public string IncreateServiceIds { get; set; }
/// <summary>
/// 增值服务数量
/// </summary>
public string IncreateServiceNos { get; set; }
/// <summary>
/// 任务单件费用
/// </summary>
public decimal SingleFees { get; set; }
/// <summary>
/// 任务总费用
/// </summary>
public decimal AllFees { get; set; }
/// <summary>
/// 任务打折
/// </summary>
public decimal? Discount { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 打包服务项目
/// </summary>
public string PackServiceIds { get; set; }
/// <summary>
/// 服务数量
/// </summary>
public string PackServiceNos { get; set; }
public decimal? IncreaseFees { get; set; }
public decimal? PackFees { get; set; }
public decimal? ConsumableFees { get; set; }
public decimal? DiscountPrice { get; set; }
}
}

192
BBWY.Server.Model/Db/QK/PackTask.cs

@ -0,0 +1,192 @@
using FreeSql;
using FreeSql.DataAnnotations;
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml.Linq;
using BBWY.Server.Model;
namespace BBWY.Server.Model.Db.QK
{
/// <summary>
/// 打包任务
/// </summary>
[Table(Name = "packtask", DisableSyncStructure = true)]
public class PackTask
{
/// <summary>
/// 主键
/// </summary>
[Column(IsPrimary = true, IsNullable = false)]
public long Id { get; set; }
/// <summary>
/// 需求方创建日期
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 任务状态(未完成=0,已完成=1,)
/// </summary>
public int TaskStatus { get; set; }
/// <summary>
/// 项目完成时间
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 需求方团队id
/// </summary>
public string DepartmentId { get; set; }
/// <summary>
/// 需求方店铺id
/// </summary>
public string ShopId { get; set; }
/// <summary>
/// 货号品名(手写上传)
/// </summary>
public string BrandName { get; set; }
/// <summary>
/// 对接人
/// </summary>
public string UserId { get; set; }
/// <summary>
/// skuid
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// sku数量
/// </summary>
public int SkuCount { get; set; }
/// <summary>
/// 打包类型(单件=0,多件=1)
/// </summary>
public int PackType { get; set; }
/// <summary>
/// 落仓(本地仓=0,齐越仓=1,京东仓=2)
/// </summary>
public int PositionType { get; set; }
/// <summary>
/// 基础包装(快递袋=0,纸箱=1,麻袋=2)
/// </summary>
public int BasicPack { get; set; }
/// <summary>
/// 增量1()
/// </summary>
public string Increment1 { get; set; }
/// <summary>
/// 增量2()
/// </summary>
public int? Increment2 { get; set; }
/// <summary>
/// 工序道数
/// </summary>
public int? ProcessCount { get; set; }
/// <summary>
/// 条形码id
/// </summary>
public long? BarcodeId { get; set; }
/// <summary>
/// 合格证
/// </summary>
public long? CertificateId { get; set; }
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1)
/// </summary>
public int? CertificatePosition { get; set; }
/// <summary>
/// 箱子耗材(自带=0,4-13号纸箱=1-10,)
/// </summary>
public int? BoxConsumables { get; set; }
/// <summary>
/// sku配件名称
/// </summary>
public string SkuGoodsTitle { get; set; }
/// <summary>
/// 配件数
/// </summary>
public int GoodsNumber { get; set; }
/// <summary>
/// 气泡纸耗材(长=0,宽=1)
/// </summary>
public int? AirConsumables { get; set; }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get; set; }
/// <summary>
/// 到货情况(待收货=2,部分收货=1,已到货=0)
/// </summary>
public int Availability { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public int IsWorry { get; set; }
/// <summary>
/// 是否删除
/// </summary>
public Enums.IsDeleted IsDeleted { get; set; }
/// <summary>
/// 是否结清
/// </summary>
public Enums.Settle IsSettle { get; set; }
/// <summary>
/// 拳探订单id
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 店铺归属
/// </summary>
public string OriginShopId { get; set; }
/// <summary>
/// 账单归属(0=店铺,1=拳探)
/// </summary>
public Enums.BillOrigin BillOrigin { get; set; }
}
public class OrderTaskFees
{
public string OrderId { get; set; }
public string SkuId { get; set; }
public Decimal? DiscountPrice { get; set; }
}
}

15
BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/UpdatePackStateRequest.cs

@ -10,4 +10,19 @@ namespace BBWY.Server.Model.Dto
public string OrderId { get; set; }
public Enums.PackState PackState { get ;set ;}
}
public class UpdatePurchaseOrderStateRequest
{
public string OrderId { get; set; }
public Enums.PurchaseOrderState PurchaseOrderState { get; set; }
}
public class UpdatePackMoneyRequest
{
public string SkuId { get; set; }
public string OrderId { get; set; }
//设置sku 耗材费
public decimal PackMoney { get; set; }
}
}

20
BBWY.Server.Model/Enums.cs

@ -325,5 +325,25 @@
{
=0,=1,=2
}
public enum IsDeleted
{
= 0,
= 1
}
public enum Settle
{
= 0,
= 1
}
public enum BillOrigin
{
= 0,
= 1
}
}
}

Loading…
Cancel
Save