diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
index 9debecc1..17b9e19c 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs
@@ -52,10 +52,18 @@ namespace BBWY.Client.Models
///
public decimal FirstFreight { get; set; } = 0.00M;
+
+ //public decimal OperationAmount { get; set; } = 0.00M;
+
+ ///
+ /// 入仓操作费
+ ///
+ public decimal InStorageAmount { get; set; }
+
///
- /// 操作费
+ /// 出仓操作费
///
- public decimal OperationAmount { get; set; } = 0.00M;
+ public decimal OutStorageAmount { get; set; }
///
/// 耗材费
diff --git a/BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs
index 4aa7be10..cc141424 100644
--- a/BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs
@@ -35,10 +35,20 @@ namespace BBWY.Client.Models
///
public decimal SingleDeliveryFreight { get; set; } = 0.00M;
+ /////
+ ///// 单件操作费
+ /////
+ //public decimal SingleOperationAmount { get; set; } = 0.00M;
+
+ ///
+ /// 单件入仓操作费
+ ///
+ public decimal SingleInStorageAmount { get; set; } = 0.00M;
+
///
- /// 单件操作费
+ /// 单件出仓操作费
///
- public decimal SingleOperationAmount { get; set; } = 0.00M;
+ public decimal SingleOutStorageAmount { get; set; } = 0.00M;
///
/// 单件耗材费
diff --git a/BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs b/BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs
index f74c3435..4c7cc76f 100644
--- a/BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs
+++ b/BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs
@@ -28,7 +28,7 @@ namespace BBWY.Client.Models
///
/// 单件均摊成本
///
- public decimal UnitCost { get => unitCost;private set { Set(ref unitCost, value); } }
+ public decimal UnitCost { get => unitCost; private set { Set(ref unitCost, value); } }
public int PurchaseQuantity
{
@@ -54,18 +54,18 @@ namespace BBWY.Client.Models
get => singleDeliveryFreight; set { Set(ref singleDeliveryFreight, value); }
}
- ///
- /// 单间操作成本
- ///
- public decimal SingleOperationAmount
- {
- get => singleOperationAmount;
- set
- {
- if (Set(ref singleOperationAmount, value))
- RefreshUnitCost();
- }
- }
+ /////
+ ///// 单间操作成本
+ /////
+ //public decimal SingleOperationAmount
+ //{
+ // get => singleOperationAmount;
+ // set
+ // {
+ // if (Set(ref singleOperationAmount, value))
+ // RefreshUnitCost();
+ // }
+ //}
///
/// 单件耗材成本
@@ -132,9 +132,12 @@ namespace BBWY.Client.Models
}
}
+ public decimal SingleInStorageAmount { get => singleInStorageAmount; set { Set(ref singleInStorageAmount, value); } }
+ public decimal SingleOutStorageAmount { get => singleOutStorageAmount; set { Set(ref singleOutStorageAmount, value); } }
+
public void RefreshUnitCost()
{
- UnitCost = SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleOperationAmount + SingleConsumableAmount + SingleStorageAmount;
+ UnitCost = SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleInStorageAmount + SingleOutStorageAmount + SingleConsumableAmount + SingleStorageAmount;
}
private bool isEdit;
@@ -145,8 +148,10 @@ namespace BBWY.Client.Models
private decimal singleFreight;
private decimal singleFirstFreight;
private decimal singleDeliveryFreight;
- private decimal singleOperationAmount;
+ //private decimal singleOperationAmount;
private decimal singleConsumableAmount;
private decimal singleStorageAmount;
+ private decimal singleInStorageAmount;
+ private decimal singleOutStorageAmount;
}
}
diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
index 689e4ecc..2e100968 100644
--- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
+++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
@@ -158,8 +158,8 @@ namespace BBWY.Server.Business
}
else if (dbOrder.StorageType == Model.Enums.StorageType.京仓)
{
- dbAfterSaleOrder.InStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity;
- dbAfterSaleOrder.OutStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity;
+ dbAfterSaleOrder.InStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //0.2
+ dbAfterSaleOrder.OutStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //2.8
}
}
diff --git a/BBWY.Server.Model/Db/Order/OrderCostDetail.cs b/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
index d259b2e1..b19fcfb8 100644
--- a/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
+++ b/BBWY.Server.Model/Db/Order/OrderCostDetail.cs
@@ -65,11 +65,24 @@ namespace BBWY.Server.Model.Db
[Column(DbType = "decimal(20,2)")]
public decimal FirstFreight { get; set; } = 0.00M;
+ /////
+ ///// 操作费
+ /////
+ //[Column(DbType = "decimal(20,2)")]
+ //public decimal OperationAmount { get; set; } = 0.00M;
+
+
+ ///
+ /// 入仓操作费
+ ///
+ [Column(DbType = "decimal(20,2)")]
+ public decimal InStorageAmount { get; set; } = 0.00M;
+
///
- /// 操作费
+ /// 出仓操作费
///
[Column(DbType = "decimal(20,2)")]
- public decimal OperationAmount { get; set; } = 0.00M;
+ public decimal OutStorageAmount { get; set; } = 0.00M;
///
/// 耗材费
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs
index 50bcb946..da86d9c0 100644
--- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs
@@ -109,8 +109,20 @@ namespace BBWY.Server.Model.Db
///
/// 单件操作费
///
+ //[Column(DbType = "decimal(20,2)")]
+ //public decimal SingleOperationAmount { get; set; } = 0.00M;
+
+ ///
+ /// 单件入仓操作费
+ ///
[Column(DbType = "decimal(20,2)")]
- public decimal SingleOperationAmount { get; set; } = 0.00M;
+ public decimal SingleInStorageAmount { get; set; } = 0.00M;
+
+ ///
+ /// 单件出仓操作费
+ ///
+ [Column(DbType = "decimal(20,2)")]
+ public decimal SingleOutStorageAmount { get; set; } = 0.00M;
///
/// 单件耗材费
@@ -130,6 +142,7 @@ namespace BBWY.Server.Model.Db
[Column(DbType = "decimal(20,2)")]
public decimal SingleDeliveryFreight { get; set; } = 0.00M;
+
///
/// 单件均摊成本
///