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

牌位排版調整

Browse Source
This commit is contained in:
minom
2026-07-30 18:01:35 +08:00
parent cc85cb5bd7
commit 4b9448d548
6 changed files with 969 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/App_Code/api/activityController.cs
+34 -25
View File
@@ -1,4 +1,5 @@
using DocumentFormat.OpenXml.Drawing.Spreadsheet;
using MINOM.COM.Utility;
using Model;
using Newtonsoft.Json;
using Org.BouncyCastle.Crypto;
@@ -68,35 +69,43 @@ public class activityController : ApiController
// DELETE api/<controller>/5
public void Delete(int id)
{
var prod = _db.activities.Where(q => q.num == id).FirstOrDefault(); //刪除該筆資料
if (prod != null)
try
{
//刪除相關資料
var prod2 = _db.activity_relating.Where(q => q.activity_num == id).ToList(); //相關項目
if (prod2.Count > 0)
var prod = _db.activities.Where(q => q.num == id).FirstOrDefault(); //刪除該筆資料
if (prod != null)
{
//查詢結果全部刪除
_db.activity_relating.RemoveRange(prod2);
}
var prod3 = _db.activity_spares.Where(q => q.activity_num == id).ToList(); //備品項目
if (prod3.Count > 0)
{
_db.activity_spares.RemoveRange(prod3);
}
//訊息、庫存、收支,從資料庫設定null
_db.activities.Remove(prod);
_db.SaveChanges();//執行
Model.admin_log admin_log = new Model.admin_log();
MyWeb.admin admin = new MyWeb.admin();//api裡不可以用MyWeb
if (admin.isLoign())
{
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Delete, prod.subject);
//刪除相關資料
var prod2 = _db.activity_relating.Where(q => q.activity_num == id).ToList(); //相關項目
if (prod2.Count > 0)
{
//查詢結果全部刪除
_db.activity_relating.RemoveRange(prod2);
}
var prod3 = _db.activity_spares.Where(q => q.activity_num == id).ToList(); //備品項目
if (prod3.Count > 0)
{
_db.activity_spares.RemoveRange(prod3);
}
//訊息、庫存、收支,從資料庫設定null
_db.activities.Remove(prod);
_db.SaveChanges();//執行
Model.admin_log admin_log = new Model.admin_log();
MyWeb.admin admin = new MyWeb.admin();//api裡不可以用MyWeb
if (admin.isLoign())
{
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Delete, prod.subject);
}
}
}
catch (Exception ex)
{
LogUtility log=new LogUtility();
log.writeErrorPath(ex.ToString()+ex.StackTrace);
}
}
[HttpDelete]
web/App_Code/api/ezAuthorizeAttribute.cs
+17 -7
View File
@@ -1,4 +1,5 @@
using System;
using MINOM.COM.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
@@ -47,12 +48,21 @@ public class ezAuthorizeAttribute : AuthorizeAttribute
protected override bool IsAuthorized(HttpActionContext actionContext)
{
MyWeb.admin admin = new MyWeb.admin();
bool isLogin = admin.isLoign();
//if (admin.chkAdmIP && (admin.chkTwIP || admin.chkAdmIP_Enable)) { }
//判斷是否登入
if (!isLogin) {
return false;
try
{
MyWeb.admin admin = new MyWeb.admin();
bool isLogin = admin.isLoign();
//if (admin.chkAdmIP && (admin.chkTwIP || admin.chkAdmIP_Enable)) { }
//判斷是否登入
if (!isLogin)
{
return false;
}
}
catch (Exception ex)
{
LogUtility log = new LogUtility();
log.writeErrorPath(ex.ToString()+ex.StackTrace);
}
/*
if (actionContext == null)