Browse Source

添加任务备注

updatebug
506583276@qq.com 2 years ago
parent
commit
27ede2fea3
  1. 11
      BBWYB.Client/APIServices/PackPurchaseTaskService.cs
  2. 146
      BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs
  3. 10
      BBWYB.Client/ViewModels/Order/OrderViewModel.cs
  4. 79
      BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
  5. 22
      BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
  6. 4
      BBWYB.Client/appsettings.json

11
BBWYB.Client/APIServices/PackPurchaseTaskService.cs

@ -1,5 +1,6 @@
using BBWYB.Client.Models; using BBWYB.Client.Models;
using BBWYB.Client.Models.APIModel; using BBWYB.Client.Models.APIModel;
using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask;
using BBWYB.Common.Http; using BBWYB.Common.Http;
using BBWYB.Common.Models; using BBWYB.Common.Models;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
@ -121,6 +122,16 @@ namespace BBWYB.Client.APIServices
}, null, HttpMethod.Post); }, null, HttpMethod.Post);
} }
public ApiResponse<PackTaskResponse> GetOrderTask(string skuId, string orderId)
{
return SendRequest<PackTaskResponse>(globalContext.QKApiHost, $"api/PackPurchaseTask/GetOrderTask", new
{
skuId,
orderId
}, null, HttpMethod.Post);
}
} }
public class WareHourseDTO public class WareHourseDTO

146
BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/PackTaskResponse.cs

@ -0,0 +1,146 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BBWYB.Client.Models.APIModel.Response.PackPurchaseTask
{
public class PackTaskResponse
{
/// <summary>
/// 主键
/// </summary>
[Key]
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>
/// 条形码id
/// </summary>
public long? BarcodeId { get; set; }
/// <summary>
/// 合格证
/// </summary>
public long? CertificateId { get; set; }
/// <summary>
/// 新合格证
/// </summary>
public string CerId { get; set; }
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1,无=2)
/// </summary>
public int? CertificatePosition { get; set; } = 2;
/// <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>
/// 拳探订单id
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 店铺归属
/// </summary>
public string OriginShopId { get; set; }
/// <summary>
/// 采购方案id
/// </summary>
public string SkuPurchaseSchemeId { get; set; }
}
}

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

@ -10,6 +10,7 @@ using SJ.Controls;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@ -107,13 +108,16 @@ namespace BBWYB.Client.ViewModels
var objList = (object[])obj; var objList = (object[])obj;
var OriginShopName = (string)objList[0]; var OriginShopName = (string)objList[0];
OrderSku order = (OrderSku)objList[1]; OrderSku order = (OrderSku)objList[1];
var res = PackPurchaseTaskService.IsExitQikuTask(order.BelongSkuId, order.OrderId);
var res = PackPurchaseTaskService.GetOrderTask(order.BelongSkuId, order.OrderId);
if (res == null || !res.Success) if (res == null || !res.Success)
{ {
MessageBox.Show("网络异常!查不到任务"); MessageBox.Show("网络异常!查不到任务");
return; return;
} }
if (!res.Data) if (res.Data==null)
{ {
MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!");
return; return;
@ -122,7 +126,7 @@ namespace BBWYB.Client.ViewModels
ViewModelLocator view = new(); ViewModelLocator view = new();
var updatePackTask = view.UpdatePurchaseTask; var updatePackTask = view.UpdatePurchaseTask;
updatePackTask.SearchSku(obj); updatePackTask.SearchSku(res.Data, OriginShopName, order);
updatePackTask.ReflashWindow = () => { updatePackTask.ReflashWindow = () => {
Task.Factory.StartNew(() => LoadOrder(PageIndex)); Task.Factory.StartNew(() => LoadOrder(PageIndex));

79
BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs

@ -14,6 +14,7 @@ using System.Windows;
using BBWYB.Client.Models.PackPurchaseTask; using BBWYB.Client.Models.PackPurchaseTask;
using BBWYB.Client.Views.PackPurchaseTask; using BBWYB.Client.Views.PackPurchaseTask;
using BBWYB.Client.Models.APIModel; using BBWYB.Client.Models.APIModel;
using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask;
namespace BBWYB.Client.ViewModels namespace BBWYB.Client.ViewModels
{ {
@ -301,7 +302,7 @@ namespace BBWYB.Client.ViewModels
SetCertificateCommand = new RelayCommand<Models.PackPurchaseTask.PurchaseSku>(SetCertificate); SetCertificateCommand = new RelayCommand<Models.PackPurchaseTask.PurchaseSku>(SetCertificate);
LookBarCommand = new RelayCommand(LookBar); LookBarCommand = new RelayCommand(LookBar);
LookCerCommand = new RelayCommand<string>(LookCer); LookCerCommand = new RelayCommand<string>(LookCer);
SearchSkuCommand = new RelayCommand<object>(SearchSku);
IncreateList = new ObservableCollection<IncreateModel>(); IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates) foreach (var item in increates)
{ {
@ -313,10 +314,7 @@ namespace BBWYB.Client.ViewModels
} }
this.purchaseService = purchaseService; this.purchaseService = purchaseService;
#if DEBUG
//Test();
#endif
} }
PurchaseService purchaseService; PurchaseService purchaseService;
public string OriginShopName { get; set; } public string OriginShopName { get; set; }
@ -325,12 +323,6 @@ namespace BBWYB.Client.ViewModels
public string ShopId { get; set; } public string ShopId { get; set; }
public string UserName { get; set; } public string UserName { get; set; }
public void Test(OrderSku order)
{
SearchSku(order);
}
#region 方法 #region 方法
public ICommand SetBarCodeCommand { get; set; } public ICommand SetBarCodeCommand { get; set; }
@ -384,7 +376,8 @@ namespace BBWYB.Client.ViewModels
if (model.CerDTO == null) if (model.CerDTO == null)
{ {
model.CerDTO = new CertificateModel { model.CerDTO = new CertificateModel
{
ProductNo = ProductNo, ProductNo = ProductNo,
Brand = Brand, Brand = Brand,
SkuId = SkuId, SkuId = SkuId,
@ -430,14 +423,14 @@ namespace BBWYB.Client.ViewModels
/// <summary> /// <summary>
/// 搜索 skuId(todo:) /// 搜索 skuId(todo:)
/// </summary> /// </summary>
public void SearchSku(object obj) public void SearchSku(PackTaskResponse obj, string shopname, OrderSku order)
{ {
InitData(); InitData();
var objList = (object[])obj;
MarkMessage = obj.MarkMessage;
//SkuPurchaseSchemeId = "416647656341573"; //SkuPurchaseSchemeId = "416647656341573";
OriginShopName = (string)objList[0]; OriginShopName = shopname;
OrderSku order= (OrderSku)objList[1];
SkuId = order.BelongSkuId; SkuId = order.BelongSkuId;
OrderId = order.OrderId; OrderId = order.OrderId;
@ -487,7 +480,7 @@ namespace BBWYB.Client.ViewModels
new TipsWindow(productSku.Msg).Show(); new TipsWindow(productSku.Msg).Show();
return; return;
} }
SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId; SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
BarCodeModel = productSku.Data.BarCode; BarCodeModel = productSku.Data.BarCode;
@ -509,15 +502,17 @@ namespace BBWYB.Client.ViewModels
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null) continue; if (list == null) continue;
var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
App.Current.Dispatcher.Invoke(new Action(() => { App.Current.Dispatcher.Invoke(new Action(() =>
PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku { {
Logo=skuItem.Logo, PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku
Title=skuItem.Title, {
IsNeedCer=item.IsNeedCer, Logo = skuItem.Logo,
PurchaseSkuId=item.PurchaseSkuId, Title = skuItem.Title,
CerDTO=item.CerDTO, IsNeedCer = item.IsNeedCer,
IsSetCertificate= item.CerDTO==null?true:false , PurchaseSkuId = item.PurchaseSkuId,
}); CerDTO = item.CerDTO,
IsSetCertificate = item.CerDTO == null ? true : false,
});
})); }));
} }
@ -533,10 +528,10 @@ namespace BBWYB.Client.ViewModels
PackType = (PackType)config.PackType; PackType = (PackType)config.PackType;
BasicPack = (BasicPack)config.BasicPack; BasicPack = (BasicPack)config.BasicPack;
Availability = (TaskState)config.Availability; Availability = (TaskState)config.Availability;
MarkMessage = config.MarkMessage; //MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value; CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1; // Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(','); string[] increateDatas = config.Increment1?.Split(',');
IsNeedBarCode = config.NeedBar ? Need. : Need.; IsNeedBarCode = config.NeedBar ? Need. : Need.;
IsNeedCertificateModel = config.NeedCer ? Need. : Need.; IsNeedCertificateModel = config.NeedCer ? Need. : Need.;
@ -547,7 +542,7 @@ namespace BBWYB.Client.ViewModels
foreach (var item in increates) foreach (var item in increates)
{ {
isSelected = false; isSelected = false;
if (increateDatas.Contains(item)) if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
{ {
isSelected = true; isSelected = true;
} }
@ -617,12 +612,12 @@ namespace BBWYB.Client.ViewModels
PackType = PackType.; PackType = PackType.;
BasicPack = BasicPack.; BasicPack = BasicPack.;
// Availability = (TaskState.)config.Availability; // Availability = (TaskState.)config.Availability;
//MarkMessage = config.MarkMessage; MarkMessage = "";
CertificatePosition = CertificatePosition.; CertificatePosition = CertificatePosition.;
// Increment1 = config.Increment1; // Increment1 = config.Increment1;
IsNeedBarCode = Need. ; IsNeedBarCode = Need.;
IsNeedCertificateModel = Need.; IsNeedCertificateModel = Need.;
} }
private void OpenSkuDetail(object param) private void OpenSkuDetail(object param)
{ {
@ -645,7 +640,7 @@ namespace BBWYB.Client.ViewModels
} }
private void CreateTask(object obj) private void CreateTask(object obj)
{ {
string increateStr = ""; string increateStr = "";
var increates = IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName); var increates = IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName);
if (increates != null && increates.Count() > 0) if (increates != null && increates.Count() > 0)
@ -663,10 +658,10 @@ namespace BBWYB.Client.ViewModels
BasicPack = (int)BasicPack, BasicPack = (int)BasicPack,
SkuId = SkuId, SkuId = SkuId,
Increment1 = increateStr, Increment1 = increateStr,
CertificatePosition = (int)CertificatePosition, CertificatePosition = (int)CertificatePosition,
PackType = (int)PackType, PackType = (int)PackType,
// MarkMessage = MarkMessage, MarkMessage = MarkMessage,
PositionType = (int)PositionType, PositionType = (int)PositionType,
GoodsNumber = GoodsNumber, GoodsNumber = GoodsNumber,
SkuGoodsTitle = SkuTitle, SkuGoodsTitle = SkuTitle,
@ -675,8 +670,10 @@ namespace BBWYB.Client.ViewModels
NeedCer = IsNeedCertificateModel == Need., NeedCer = IsNeedCertificateModel == Need.,
SkuPurchaseSchemeId = SkuPurchaseSchemeId, SkuPurchaseSchemeId = SkuPurchaseSchemeId,
Brand = Brand, Brand = Brand,
PurchaseSkuSpecs = PurchaseSkuList.Select(p => new PurchaseSkuSpec { PurchaseSkuSpecs = PurchaseSkuList.Select(p => new PurchaseSkuSpec
IsNeedCer=p.IsNeedCer, PurchaseSkuId=p.PurchaseSkuId, {
IsNeedCer = p.IsNeedCer,
PurchaseSkuId = p.PurchaseSkuId,
}).ToArray() }).ToArray()
//IsWorry = IsWorry //IsWorry = IsWorry
@ -685,15 +682,15 @@ namespace BBWYB.Client.ViewModels
{ {
if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0) if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0)
{ {
new TipsWindow("请设置条形码模板").Show(); new TipsWindow("请设置条形码模板").Show();
return; return;
} }
createTaskModel.BarCodeId = BarCodeModel.Id; createTaskModel.BarCodeId = BarCodeModel.Id;
} }
if (IsNeedCertificateModel == Need.) if (IsNeedCertificateModel == Need.)
{ {
var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c=>c.Id).Where(c => c > 0).ToList(); var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
if ( purchaseSkuList.Count() <= 0|| cerList.Count<=0) if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0)
{ {
new TipsWindow("请设置合格证模板").Show(); new TipsWindow("请设置合格证模板").Show();
return; return;

22
BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml

@ -16,7 +16,7 @@
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0" RightButtonGroupMargin="0,5,5,0"
Height="450" Width="1305"> Height="520" Width="1305">
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@ -127,7 +127,7 @@
</StackPanel> </StackPanel>
<Grid Grid.Column="1"> <Grid Grid.Column="1">
<ListBox x:Name="listbox_order" HorizontalAlignment="Left" <ListBox x:Name="listbox_order" HorizontalAlignment="Left"
Height="155" Width="900" Margin="0" ScrollViewer.HorizontalScrollBarVisibility="Auto" Height="155" Width="900" Margin="0" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}" ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
@ -142,14 +142,14 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid <Grid
MinHeight="100"> MinHeight="100">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<c:BAsyncImage UrlSource="{Binding Logo}" <c:BAsyncImage UrlSource="{Binding Logo}"
Width="150" Height="150" Width="150" Height="150"
VerticalAlignment="Top" Margin="25 0 0 0" VerticalAlignment="Top" Margin="25 0 0 0"
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <!--<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
@ -159,7 +159,7 @@
</b:InvokeCommandAction.CommandParameter> </b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction> </b:InvokeCommandAction>
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>-->
</c:BAsyncImage> </c:BAsyncImage>
<DockPanel VerticalAlignment="Top" Width="190" Height="150"> <DockPanel VerticalAlignment="Top" Width="190" Height="150">
@ -240,8 +240,13 @@
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<TextBlock Text="打包配置" FontWeight="Bold" FontSize="13" Margin="19 23 " HorizontalAlignment="Left" VerticalAlignment="Top"/> <Grid.RowDefinitions>
<Grid Height="70" Margin="20 54 20 0"> <RowDefinition Height="40"/>
<RowDefinition/>
<RowDefinition Height="70"/>
</Grid.RowDefinitions>
<TextBlock Text="打包配置" FontWeight="Bold" FontSize="13" Margin="19 0 0 0 " HorizontalAlignment="Left" VerticalAlignment="Center"/>
<Grid Height="70" Grid.Row="1" Margin="20 0 20 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/> <ColumnDefinition Width="77"/>
<ColumnDefinition Width="77"/> <ColumnDefinition Width="77"/>
@ -334,6 +339,9 @@
</ComboBox> </ComboBox>
</Grid> </Grid>
</Grid> </Grid>
<c:BTextBox Grid.Row="3" Text="{Binding MarkMessage,Mode=TwoWay}" WaterRemark="打包备注" AcceptsReturn="True" TextWrapping="Wrap" Grid.ColumnSpan="2" Margin="20 0 20 0" Height="60"/>
</Grid> </Grid>
</Grid> </Grid>

4
BBWYB.Client/appsettings.json

@ -3,7 +3,7 @@
"BBWYApiHost": "http://bbwyb.qiyue666.com", "BBWYApiHost": "http://bbwyb.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"BBWYCApiHost": "http://bbwytest.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com",
"QKApiHost": "http://localhost:8080" //"QKApiHost": "http://localhost:8080"
//"QKApiHost": "http://qiku.qiyue666.com" "QKApiHost": "http://qiku.qiyue666.com"
} }
Loading…
Cancel
Save