更新订单流水

Bailun.DC.Models/mStockSellStorage.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+	/// <summary>
+    /// 进销存报表
+    /// </summary>
+    public class mStockSellStorage
+    {
+		/// <summary>
+        /// sku编码
+        /// </summary>
+		public string bailun_sku { get; set; }
+
+		/// <summary>
+        /// 仓库编码
+        /// </summary>
+		public string warehouse_code { get; set; }
+
+		/// <summary>
+        /// 仓库名称
+        /// </summary>
+		public string warehouse_name { get; set; }
+
+		/// <summary>
+        /// 期初库存
+        /// </summary>
+		public decimal? prestock { get; set; }
+
+		/// <summary>
+        /// 期末库存
+        /// </summary>
+		public decimal? endstock { get; set; }
+
+		/// <summary>
+        /// 期初在途数
+        /// </summary>
+		public decimal? pretrans { get; set; }
+
+		/// <summary>
+        /// 期末在途数
+        /// </summary>
+		public decimal? endtrans { get; set; }
+
+		/// <summary>
+        /// 差异库存（期初-期末）
+        /// </summary>
+		public decimal? diffstock { get; set; }
+
+		/// <summary>
+        /// 差异在途数（期初-期末）
+        /// </summary>
+		public decimal? difftrans { get; set; }
+
+		/// <summary>
+        /// 采购价
+        /// </summary>
+		public decimal unit_price { get; set; }
+    }
+}

Bailun.DC.Services/InventoryServices.cs

@@ -1136,6 +1136,18 @@ namespace Bailun.DC.Services
 
         #endregion
 
+        #region 进销存
+
+        public List<mStockSellStorage> ListStockSellWarehouse(BtTableParameter parameter, string warehousetype, string warehouse, DateTime start, DateTime end,ref int total)
+        {
+            var sql = "";
+
+            return new List<mStockSellStorage>();
+        }
+
+        #endregion
+
+
     }
 
 }

Bailun.DC.Web/Areas/Reports/Controllers/InventoryController.cs

@@ -607,6 +607,45 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
         #endregion
 
+        #region 进销存报表
+
+        /// <summary>
+        /// 仓库进销存
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StockSellWarehouse()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 仓库进销存Json
+        /// </summary>
+        /// <param name="parameter">分页信息</param>
+        /// <param name="warehousetype">仓库类型</param>
+        /// <param name="warehouse">仓库编码</param>
+        /// <param name="start">期初时间</param>
+        /// <param name="end">期末时间</param>
+        /// <returns></returns>
+        public string StockSellWarehouseJson(Models.BtTableParameter parameter,string warehousetype,string warehouse,DateTime start,DateTime end)
+        {
+            var total = 0;
+            //var obj = new Services.InventoryServices().
+
+            return "";
+        }
+
+        /// <summary>
+        /// Sku进销存报表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StockSellSku()
+        {
+            return View();
+        }
+
+
+        #endregion
 
     }
 }
\ No newline at end of file

Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrder.cshtml

@@ -122,7 +122,7 @@
                 { field: 'bailun_order_status', title: '订单状态', width: '100', sortable: true },
                 { field: 'bailun_payment_status', title: '付款状态', width: '100', sortable: true },
                 { field: 'bailun_shipping_status', title: '发货状态', width: '110', sortable: true },
-                { field: 'order_currency', title: '币种', width: '80', sortable: true },
+                //{ field: 'order_currency', title: '币种', width: '80', sortable: true },
                 { field: 'amount_sales', title: '订单销售额', width: '120', sortable: true, iscount: true },
                 { field: 'amount_shipping', title: '运费收入', width: '80', sortable: true, iscount: true },
                 { field: 'amount_product', title: '商品金额', width: '100', sortable: true, iscount: true },