Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
a759475064
  1. 173
      BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs
  2. 27
      BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
  3. 4
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  4. 2
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  5. 5
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  6. 19
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  7. 10
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  8. 11
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  9. 26
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  10. 7
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

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

@ -1,173 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Automation.Peers;
using WebSocketSharp;
namespace BBWY.Client.Models.APIModel.Response.PackTask
{
//public class PackTaskResultResponse
//{
// /// <summary>
// /// 查询总数据(判断总页数)
// /// </summary>
// public int TotalCount { get; set; }
// /// <summary>
// /// 页面返回的数据
// /// </summary>
// public GetPackTaskDTO[] Items { get; set; }
//}
//public class GetPackTaskDTO
//{
// /// <summary>
// /// SKU标题
// /// </summary>
// public string SkuName { get; set; }
// /// <summary>
// /// 图片链接
// /// </summary>
// public string Logo { get; set; }
// /// <summary>
// /// 任务id
// /// </summary>
// public long TaskId { get; set; }
// /// <summary>
// /// 需求方创建日期
// /// </summary>
// public DateTime CreateTime { get; set; }
// /// <summary>
// /// 任务状态(未完成=0,已完成=1,)
// /// </summary>
// public int TaskStatus { get; set; }
// /// <summary>
// /// 需求方团队
// /// </summary>
// public string DepartmentName { get; set; }
// /// <summary>
// /// 需求方店铺
// /// </summary>
// public string ShopName { get; set; }
// /// <summary>
// /// 货号
// /// </summary>
// public string ProductItemNum { get; set; }
// /// <summary>
// /// 货号品名
// /// </summary>
// public string BrandName { get; set; }
// /// <summary>
// /// 对接人
// /// </summary>
// public string UserName { get; set; }
// /// <summary>
// /// 打包人
// /// </summary>
// public string[] PackUserName { 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,3=聚水潭)
// /// </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>
// /// 工序道数
// /// </summary>
// public int? ProcessCount { get; set; }
// /// <summary>
// /// 到货情况(待收货=0,部分收货=1,已到货=2)
// /// </summary>
// public int Availability { get; set; }
// //todo: 条形码数据 合格证数据
// ///// <summary>
// ///// 打包费用
// ///// </summary>
// //public FeesItemTypeDTO FeesItemTypeDTO { get; set; }
// /// <summary>
// ///
// /// </summary>
// public FeesItemResponse FeesItemResponse { 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; }
// public BarCodeModel BarCodeDTO { get; set; }
// public CertificateModel[] cers { get; set; }
// /// <summary>
// /// 是否加急
// /// </summary>
// public int IsWorry { get; set; }
// /// <summary>
// /// 品牌
// /// </summary>
// public string Brand { get; set; }
// public string OrderId { get; set; }
//}
}

27
BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs

@ -105,10 +105,10 @@ namespace BBWY.Client.Models.APIModel
public string Increment1 { get; set; }
/// <summary>
/// 到货情况(待收货=0,部分收货=1,已到货=2)
/// </summary>
public int Availability { get; set; }
///// <summary>
///// 到货情况(待收货=0,部分收货=1,已到货=2)
///// </summary>
//public int Availability { get; set; }
/// <summary>
@ -134,10 +134,10 @@ namespace BBWY.Client.Models.APIModel
public int GoodsNumber { get; set; }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get; set; }
///// <summary>
///// 注意事项(对接备注)
///// </summary>
//public string MarkMessage { get; set; }
/// <summary>
@ -151,10 +151,10 @@ namespace BBWY.Client.Models.APIModel
public CertificateModel[] Cers { get; set; }
/// <summary>
/// 品牌
/// </summary>
public string Brand { get; set; }
///// <summary>
///// 品牌
///// </summary>
//public string Brand { get; set; }
public string OrderId { get; set; }
@ -188,9 +188,6 @@ namespace BBWY.Client.Models.APIModel
/// 打包超时备注信息
/// </summary>
public string PackOverTimeMarkMsg { get; set; }
/// <summary>
/// 备注消息列表
/// </summary>

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

@ -45,14 +45,14 @@ namespace BBWY.Client.Models
{
if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())
if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())//B端有采购方案
{
UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this,ReflashTask);
updatePurchaseWindow.ShowDialog();
return;
}
if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端手动添加合格证
if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端无采购方案 ,手动添加合格证
{
PublishTaskWindow publishB = new PublishTaskWindow(ReflashTask, this,SaveType.B端);
publishB.ShowDialog();

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

@ -547,10 +547,8 @@ namespace BBWY.Client.ViewModels.PackTask
var data = new PackTaskModel()
{
Brand = item.Brand,
SkuId = item.SkuId,
AcceptName = item.UserName,
Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition,

5
BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask
OriginShopName = obj.ShopName;
SkuId =obj.SkuId;
SkuId = obj.SkuId;
OrderId = obj.OrderId;
var shopList = globalContext.User.ShopList;
@ -552,7 +552,8 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in productSku.Data.PurchaseSkus)
{
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null) continue;
if (list == null ||!list.Success|| list.Data == null)
continue;
var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
if (skuItem == null)
{

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

@ -1064,6 +1064,14 @@ namespace BBWY.Client.ViewModels.PackTask
System.Windows.MessageBox.Show("该任务采购单未进行发货,请联系业务进行发货后在确认收货", "提示");
return;
}
}
if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
if (!model.OrderId.IsNullOrEmpty())
{
var manualSigns = packTaskService.BatchManualSign(model.ExpressOrderList.Select(e => e.WaybillNo).ToArray());
if (manualSigns == null || !manualSigns.Success)
{
@ -1074,11 +1082,6 @@ namespace BBWY.Client.ViewModels.PackTask
}
}
}
if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
res = packTaskService.SetPackTaskState(taskId, Models.TaskState.);
break;
case Models.TaskState.:
@ -1088,7 +1091,7 @@ namespace BBWY.Client.ViewModels.PackTask
var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId);
if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0)
{
System.Windows.MessageBox.Show("请先设置打包费用!");
System.Windows.MessageBox.Show("请先设置打包费用0!");
return;
}
if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
@ -1469,7 +1472,7 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in dataModel.WaitSealBoxModels)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
App.Current.Dispatcher.Invoke(new Action(() =>
{
WareNoSealBoxModels.Add(new WareNoSealBoxModel
{
@ -1477,7 +1480,6 @@ namespace BBWY.Client.ViewModels.PackTask
DepartmentName = item.DepartmentName,
SealBoxSkus = item.SealBoxSkus.Select(s =>
{
s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
return s;
}).ToList(),
@ -1516,7 +1518,6 @@ namespace BBWY.Client.ViewModels.PackTask
var data = new PackTaskModel()
{
AcceptName = item.UserName,
Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition,

10
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@ -638,7 +638,6 @@ namespace BBWY.Client.ViewModels
FloorDragNumberList.Add(i + 1);
}));
}
TaskId = model.TaskId;
OrderId = model.OrderId;
@ -700,9 +699,6 @@ namespace BBWY.Client.ViewModels
MessageBox.Show(packTaskRes.Msg);
return;
}
SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
saveType = packTaskRes.Data.SaveType;
if (saveType == null)
@ -741,9 +737,8 @@ namespace BBWY.Client.ViewModels
}));
continue;
}
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null && !list.Success)
if (list == null && !list.Success && list.Data == null)
{
App.Current.Dispatcher.Invoke(new Action(() =>
{
@ -752,7 +747,8 @@ namespace BBWY.Client.ViewModels
continue;
}
PurchaseSkuItemBasicInfoResponse skuItem = null;
if (list.Data != null) skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
if (list.Data != null)
skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
App.Current.Dispatcher.Invoke(new Action(() =>

11
BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@ -152,7 +152,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
@ -161,7 +161,6 @@
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
@ -212,7 +211,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
@ -284,7 +283,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
@ -578,8 +577,8 @@
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1"
Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }"
Command="{Binding SetServiceCommand}"
Visibility="Visible" />
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
/>
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
Command="{Binding QualityTaskCommand}"

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

@ -157,11 +157,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
@ -172,7 +172,7 @@
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="注意事项/对接备注" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包员" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
@ -214,11 +214,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
@ -272,11 +272,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
@ -454,7 +454,7 @@
</ListBox>
</Grid>
<Grid Grid.Column="6" >
<!--<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
@ -464,7 +464,7 @@
</StackPanel>
</Grid>
</Grid>-->
<Grid Grid.Column="7">
<Grid>
@ -517,11 +517,15 @@
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/>
<StackPanel
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
CommandParameter="{Binding}"
Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
Command="{Binding DataContext.CompletedPackTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
/>
</StackPanel>
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"

7
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@ -625,13 +625,6 @@
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
CommandParameter="{Binding}"
Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
/>
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"

Loading…
Cancel
Save