1

BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs

@@ -52,10 +52,18 @@ namespace BBWY.Client.Models
 		/// </summary>
 		public decimal FirstFreight { get; set; } = 0.00M;
 
+		
+		//public decimal OperationAmount { get; set; } = 0.00M;
+
+		/// <summary>
+		/// 入仓操作费
+		/// </summary>
+		public decimal InStorageAmount { get; set; }
+
 		/// <summary>
-		/// 操作费
+		/// 出仓操作费
 		/// </summary>
-		public decimal OperationAmount { get; set; } = 0.00M;
+		public decimal OutStorageAmount { get; set; }
 
 		/// <summary>
 		/// 耗材费

BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs

@@ -35,10 +35,20 @@ namespace BBWY.Client.Models
         /// </summary>
         public decimal SingleDeliveryFreight { get; set; } = 0.00M;
 
+        ///// <summary>
+        ///// 单件操作费
+        ///// </summary>
+        //public decimal SingleOperationAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 单件入仓操作费
+        /// </summary>
+        public decimal SingleInStorageAmount { get; set; } = 0.00M;
+
         /// <summary>
-        /// 单件操作费
+        /// 单件出仓操作费
         /// </summary>
-        public decimal SingleOperationAmount { get; set; } = 0.00M;
+        public decimal SingleOutStorageAmount { get; set; } = 0.00M;
 
         /// <summary>
         /// 单件耗材费

BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs

@@ -28,7 +28,7 @@ namespace BBWY.Client.Models
         /// <summary>
         /// 单件均摊成本
         /// </summary>
-        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); }
         }
 
-        /// <summary>
-        /// 单间操作成本
-        /// </summary>
-        public decimal SingleOperationAmount
-        {
-            get => singleOperationAmount;
-            set
-            {
-                if (Set(ref singleOperationAmount, value))
-                    RefreshUnitCost();
-            }
-        }
+        ///// <summary>
+        ///// 单间操作成本
+        ///// </summary>
+        //public decimal SingleOperationAmount
+        //{
+        //    get => singleOperationAmount;
+        //    set
+        //    {
+        //        if (Set(ref singleOperationAmount, value))
+        //            RefreshUnitCost();
+        //    }
+        //}
 
         /// <summary>
         /// 单件耗材成本
@@ -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;
     }
 }

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
                 }
             }
 

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;
 
+        ///// <summary>
+        ///// 操作费
+        ///// </summary>
+        //[Column(DbType = "decimal(20,2)")]
+        //public decimal OperationAmount { get; set; } = 0.00M;
+
+
+        /// <summary>
+        /// 入仓操作费
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal InStorageAmount { get; set; } = 0.00M;
+
         /// <summary>
-        /// 操作费
+        /// 出仓操作费
         /// </summary>
         [Column(DbType = "decimal(20,2)")]
-        public decimal OperationAmount { get; set; } = 0.00M;
+        public decimal OutStorageAmount { get; set; } = 0.00M;
 
         /// <summary>
         /// 耗材费

BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs

@@ -109,8 +109,20 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 单件操作费
         /// </summary>
+        //[Column(DbType = "decimal(20,2)")]
+        //public decimal SingleOperationAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 单件入仓操作费
+        /// </summary>
         [Column(DbType = "decimal(20,2)")]
-        public decimal SingleOperationAmount { get; set; } = 0.00M;
+        public decimal SingleInStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 单件出仓操作费
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal SingleOutStorageAmount { get; set; } = 0.00M;
 
         /// <summary>
         /// 单件耗材费
@@ -130,6 +142,7 @@ namespace BBWY.Server.Model.Db
         [Column(DbType = "decimal(20,2)")]
         public decimal SingleDeliveryFreight { get; set; } = 0.00M;
 
+
         /// <summary>
         /// 单件均摊成本
         /// </summary>