diff --git a/web/App_Code/Model/Model.Context.cs b/web/App_Code/Model/Model.Context.cs index d90a711..072874c 100644 --- a/web/App_Code/Model/Model.Context.cs +++ b/web/App_Code/Model/Model.Context.cs @@ -99,6 +99,7 @@ namespace Model public virtual DbSet receipt_master { get; set; } public virtual DbSet receipt_style { get; set; } public virtual DbSet receipt_style_d { get; set; } + public virtual DbSet pre_order { get; set; } public virtual int pager_eztrust(Nullable startRowIndex, Nullable pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount) { diff --git a/web/App_Code/Model/Model.cs b/web/App_Code/Model/Model.cs index b180468..bdeefe0 100644 --- a/web/App_Code/Model/Model.cs +++ b/web/App_Code/Model/Model.cs @@ -1355,6 +1355,24 @@ namespace Model using System; using System.Collections.Generic; + public partial class pre_order + { + public int num { get; set; } + public Nullable f_num { get; set; } + public string order_no { get; set; } + public Nullable item_count { get; set; } + public Nullable total_amt { get; set; } + public Nullable act_num { get; set; } + public Nullable admin_num { get; set; } + public Nullable reg_time { get; set; } + public Nullable receipt_num { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + public partial class pro_order { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] diff --git a/web/App_Code/Model/Model.edmx b/web/App_Code/Model/Model.edmx index be0c0bc..e3caff7 100644 --- a/web/App_Code/Model/Model.edmx +++ b/web/App_Code/Model/Model.edmx @@ -699,6 +699,20 @@ + + + + + + + + + + + + + + @@ -812,8 +826,8 @@ - - + + @@ -2247,6 +2261,7 @@ + @@ -4693,6 +4708,7 @@ + @@ -5466,7 +5482,7 @@ - + @@ -5514,6 +5530,20 @@ + + + + + + + + + + + + + + @@ -6654,6 +6684,21 @@ + + + + + + + + + + + + + + + diff --git a/web/App_Code/Model/Model.edmx.diagram b/web/App_Code/Model/Model.edmx.diagram index 83927fa..bdc415a 100644 --- a/web/App_Code/Model/Model.edmx.diagram +++ b/web/App_Code/Model/Model.edmx.diagram @@ -169,6 +169,7 @@ + diff --git a/web/App_Code/api/preOrderController.cs b/web/App_Code/api/preOrderController.cs new file mode 100644 index 0000000..42274a0 --- /dev/null +++ b/web/App_Code/api/preOrderController.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; + +// api/pre_order +//[ezAuthorize(Roles = "admin")]//群組:* +//[ezAuthorize] +public class preOrderController: ApiController +{ + + private Model.ezEntities _db = new Model.ezEntities(); + public preOrderController() + { + // + // TODO: 在這裡新增建構函式邏輯 + // + } +} \ No newline at end of file diff --git a/web/admin/order/pre_index.aspx b/web/admin/order/pre_index.aspx new file mode 100644 index 0000000..5315ec4 --- /dev/null +++ b/web/admin/order/pre_index.aspx @@ -0,0 +1,266 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/admin/Templates/TBS5ADM001/MasterPage.master" AutoEventWireup="true" CodeFile="pre_index.aspx.cs" Inherits="admin_order_pre_index" %> +<%@ Register Src="~/admin/_uc/alert.ascx" TagPrefix="uc1" TagName="alert" %> + + + + + +
+ <%-- + 列印管理報表 + + +
+ 匯出查詢資料(Excel) +
--%> +
+
+ +
+ + + + + + + + + + + + + 共 {{ data_table.count }} 筆, 頁數: + + + + + + + + + + + 查詢:{{search_dialog.current.title}} + mdi-close + + + + + + + + 查詢 + 清除條件 + + + + + + + + +
+
+ + + + + + diff --git a/web/admin/order/pre_index.aspx.cs b/web/admin/order/pre_index.aspx.cs new file mode 100644 index 0000000..d7cf0de --- /dev/null +++ b/web/admin/order/pre_index.aspx.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class admin_order_pre_index : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} \ No newline at end of file diff --git a/web/packages.config b/web/packages.config index 75daefe..fdc796f 100644 --- a/web/packages.config +++ b/web/packages.config @@ -40,6 +40,7 @@ + \ No newline at end of file