yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

STAGE 3-3

Browse Source
This commit is contained in:
yiming
2025-11-12 18:30:04 +08:00
parent 1d78bdd3d9
commit 744eddcd77
11 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/admin/stock/index.aspx.cs
View File

@@ -57,9 +57,8 @@ public partial class admin_stock_index : MyWeb.config
//品項
s_actItem_num.Items.Clear();
s_actItem_num.Items.Add(new ListItem("請選擇", ""));
var qry = _db.actItems.AsEnumerable();
qry = qry.Where(o => (int?)o.category == (int)Model.activity.category.Spares);//備品項目
qry = qry.OrderByDescending(o => o.num).ToList();
var qry = _db.actItems.Where(o => (int?)o.category == (int)Model.activity.category.Spares);//備品項目
qry = qry.OrderByDescending(o => o.num);
if (qry.Count() > 0)
foreach (var qq in qry)
s_actItem_num.Items.Add(new ListItem(qq.subject, qq.num.ToString()));
@@ -69,8 +68,7 @@ public partial class admin_stock_index : MyWeb.config
//活動
s_activity_num.Items.Clear();
s_activity_num.Items.Add(new ListItem("請選擇", ""));
var qry2 = _db.activities.AsEnumerable();
qry2 = qry2.OrderByDescending(o => o.num).ToList();
var qry2 = _db.activities.OrderByDescending(o => o.num);
if (qry2.Count() > 0)
foreach (var qq in qry2)
s_activity_num.Items.Add(new ListItem(qq.subject, qq.num.ToString()));
@@ -132,7 +130,7 @@ public partial class admin_stock_index : MyWeb.config
sd.AppendChild(tr);
//查詢要匯出的資料
var qry = _db.stocks.AsEnumerable();
var qry = _db.stocks.AsQueryable();
if (!string.IsNullOrEmpty(uptime1.Value))
qry = qry.Where(o => o.uptime >= Convert.ToDateTime( uptime1.Value));
@@ -143,7 +141,7 @@ public partial class admin_stock_index : MyWeb.config
if (!string.IsNullOrEmpty(s_kind.SelectedValue))
qry = qry.Where(o => o.kind == Convert.ToInt32(s_kind.SelectedValue));
if (!string.IsNullOrEmpty(activity_num_txt.Value))
qry = qry.Where(o => o.activity_num.HasValue && o.activity.subject.Contains(activity_num_txt.Value?.Trim()));
qry = qry.Where(o => o.activity_num.HasValue && o.activity.subject.Contains(activity_num_txt.Value.Trim()));
if (!string.IsNullOrEmpty(s_activity_num.SelectedValue))
qry = qry.Where(o => o.activity_num == Convert.ToInt32(s_activity_num.SelectedValue));
if (!string.IsNullOrEmpty(s_actItem_num.SelectedValue))