pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

店铺统计

AddValidOverTime
506583276@qq.com 2 years ago
parent
e1edd5b18d
commit
b186285c8e
7 changed files with 143 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      BBWY.Client/App.xaml.cs
  2. 47
      BBWY.Client/Models/PackTask/ShopTotal.cs
  3. 2
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  4. 25
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  5. 85
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  6. 26
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
  7. 1
      BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml

14
BBWY.Client/App.xaml.cs
View File

@ -38,17 +38,6 @@ namespace BBWY.Client
WindowsPrincipal windowsPrincipal = new WindowsPrincipal(current);
return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
}
static string GenerateRandom9Digit()
{
long timestamp = DateTime.UtcNow.ToUniversalTime().Ticks; // 64位时间戳
string ts_str = timestamp.ToString(); // 转为字符串
string nine_digit = ts_str.Substring(0, 9); // 取前9位
return nine_digit;
}
protected override void OnStartup(StartupEventArgs e)
{
var isAdmin = IsAdministrator();
@ -58,9 +47,6 @@ namespace BBWY.Client
var gl = new GlobalContext();
string userToken = string.Empty;
System.Diagnostics.Debug.WriteLine(GenerateRandom9Digit());
System.Diagnostics.Debug.WriteLine(GenerateRandom9Digit());
#if DEBUG
//仓库组测试
// userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";

47
BBWY.Client/Models/PackTask/ShopTotal.cs
View File

@ -52,9 +52,9 @@ namespace BBWY.Client.Models.PackTask
public decimal ConsumableFees { get; set; }
public decimal Price { get; set; }
// public decimal Price { get; set; }
public decimal Discount { get; set; }
//public decimal Discount { get; set; }
public decimal DiscountPrice { get; set; }
/// <summary>
@ -70,7 +70,7 @@ namespace BBWY.Client.Models.PackTask
/// <summary>
/// 打包费用
/// </summary>
public decimal? PackAllFees { get; set; }
//public decimal? PackAllFees { get; set; }
/// <summary>
/// 箱子费用
@ -89,11 +89,50 @@ namespace BBWY.Client.Models.PackTask
/// </summary>
public decimal? OtherConsumableFees { get; set; }
/// <summary>
/// 折扣系数
/// </summary>
public decimal? DiscountFactor { get; set; }
/// <summary>
/// 到货数量
/// </summary>
public int? ArrivalQuantity { get; set; }
/// <summary>
/// 基础价格(基础包装费、仅贴码)
/// </summary>
public decimal? BasicPrice { get; set; }
/// <summary>
/// 增量价格
/// </summary>
public decimal? IncrementPartPrice { get; set; }
/// <summary>
/// 增量工序价
/// </summary>
public decimal? IncrementProcessPrice { get; set; }
/// <summary>
/// 折扣类型
/// </summary>
public FeesMode? FeesMode { get; set; }
/// <summary>
/// 总费用
/// </summary>
public decimal? AllFees { get; set; }
/// <summary>
/// 打包费用折扣价
/// </summary>
public decimal? PackDisCountFees { get; set; }
public override string ToString()
{
return $"{TaskId},{CreateTime.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
$",{SkuCount},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{PackSingleFees},{PackAllFees},{Price},{Discount},{DiscountPrice}";
$",{SkuCount},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{ArrivalQuantity},{BasicPrice},{IncrementPartPrice},{IncrementProcessPrice},{PackSingleFees},{PackFees},{FeesMode},{DiscountFactor},{PackDisCountFees},{IncreaseFees},{AllFees}";
}
}

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

@ -130,7 +130,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (res.Success)
{
//string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
string title = "任务ID,日期,是否结清,所属部门,所属店铺,打包数量,箱子,气泡纸,胶带,其他,耗材总价,打包单价,打包总价,原价,促销折扣,总收费";
string title = "任务ID,日期,是否结清,所属部门,所属店铺,打包数量,箱子,气泡纸,胶带,其他,耗材总价,收货数量,基础价格,增量配件价,增量工序价格,打包单价,打包原价,收费方式,打包折扣系数,打包折扣价,增值费用,总收费";
var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
excelList.Insert(0, title);
System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);

25
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
View File

@ -95,9 +95,10 @@ namespace BBWY.Client.ViewModels
public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string> {
};
private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
{
};
public ObservableCollection<string> PreCompeteTimeDayList { get => preCompeteTimeDayList; set { Set(ref preCompeteTimeDayList, value); } }
@ -484,7 +485,7 @@ namespace BBWY.Client.ViewModels
var window = obj as BWindow;
window.Close();
}
@ -498,8 +499,8 @@ namespace BBWY.Client.ViewModels
}
if (BarCodeModel == null)
{
var resCode = packPurchaseTaskService.SearchBarCode(SkuId);
if (resCode==null)
var resCode = packPurchaseTaskService.SearchBarCode(SkuId);
if (resCode == null)
{
BarCodeModel = new BarCodeModel();
BarCodeModel.ProductNo = ProductNo;
@ -511,7 +512,7 @@ namespace BBWY.Client.ViewModels
{
BarCodeModel = resCode.Data;
}
}
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;
@ -575,8 +576,8 @@ namespace BBWY.Client.ViewModels
/// </summary>
private void LookCer(CertificateModel certificate)
{
QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
lookCerWindow.Show();
}
/// <summary>
@ -596,7 +597,7 @@ namespace BBWY.Client.ViewModels
{
InitData();
TaskId = model.TaskId;
OrderId =model.OrderId;
OrderId = model.OrderId;
SkuId = model.SkuId;
SkuName = model.ItemList[0].SkuName;
Logo = model.ItemList[0].Logo.Replace("80x80", "200x200");
@ -617,7 +618,7 @@ namespace BBWY.Client.ViewModels
IncreateList = new ObservableCollection<IncreateModel>();
string[] increateDatas = model.Increment1?.Split(',');
bool isSelected = false;
foreach (var item in increates)
{
isSelected = false;
@ -661,7 +662,7 @@ namespace BBWY.Client.ViewModels
}
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null&&!list.Success)
if (list == null && !list.Success)
{
PurchaseSkuList.Add(item); continue;
}

85
BBWY.Client/Views/PackTask/PackTaskTotal.xaml
View File

@ -131,7 +131,13 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
@ -148,12 +154,18 @@
<TextBlock Text="胶带" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="其他" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="耗材总价" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包单价" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包总价" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="原价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="促销折扣" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="总价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="17" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="收货数量" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="基础价格" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增量配件价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增量工序价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包单价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包原价" Grid.Column="17" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="收费方式" Grid.Column="18" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包折扣系数" Grid.Column="19" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包折扣价" Grid.Column="20" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增值费用" Grid.Column="21" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="总费用" Grid.Column="22" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="23" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -174,10 +186,16 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="17"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="18" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="18"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="19"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="20"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="21"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="22"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="23"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="24" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<ListBox x:Name="listbox_order"
Grid.Row="1" Grid.ColumnSpan="18"
Grid.Row="1" Grid.ColumnSpan="24"
ItemsSource="{Binding PackTaskTotalList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
@ -203,7 +221,13 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
@ -279,29 +303,56 @@
<TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="12" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackSingleFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding ArrivalQuantity}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="13" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackAllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding BasicPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="14" Margin="0 0 1 0" >
<TextBlock Text="{Binding IncrementPartPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="15" Margin="0 0 1 0" >
<TextBlock Text="{Binding IncrementProcessPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="16" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackSingleFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="14" Margin="0 0 1 0">
<TextBlock Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Grid Grid.Column="17" Margin="0 0 1 0">
<TextBlock Text="{Binding PackFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="15" Margin="0 0 1 0">
<TextBlock Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Grid Grid.Column="18" Margin="0 0 1 0">
<TextBlock Text="{Binding FeesMode}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="16" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Grid Grid.Column="19" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountFactor,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="17" Margin="0 0 1 0">
<Grid Grid.Column="20" Margin="0 0 1 0">
<TextBlock Text="{Binding PackDisCountFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="21" Margin="0 0 1 0">
<TextBlock Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="22" Margin="0 0 1 0">
<TextBlock Text="{Binding AllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="23" Margin="0 0 1 0">
<c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清"
Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding TaskId}"

26
BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
View File

@ -49,24 +49,34 @@ namespace BBWY.Client.Views.PackTask
var data = helper.Get(url);
var res = JsonConvert.DeserializeObject<ApiResponse<UserDepartment[]>>(data);
if (res == null)
{
System.Windows.MessageBox.Show("网络异常");
return;
}
if (!res.Success)
{
System.Windows.MessageBox.Show(res.Msg);
return;
}
//创建一个ListBoxIem
if (res.Success)
if (res.Data != null && res.Data.Length > 0)
{
if (res.Data != null && res.Data.Length > 0)
foreach (var department in res.Data)
{
foreach (var department in res.Data)
if (!departments.Contains(department.DePartmentName))
{
if (!departments.Contains(department.DePartmentName))
{
departments.Add(department.DePartmentName);
}
departments.Add(department.DePartmentName);
}
}
}
}
}
public string QKApiHost { get; set; }
public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e)

1
BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml
View File

@ -78,7 +78,6 @@
<c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d30}"/>
</StackPanel>
<Grid Grid.Column="1" Grid.RowSpan="3" Margin="300 0 0 0">

Write Preview
Loading…
Cancel
Save