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

10224

pjzs_starttask_update
shanji 2 years ago
parent
15a3988343
commit
abbbec1e74
15 changed files with 188 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      BBWY.Client/APIServices/OrderService.cs
  2. 2
      BBWY.Client/GlobalContext.cs
  3. 9
      BBWY.Client/Models/APIModel/Response/BillCorrection/BillCorrectionOrderResponse.cs
  4. 13
      BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
  5. 9
      BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
  6. 9
      BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs
  7. 9
      BBWY.Client/Models/BillCorrection/BillCorrectionOrder.cs
  8. 59
      BBWY.Client/Models/Order/ManualEditCostOrderSku.cs
  9. 39
      BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs
  10. 8
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  11. 10
      BBWY.Client/Views/BillCorrection/BillCorrectionView.xaml
  12. 10
      BBWY.Client/Views/Order/ManualCalculationCost.xaml
  13. 8
      BBWY.Client/Views/Order/OrderListControl.xaml
  14. 104
      BBWY.Client/Views/Ware/WareStock.xaml
  15. 4
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs

3
BBWY.Client/APIServices/OrderService.cs
View File

@ -126,7 +126,8 @@ namespace BBWY.Client.APIServices
osku.PurchaseFreight, osku.PurchaseFreight,
osku.ProductId, osku.ProductId,
osku.SkuAmount, osku.SkuAmount,
osku.StorageAmount, //osku.StorageAmount,
osku.PackagingLaborAmount,
osku.TotalCost, osku.TotalCost,
osku.UnitCost osku.UnitCost
}), }),

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10223"; ClientVersion = "10224";
} }

9
BBWY.Client/Models/APIModel/Response/BillCorrection/BillCorrectionOrderResponse.cs
View File

@ -61,10 +61,15 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal ConsumableAmount { get; set; } = 0.00M; public decimal ConsumableAmount { get; set; } = 0.00M;
///// <summary>
///// 仓储费
///// </summary>
//public decimal StorageAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 仓储费 /// 包装人工费
/// </summary> /// </summary>
public decimal StorageAmount { get; set; } = 0.00M; public decimal PackagingLaborAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 售后费用 /// 售后费用

13
BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs
View File

@ -37,10 +37,15 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal FirstFreight { get; set; } public decimal FirstFreight { get; set; }
///// <summary>
///// 仓储费
///// </summary>
//public decimal StorageAmount { get; set; }
/// <summary> /// <summary>
/// 仓储费 /// 包装人工费
/// </summary> /// </summary>
public decimal StorageAmount { get; set; } public decimal PackagingLaborAmount { get; set; }
/// <summary> /// <summary>
/// 发货快递费 /// 发货快递费
@ -111,8 +116,8 @@ namespace BBWY.Client.Models
public override string ToString() public override string ToString()
{ {
//日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,耗材费,入仓操作费,出仓操作费,刷单/空单号费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注 //日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,包装人工费,快递费,耗材费,入仓操作费,出仓操作费,刷单/空单号费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注
return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{OrderState},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{ConsumableAmount},{InStorageAmount},{OutStorageAmount},{SDOrderAmount},{PlatformCommissionAmount},{FreightPrice},{OrderPayment},{ActualAmount},{Profit},{ProfitRatio},{ConsigneeStr},{VenderRemark}"; return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{OrderState},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{PackagingLaborAmount},{DeliveryExpressFreight},{ConsumableAmount},{InStorageAmount},{OutStorageAmount},{SDOrderAmount},{PlatformCommissionAmount},{FreightPrice},{OrderPayment},{ActualAmount},{Profit},{ProfitRatio},{ConsigneeStr},{VenderRemark}";
} }
} }
} }

9
BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
View File

@ -70,10 +70,15 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal ConsumableAmount { get; set; } = 0.00M; public decimal ConsumableAmount { get; set; } = 0.00M;
///// <summary>
///// 仓储费
///// </summary>
//public decimal StorageAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 仓储费 /// 包装人工费
/// </summary> /// </summary>
public decimal StorageAmount { get; set; } = 0.00M; public decimal PackagingLaborAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 总计(不含销售运费 历史遗留) /// 总计(不含销售运费 历史遗留)

9
BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs
View File

@ -55,10 +55,15 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal SingleConsumableAmount { get; set; } = 0.00M; public decimal SingleConsumableAmount { get; set; } = 0.00M;
///// <summary>
///// 单件仓储费
///// </summary>
//public decimal SingleStorageAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 单件仓储费 /// 包装人工费
/// </summary> /// </summary>
public decimal SingleStorageAmount { get; set; } = 0.00M; public decimal SinglePackagingLaborAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 单件Sku成本 /// 单件Sku成本

9
BBWY.Client/Models/BillCorrection/BillCorrectionOrder.cs
View File

@ -65,10 +65,15 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal ConsumableAmount { get; set; } = 0.00M; public decimal ConsumableAmount { get; set; } = 0.00M;
///// <summary>
///// 仓储费
///// </summary>
//public decimal StorageAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 仓储费 /// 包装人工费
/// </summary> /// </summary>
public decimal StorageAmount { get; set; } = 0.00M; public decimal PackagingLaborAmount { get; set; }=0.00M;
/// <summary> /// <summary>
/// 售后费用 /// 售后费用

59
BBWY.Client/Models/Order/ManualEditCostOrderSku.cs
View File

@ -46,11 +46,14 @@ namespace BBWY.Client.Models
private decimal consumableAmount; private decimal consumableAmount;
private string consumableAmountStr; private string consumableAmountStr;
/// <summary> ///// <summary>
/// 仓储费 ///// 仓储费
/// </summary> ///// </summary>
private decimal storageAmount; //private decimal storageAmount;
private string storageAmountStr; //private string storageAmountStr;
private decimal packagingLaborAmount;
private string packagingLaborAmountStr;
/// <summary> /// <summary>
/// 总计（不含发货运费） /// 总计（不含发货运费）
@ -100,7 +103,7 @@ namespace BBWY.Client.Models
public decimal PurchaseFreight { get => purchaseFreight; set { if (Set(ref purchaseFreight, value)) { CalculationCost(); } } } public decimal PurchaseFreight { get => purchaseFreight; set { if (Set(ref purchaseFreight, value)) { CalculationCost(); } } }
public decimal FirstFreight { get => firstFreight; set { if (Set(ref firstFreight, value)) { CalculationCost(); } } } public decimal FirstFreight { get => firstFreight; set { if (Set(ref firstFreight, value)) { CalculationCost(); } } }
public decimal ConsumableAmount { get => consumableAmount; set { if (Set(ref consumableAmount, value)) { CalculationCost(); } } } public decimal ConsumableAmount { get => consumableAmount; set { if (Set(ref consumableAmount, value)) { CalculationCost(); } } }
public decimal StorageAmount { get => storageAmount; set { if (Set(ref storageAmount, value)) { CalculationCost(); } } } //public decimal StorageAmount { get => storageAmount; set { if (Set(ref storageAmount, value)) { CalculationCost(); } } }
public decimal TotalCost public decimal TotalCost
{ {
get => totalCost; set get => totalCost; set
@ -114,7 +117,7 @@ namespace BBWY.Client.Models
private void CalculationCost() private void CalculationCost()
{ {
TotalCost = SkuAmount + PurchaseFreight + FirstFreight + InStorageAmount + OutStorageAmount + ConsumableAmount + StorageAmount; TotalCost = SkuAmount + PurchaseFreight + FirstFreight + InStorageAmount + OutStorageAmount + ConsumableAmount + PackagingLaborAmount;
UnitCost = ItemTotal == 0 ? 0 : TotalCost / ItemTotal; UnitCost = ItemTotal == 0 ? 0 : TotalCost / ItemTotal;
} }
@ -164,17 +167,17 @@ namespace BBWY.Client.Models
} }
} }
} }
public string StorageAmountStr //public string StorageAmountStr
{ //{
get => storageAmountStr; set // get => storageAmountStr; set
{ // {
if (Set(ref storageAmountStr, value)) // if (Set(ref storageAmountStr, value))
{ // {
if (decimal.TryParse(storageAmountStr, out decimal d)) // if (decimal.TryParse(storageAmountStr, out decimal d))
StorageAmount = d; // StorageAmount = d;
} // }
} // }
} //}
public string DeliveryExpressFreightStr public string DeliveryExpressFreightStr
{ {
@ -225,5 +228,25 @@ namespace BBWY.Client.Models
OutStorageAmount = d; OutStorageAmount = d;
} }
} }
public decimal PackagingLaborAmount
{
get => packagingLaborAmount;
set
{
if (Set(ref packagingLaborAmount, value))
CalculationCost();
}
}
public string PackagingLaborAmountStr
{
get => packagingLaborAmountStr;
set
{
if (Set(ref packagingLaborAmountStr, value))
if (decimal.TryParse(packagingLaborAmountStr, out decimal d))
packagingLaborAmount = d;
}
}
} }
} }

39
BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs
View File

@ -119,18 +119,18 @@ namespace BBWY.Client.Models
} }
} }
/// <summary> ///// <summary>
/// 单件仓储费 ///// 单件仓储费
/// </summary> ///// </summary>
public decimal SingleStorageAmount //public decimal SingleStorageAmount
{ //{
get => singleStorageAmount; // get => singleStorageAmount;
set // set
{ // {
if (Set(ref singleStorageAmount, value)) // if (Set(ref singleStorageAmount, value))
RefreshUnitCost(); // RefreshUnitCost();
} // }
} //}
public decimal SingleInStorageAmount public decimal SingleInStorageAmount
{ {
@ -153,9 +153,19 @@ namespace BBWY.Client.Models
public decimal SingleRefundInStorageAmount { get => singleRefundInStorageAmount; set { Set(ref singleRefundInStorageAmount, value); } } public decimal SingleRefundInStorageAmount { get => singleRefundInStorageAmount; set { Set(ref singleRefundInStorageAmount, value); } }
public decimal SinglePackagingLaborAmount
{
get => singlePackagingLaborAmount;
set
{
if (Set(ref singlePackagingLaborAmount, value))
RefreshUnitCost();
}
}
public void RefreshUnitCost() public void RefreshUnitCost()
{ {
UnitCost = SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleInStorageAmount + SingleOutStorageAmount + SingleConsumableAmount + SingleStorageAmount; UnitCost = SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleInStorageAmount + SingleOutStorageAmount + SingleConsumableAmount + SinglePackagingLaborAmount;
} }
private bool isEdit; private bool isEdit;
@ -168,7 +178,8 @@ namespace BBWY.Client.Models
private decimal singleDeliveryFreight; private decimal singleDeliveryFreight;
//private decimal singleOperationAmount; //private decimal singleOperationAmount;
private decimal singleConsumableAmount; private decimal singleConsumableAmount;
private decimal singleStorageAmount; //private decimal singleStorageAmount;
private decimal singlePackagingLaborAmount;
private decimal singleInStorageAmount; private decimal singleInStorageAmount;
private decimal singleOutStorageAmount; private decimal singleOutStorageAmount;
private decimal singleRefundInStorageAmount; private decimal singleRefundInStorageAmount;

8
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -811,7 +811,8 @@ namespace BBWY.Client.ViewModels
manualEditCostOrderSku.OutStorageAmount = orderCostDetailList.Sum(ocd => ocd.OutStorageAmount); manualEditCostOrderSku.OutStorageAmount = orderCostDetailList.Sum(ocd => ocd.OutStorageAmount);
manualEditCostOrderSku.PurchaseFreight = orderCostDetailList.Sum(ocd => ocd.PurchaseFreight); manualEditCostOrderSku.PurchaseFreight = orderCostDetailList.Sum(ocd => ocd.PurchaseFreight);
manualEditCostOrderSku.SkuAmount = orderCostDetailList.Sum(ocd => ocd.SkuAmount); manualEditCostOrderSku.SkuAmount = orderCostDetailList.Sum(ocd => ocd.SkuAmount);
manualEditCostOrderSku.StorageAmount = orderCostDetailList.Sum(ocd => ocd.StorageAmount); //manualEditCostOrderSku.StorageAmount = orderCostDetailList.Sum(ocd => ocd.StorageAmount);
manualEditCostOrderSku.PackagingLaborAmount = orderCostDetailList.Sum(ocd => ocd.PackagingLaborAmount);
manualEditCostOrderSku.TotalCost = orderCostDetailList.Sum(ocd => ocd.TotalCost); manualEditCostOrderSku.TotalCost = orderCostDetailList.Sum(ocd => ocd.TotalCost);
manualEditCostOrderSku.UnitCost = orderCostDetailList.FirstOrDefault().UnitCost; manualEditCostOrderSku.UnitCost = orderCostDetailList.FirstOrDefault().UnitCost;
} }
@ -823,7 +824,8 @@ namespace BBWY.Client.ViewModels
manualEditCostOrderSku.OutStorageAmountStr = manualEditCostOrderSku.OutStorageAmount.ToString(); manualEditCostOrderSku.OutStorageAmountStr = manualEditCostOrderSku.OutStorageAmount.ToString();
manualEditCostOrderSku.PurchaseFreightStr = manualEditCostOrderSku.PurchaseFreight.ToString(); manualEditCostOrderSku.PurchaseFreightStr = manualEditCostOrderSku.PurchaseFreight.ToString();
manualEditCostOrderSku.SkuAmountStr = manualEditCostOrderSku.SkuAmount.ToString(); manualEditCostOrderSku.SkuAmountStr = manualEditCostOrderSku.SkuAmount.ToString();
manualEditCostOrderSku.StorageAmountStr = manualEditCostOrderSku.StorageAmount.ToString(); //manualEditCostOrderSku.StorageAmountStr = manualEditCostOrderSku.StorageAmount.ToString();
manualEditCostOrderSku.PackagingLaborAmountStr = manualEditCostOrderSku.PackagingLaborAmount.ToString();
} }
var manualCalculationCost = new ManualCalculationCost(orderId, isSetStorageType, storageType, orderSkuList); var manualCalculationCost = new ManualCalculationCost(orderId, isSetStorageType, storageType, orderSkuList);
@ -990,7 +992,7 @@ namespace BBWY.Client.ViewModels
try try
{ {
var list = r.Data.Select(x => x.ToString()).ToList(); var list = r.Data.Select(x => x.ToString()).ToList();
list.Insert(0, "日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,耗材费,入仓操作费,出仓操作费,刷单/空单号费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注"); list.Insert(0, "日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,包装人工费,快递费,耗材费,入仓操作费,出仓操作费,刷单/空单号费,平台扣点,补差金额,应付金额,实收金额,利润,利润率,收件人联系方式,商家备注,售后类型,售后与特殊情况备注");
System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8); System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8);
App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出")); App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出"));
} }

10
BBWY.Client/Views/BillCorrection/BillCorrectionView.xaml
View File

@ -219,15 +219,15 @@
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding FirstFreight}" Header="头程运费" Width="60" <DataGridTextColumn Binding="{Binding FirstFreight}" Header="头程运费" Width="60"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding StorageAmount}" Header="仓储费" Width="60" <DataGridTextColumn Binding="{Binding PackagingLaborAmount}" Header="包装人工费" Width="60"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding ConsumableAmount}" Header="耗才费" Width="60" <DataGridTextColumn Binding="{Binding ConsumableAmount}" Header="包装耗材费" Width="60"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding InStorageAmount}" Header="入仓操作费" Width="70" <DataGridTextColumn Binding="{Binding InStorageAmount}" Header="入库操作费" Width="70"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding OutStorageAmount}" Header="出仓操作费" Width="70" <DataGridTextColumn Binding="{Binding OutStorageAmount}" Header="出库操作费" Width="70"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding DeliveryExpressFreight}" Header="销售运费" Width="60" <DataGridTextColumn Binding="{Binding DeliveryExpressFreight}" Header="尾程运费" Width="60"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>
<DataGridTextColumn Binding="{Binding AfterTotalCost}" Header="售后费用" Width="60" <DataGridTextColumn Binding="{Binding AfterTotalCost}" Header="售后费用" Width="60"
ElementStyle="{StaticResource verticalCenterTextBlock}"/> ElementStyle="{StaticResource verticalCenterTextBlock}"/>

10
BBWY.Client/Views/Order/ManualCalculationCost.xaml
View File

@ -98,15 +98,15 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn Header="仓储费" Width="70" <DataGridTemplateColumn Header="包装人工费" Width="70"
HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"> HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<c:BTextBox Text="{Binding StorageAmountStr,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="5,0"/> <c:BTextBox Text="{Binding PackagingLaborAmountStr,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="5,0"/>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn Header="入仓操作" Width="70" <DataGridTemplateColumn Header="入库操作" Width="70"
HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"> HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@ -114,7 +114,7 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn Header="出仓操作" Width="70" <DataGridTemplateColumn Header="出库操作" Width="70"
HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"> HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@ -130,7 +130,7 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn Header="销售运费" Width="70" <DataGridTemplateColumn Header="尾程运费" Width="70"
HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"> HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>

8
BBWY.Client/Views/Order/OrderListControl.xaml
View File

@ -476,7 +476,7 @@
<TextBlock Text="打包耗材" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包耗材" Style="{StaticResource middleTextBlock}"/>
</Grid> </Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="5" Grid.Row="1"> <Grid Background="{StaticResource Border.Background}" Grid.Column="5" Grid.Row="1">
<TextBlock Text="快递费" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="尾程费" Style="{StaticResource middleTextBlock}"/>
</Grid> </Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="6" Grid.Row="1"> <Grid Background="{StaticResource Border.Background}" Grid.Column="6" Grid.Row="1">
<TextBlock Text="入库操作" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="入库操作" Style="{StaticResource middleTextBlock}"/>
@ -485,7 +485,7 @@
<TextBlock Text="出库操作" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="出库操作" Style="{StaticResource middleTextBlock}"/>
</Grid> </Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="8" Grid.Row="1"> <Grid Background="{StaticResource Border.Background}" Grid.Column="8" Grid.Row="1">
<TextBlock Text="仓储费" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包装人工" Style="{StaticResource middleTextBlock}"/>
</Grid> </Grid>
<Border Grid.RowSpan="2" Grid.ColumnSpan="11" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"/> <Border Grid.RowSpan="2" Grid.ColumnSpan="11" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"/>
@ -538,8 +538,8 @@
Visibility="{Binding InStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/> Visibility="{Binding InStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding OutStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}" <TextBlock Text="{Binding OutStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"
Visibility="{Binding OutStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/> Visibility="{Binding OutStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding StorageAmount}" Grid.Column="8" Style="{StaticResource middleTextBlock}" <TextBlock Text="{Binding PackagingLaborAmount}" Grid.Column="8" Style="{StaticResource middleTextBlock}"
Visibility="{Binding StorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/> Visibility="{Binding PackagingLaborAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding TotalCost2,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding TotalCost2,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>

104
BBWY.Client/Views/Ware/WareStock.xaml
View File

@ -29,12 +29,11 @@
<ctr:PurchaseOrderEditBtnConverter x:Key="poEditConverter"/> <ctr:PurchaseOrderEditBtnConverter x:Key="poEditConverter"/>
<DataTemplate x:Key="purchaseOrderTemplate_normal"> <DataTemplate x:Key="purchaseOrderTemplate_normal">
<Grid Width="{Binding ActualWidth,ElementName= listbox_purchaseOrderList}" <Grid Width="{Binding ActualWidth,ElementName= listbox_purchaseOrderList,Converter={StaticResource widthConverter},ConverterParameter=3}"
Height="30"> Height="30">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
@ -42,10 +41,11 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -58,17 +58,17 @@
<TextBlock Text="{Binding SingleFirstFreight}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SingleFirstFreight}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleInStorageAmount}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SingleInStorageAmount}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleOutStorageAmount}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SingleOutStorageAmount}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleRefundInStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/> <!--<TextBlock Text="{Binding SingleRefundInStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleDeliveryFreight}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SingleDeliveryFreight}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding UnitCost,Mode=OneWay}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/> <!--<TextBlock Text="{Binding UnitCost,Mode=OneWay}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>-->
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="14" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<StackPanel Grid.Column="15" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
<c:BButton Content="编辑" Style="{StaticResource LinkButton}" <c:BButton Content="编辑" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.EditPurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.EditPurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }"> CommandParameter="{Binding }">
@ -92,13 +92,11 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
<Border Height="1" Grid.ColumnSpan="16" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/> <Border Height="1" Grid.ColumnSpan="16" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="purchaseOrderTemplate_edit"> <DataTemplate x:Key="purchaseOrderTemplate_edit">
<Grid Width="{Binding ActualWidth,ElementName= listbox_purchaseOrderList}" <Grid Width="{Binding ActualWidth,ElementName= listbox_purchaseOrderList,Converter={StaticResource widthConverter},ConverterParameter=3}"
Height="30"> Height="30">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
@ -110,11 +108,11 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -133,17 +131,17 @@
<c:BTextBox Text="{Binding SingleFirstFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="4" BorderThickness="0"/> <c:BTextBox Text="{Binding SingleFirstFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="4" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/> <c:BTextBox Text="{Binding SingleInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleOutStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/> <c:BTextBox Text="{Binding SingleOutStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleRefundInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/> <!--<c:BTextBox Text="{Binding SingleRefundInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>-->
<c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/> <c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="9" BorderThickness="0"/> <c:BTextBox Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleDeliveryFreight,Converter={StaticResource inputNumberConverter}}" Grid.Column="10" BorderThickness="0"/> <c:BTextBox Text="{Binding SingleDeliveryFreight,Converter={StaticResource inputNumberConverter}}" Grid.Column="9" BorderThickness="0"/>
<c:BTextBox Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" BorderThickness="0"/> <c:BTextBox Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" BorderThickness="0"/>
<c:BTextBox Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="12" BorderThickness="0"/> <c:BTextBox Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" BorderThickness="0"/>
<TextBlock Text="{Binding UnitCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/> <!--<TextBlock Text="{Binding UnitCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>-->
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="14" Style="{StaticResource middleTextBlock}" Foreground="Gray"/> <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="12" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
<StackPanel Grid.Column="15" HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
<c:BButton Content="保存" Style="{StaticResource LinkButton}" <c:BButton Content="保存" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.SavePurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.SavePurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }" /> CommandParameter="{Binding }" />
@ -207,13 +205,13 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -227,26 +225,46 @@
<LineBreak/> <LineBreak/>
<Run Text="单价"/> <Run Text="单价"/>
</TextBlock> </TextBlock>
<TextBlock Text="头程单价" Grid.Column="6" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="6" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<TextBlock Text="入仓单价" Grid.Column="7" Style="{StaticResource middleTextBlock}"/> <Run Text="入仓头程"/>
<TextBlock Text="出仓单价" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <LineBreak/>
<TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center"> <Run Text="单价"/>
</TextBlock>
<TextBlock Grid.Column="7" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="入库"/>
<LineBreak/>
<Run Text="操作费"/>
</TextBlock>
<TextBlock Grid.Column="8" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="出库"/>
<LineBreak/>
<Run Text="操作费"/>
</TextBlock>
<!--<TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="退货"/> <Run Text="退货"/>
<LineBreak/> <LineBreak/>
<Run Text="入仓单价"/> <Run Text="入仓单价"/>
</TextBlock>-->
<TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="包装耗材"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock> </TextBlock>
<TextBlock Text="耗材单价" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="10" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<TextBlock Text="仓储单价" Grid.Column="11" Style="{StaticResource middleTextBlock}"/> <Run Text="包装人工"/>
<TextBlock Grid.Column="12" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="销售运"/>
<LineBreak/> <LineBreak/>
<Run Text="单价"/> <Run Text="单价"/>
</TextBlock> </TextBlock>
<TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="11" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<TextBlock Text="剩余库存" Grid.Column="14" Style="{StaticResource middleTextBlock}"/> <Run Text="尾程"/>
<TextBlock Text="均摊单价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/> <LineBreak/>
<TextBlock Text="采购时间" Grid.Column="16" Style="{StaticResource middleTextBlock}"/> <Run Text="快递费"/>
<TextBlock Text="操作" Grid.Column="17" Style="{StaticResource middleTextBlock}"/> </TextBlock>
<TextBlock Text="库存" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="剩余库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="均摊单价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="采购时间" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -264,8 +282,6 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
</Grid> </Grid>
</Border> </Border>

4
BBWY.Server.Business/Sync/OrderSyncBusiness.cs
View File

@ -99,7 +99,9 @@ namespace BBWY.Server.Business
{ {
try try
{ {
//logger.Info($"订单同步 {shop.ShopName} isAuto {isAuto}"); if (shop.ShopName == "创艺家居日用专营店")
nLogManager.Default().Info($"订单同步 {shop.ShopName} isAuto {isAuto}");
if (!syncOrderMethodDic.ContainsKey(shop.PlatformId)) if (!syncOrderMethodDic.ContainsKey(shop.PlatformId))
throw new Exception("不支持的平台"); throw new Exception("不支持的平台");
var shopId = long.Parse(shop.ShopId); var shopId = long.Parse(shop.ShopId);

Write Preview
Loading…
Cancel
Save