diff --git a/web/App_Code/api/orderdetailController.cs b/web/App_Code/api/orderdetailController.cs index ca9e9ad..e65bf60 100644 --- a/web/App_Code/api/orderdetailController.cs +++ b/web/App_Code/api/orderdetailController.cs @@ -77,9 +77,19 @@ public class orderdetailController:ApiController details[i] = item["order_no"] + item["num"].ToString(); i++; } - string sql = @"select * from pro_order_detail where order_no+convert(varchar,num) in ({0}) "; - //var p =new SqlParameter[]{ new SqlParameter("p0", String.Join(",", details))}; - var ret = _db.Database.SqlQuery(sql, String.Join(",", details)).ToList(); + + var parameters = details.Select((s,j)=>"@p"+j).ToArray(); + string sql = $"select * from pro_order_detail where order_no+convert(varchar,num) in ({string.Join(",",parameters)}) "; + + int l =0; + List sqlList = new List(); + foreach (var item in details) + { + sqlList.Add( new SqlParameter("@p" + l, item)); + l++; + } + SqlParameter[] p = sqlList.ToArray(); + var ret = _db.Database.SqlQuery(sql, p).ToList(); if (ret == null) throw new HttpResponseException(HttpStatusCode.NotFound); return Ok(ret); } diff --git a/web/admin/activity/reg.aspx b/web/admin/activity/reg.aspx index 6599bc1..44a569d 100644 --- a/web/admin/activity/reg.aspx +++ b/web/admin/activity/reg.aspx @@ -601,10 +601,10 @@ //list = this.data_table.selected.map(x => x.num); list = this.data_table.selected - .sort((a, b) => a.print_id.localeCompare(b.print_id)) + .sort((a, b) => (a.print_id==null?"":a.print_id).localeCompare(b.print_id==null?"":b.print_id)) .map(x => x.num); - console.log("what:",list); + //console.log("what:",list); if (list.length > 0) { // 記錄已列印 @@ -645,7 +645,7 @@ addHiddenField("file", this.thisFilesSelected.val); addHiddenField("list", JSON.stringify(list)); addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`); - + //console.log("底家:",this.data_table.selected); localStorage.setItem("list", JSON.stringify(this.data_table.selected)); /* diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx index 6a32e7a..30a9ce0 100644 --- a/web/admin/print/print_multi_new.aspx +++ b/web/admin/print/print_multi_new.aspx @@ -18,12 +18,46 @@
+
-
+ <%--
--%> -
+ <%--
--%>
+ + + +
@@ -37,6 +71,7 @@