Merge remote-tracking branch 'origin/0.1' into dapper

# Conflicts: # web/App_Code/Model/Model.Designer.cs # web/App_Code/Model/Model.cs # web/App_Code/Model/Model.edmx # web/web.config
2026-04-28 16:26:19 +08:00
parent 3273072fb3 7644df57d0
commit 50c2203ebf
31 changed files with 1916 additions and 578 deletions
@@ -133,6 +133,7 @@ public partial class admin_activity_item_reg : MyWeb.config
            L_msg.Text = "";

            Model.actItem actItem = new Model.actItem();//新增
+            int maxSort = _db.actItems.Max(x => (int?)x.sort_order) ?? 0;
            actItem.subject = subject.Text;            
            actItem.print_init = print_init.Text;            
            actItem.partno = PARTNO.Text;
@@ -158,6 +159,7 @@ public partial class admin_activity_item_reg : MyWeb.config
            actItem.is_reconcile = is_reconcile_item.Checked ? "Y" : "N";
            actItem.demo = demo.Text;
            actItem.customize_data = customize_data.Text;
+            actItem.sort_order = maxSort + 1;

            _db.actItems.Add(actItem);
            _db.SaveChanges();