增加导出区域模块

Bailun.DC.Models/ExportServices/mPurchasePutin.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models.ExportServices
+{
+    /// <summary>
+    /// 采购入库
+    /// </summary>
+    public class mPurchasePutin
+    {
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string warehouse_name { get; set; }
+
+        /// <summary>
+        /// Sku
+        /// </summary>
+        public string bailun_sku { get; set; }
+
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+        public int count { get; set; }
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public DateTime update_time { get; set; }
+
+        /// <summary>
+        /// 入库单号
+        /// </summary>
+        public string no { get; set; }
+    }
+}

Bailun.DC.Services/ExportServices.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using MySql.Data.MySqlClient;
+using Dapper;
+using System.Linq;
+using Bailun.DC.Models.ExportServices;
+
+namespace Bailun.DC.Services
+{
+    /// <summary>
+    /// 导出服务
+    /// </summary>
+    public class ExportServices
+    {
+        #region 入库
+
+        /// <summary>
+        /// 采购入库明细
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        public List<mPurchasePutin> ListPurchasePutin(DateTime start,DateTime end)
+        {
+            var sql = $@"select t1.warehouse_code,t1.warehouse_name,t1.bailun_sku,t1.count,t1.update_time,inbound_id as no from dc_base_purchase_inbound t1
+                            join dc_base_purchase t2 on t1.purchase_id = t2.purchase_id and t1.bailun_sku = t2.bailun_sku and t2.has_transfer = 0 and t2.`status`> 0
+                            where t1.`status`= 1 and t1.update_time >= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and t1.update_time < '{end.ToString("yyyy-MM-dd HH:mm:ss")}";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.Query<mPurchasePutin>(sql, null, null, true, 2 * 60).AsList();
+                return obj;
+            }
+
+        }
+
+
+
+        #endregion
+
+    }
+}

Bailun.DC.Web/Areas/ExportFile/Controllers/PurchaseController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Bailun.DC.Web.Areas.ExportFile.Controllers
+{
+    [Area("ExportFile")]
+    public class PurchaseController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        
+    }
+}
\ No newline at end of file

Bailun.DC.Web/Areas/ExportFile/Controllers/PutinController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Bailun.DC.Web.Areas.ExportFile.Controllers
+{
+    [Area("ExportFile")]
+    public class PutinController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public ActionResult PurchaseAndAllot(DateTime start, DateTime end)
+        {
+            
+        
+        }
+
+    }
+}
\ No newline at end of file

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

@@ -758,6 +758,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         }
 
         #endregion
+        
 
     }
 }
\ No newline at end of file

Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListDailyPurchaseSales.cshtml

@@ -26,7 +26,8 @@
                     <div class="form-group">
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
-                        @*<button type="button" class="btn btn-success" onclick="exportlist();">导出</button>*@
+                        <button type="button" class="btn btn-success" onclick="exportlistputin();">导出入库明细</button>
+                        <button type="button" class="btn btn-success" onclick="exportlistshipping();">导出发货明细</button>
                     </div>
                 </div>
             </form>
@@ -115,11 +116,10 @@
         }
 
         
-        function exportlist() {
+        function exportlistputin() {
             if (confirm("确定要导出吗?")) {
                 window.open('@Url.Content("~/Reports/Orders/ExportEbayOrders")' + '?' + $("#toolbar").serialize(), '_blank');
             }
-
         }
 
     </script>

Bailun.DC.Web/Bailun.DC.Web.csproj

@@ -27,6 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Areas\ExportFile\Data\" />
+    <Folder Include="Areas\ExportFile\Models\" />
+    <Folder Include="Areas\ExportFile\Views\" />
     <Folder Include="Areas\Logistics\Data\" />
     <Folder Include="Areas\Logistics\Models\" />
     <Folder Include="Areas\Reports\Data\" />