diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 74ef1f7d..88b79fe5 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -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";
diff --git a/BBWY.Client/Models/PackTask/ShopTotal.cs b/BBWY.Client/Models/PackTask/ShopTotal.cs
index 768f326a..754c454b 100644
--- a/BBWY.Client/Models/PackTask/ShopTotal.cs
+++ b/BBWY.Client/Models/PackTask/ShopTotal.cs
@@ -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; }
///
@@ -70,7 +70,7 @@ namespace BBWY.Client.Models.PackTask
///
/// 打包费用
///
- public decimal? PackAllFees { get; set; }
+ //public decimal? PackAllFees { get; set; }
///
/// 箱子费用
@@ -89,11 +89,50 @@ namespace BBWY.Client.Models.PackTask
///
public decimal? OtherConsumableFees { get; set; }
+
+
+ ///
+ /// 折扣系数
+ ///
+ public decimal? DiscountFactor { get; set; }
+ ///
+ /// 到货数量
+ ///
+ public int? ArrivalQuantity { get; set; }
+
+ ///
+ /// 基础价格(基础包装费、仅贴码)
+ ///
+ public decimal? BasicPrice { get; set; }
+ ///
+ /// 增量价格
+ ///
+ public decimal? IncrementPartPrice { get; set; }
+ ///
+ /// 增量工序价
+ ///
+ public decimal? IncrementProcessPrice { get; set; }
+
+ ///
+ /// 折扣类型
+ ///
+ public FeesMode? FeesMode { get; set; }
+
+ ///
+ /// 总费用
+ ///
+ public decimal? AllFees { get; set; }
+
+ ///
+ /// 打包费用折扣价
+ ///
+ 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}";
}
}
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index f40b43c8..e6911d84 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -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);
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index f8418df1..c51f0d56 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -95,9 +95,10 @@ namespace BBWY.Client.ViewModels
public ObservableCollection AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
- private ObservableCollection preCompeteTimeDayList = new ObservableCollection {
-
- };
+ private ObservableCollection preCompeteTimeDayList = new ObservableCollection
+ {
+
+ };
public ObservableCollection 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
///
private void LookCer(CertificateModel certificate)
{
-
- QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
+
+ QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
lookCerWindow.Show();
}
///
@@ -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();
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;
}
diff --git a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
index 8247fa47..4500eb96 100644
--- a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
+++ b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
@@ -131,7 +131,13 @@
+
+
+
+
+
+
@@ -148,12 +154,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -174,10 +186,16 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -279,29 +303,56 @@
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
>(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)
diff --git a/BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml b/BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml
index d08c87ac..c99bc2b6 100644
--- a/BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml
+++ b/BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml
@@ -78,7 +78,6 @@
-