whm
/
djyweb_ams
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

Browse Source
master
wet 2 years ago
parent d15868eeaf
commit 0606caee98
11 changed files with 212 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
web/djy.IService/Ams/IAmsService.cs
Unescape Escape View File

@ -21,7 +21,7 @@ namespace djy.IService.Ams
string SaveInfo(AMSDto dto, User user);
TableData Load(AMSQuery req, User user);
TableData Load(AMSQuery req, User user,UserAuthorityDto aut);
void Delete(string ids, User user);

2
web/djy.IService/Isf/IIsfService.cs
Unescape Escape View File

@ -22,7 +22,7 @@ namespace djy.IService.Isf
/// <param name="req"></param>
/// <param name="userid"></param>
/// <returns></returns>
TableData Load(ISFQuery req, User user);
TableData Load(ISFQuery req, User user, UserAuthorityDto aut);
/// <summary>
/// 删除

2
web/djy.Model/Ams/AMS_AddrTemplate.cs
Unescape Escape View File

@ -8,7 +8,7 @@ namespace djy.Model.Ams
[JsonObject(MemberSerialization.OptIn), Table(Name = "AMS_AddrTemplate", DisableSyncStructure = true)]
public class AMS_AddrTemplate
{
[MaxLength(50)]
[JsonProperty, Column(IsPrimary = true, IsNullable = false)]
public string GID { get; set; }
[MaxLength(50)]

1
web/djy.Model/Isf/ISF_CompanyTemplate.cs
Unescape Escape View File

@ -8,7 +8,6 @@ namespace djy.Model.Isf
[JsonObject(MemberSerialization.OptIn), Table(Name = "ISF_CompanyTemplate", DisableSyncStructure = true)]
public class ISF_CompanyTemplate
{
[MaxLength(50)]
[JsonProperty, Column(IsPrimary = true, IsNullable = false)]
public string GID { get; set; }
[MaxLength(50)]

186
web/djy.Service/Ams/AmsService.cs
Unescape Escape View File

@ -37,7 +37,7 @@ namespace djy.Service.Ams
#region 查询列表
public TableData Load(AMSQuery req, User user)
public TableData Load(AMSQuery req, User user, UserAuthorityDto aut)
{
var result = new TableData();
@ -50,11 +50,13 @@ namespace djy.Service.Ams
List<string> hou = null;
if (!req.HBLNo.IsNullOrEmpty())
{
hou = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => (x.IsDel == false || x.IsDel == null))
hou = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true)
.WhereIf(req.HBLNo != null, x => x.HBLNo.Contains(req.HBLNo)).ToList().Select(x => x.PID).ToList<string>();
}
var dto = DbBus.Get(DbList.AMSCenter).Select<AMS_Master>()
.Where(x => x.IsDel != true && x.CompID == user.CompId)
.Where(x => x.IsDel != true)
.WhereIf(aut.CompayId!=null,x=>x.CompID== aut.CompayId.ToString())
.WhereIf(aut.UserId != null, x => x.UserID == aut.UserId.ToString())
.WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO.Trim()))
.WhereIf(req.PORTDISCHARGECode != null, x => x.PORTDISCHARGECode == req.PORTDISCHARGECode)
.WhereIf(req.LoadingPortCode != null, x => x.LoadingPortCode == req.LoadingPortCode)
@ -71,7 +73,7 @@ namespace djy.Service.Ams
{
var historyDto = DbBus.Get(DbList.AMSCenter).Select<AMS_MasterHistory>().Where(x => x.AM_ID == item.GID).OrderByDescending(x => x.SendTime).ToList();
item.HistoryDto = historyDto;
var hodto = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == item.GID)
var hodto = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x =>x.IsDel !=true && x.PID == item.GID)
.WhereIf(req.HBLNo != null, x => x.HBLNo.Contains(req.HBLNo.Trim()))
.WhereIf(req.ReportState == "0", x => x.ReportState == "未申报" || x.ReportState == "接收失败")
.WhereIf(req.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "接收失败"))
@ -82,7 +84,7 @@ namespace djy.Service.Ams
{
foreach (var it in hodto)
{
var cnt = DbBus.Get(DbList.AMSCenter).Select<AMS_Cntrno>().Where(x => (x.IsDel == false || x.IsDel == null) && x.HID == it.GID).ToList();
var cnt = DbBus.Get(DbList.AMSCenter).Select<AMS_Cntrno>().Where(x => x.IsDel != true && x.HID == it.GID).ToList();
it.CntrnoDto = cnt;
}
}
@ -652,6 +654,7 @@ namespace djy.Service.Ams
return req;
}
if (docType == "AMSAR")
{
var getfinrs = fin.Expend(new CustFee
@ -677,6 +680,31 @@ namespace djy.Service.Ams
return req;
}
}
if (docType == "AMSM")
{
var getfinrs = fin.Expend(new CustFee
{
ETD = master.ETD,
VOYNO = master.VOYNO,
VESSEL = master.VESSEL,
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 2,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}
, 0);
if (!getfinrs.Status)
{
req.Code = 201;
req.Message = getfinrs.Message;
return req;
}
}
HouseBillInfoListItem houseinfo = new HouseBillInfoListItem();
houseinfo.businessId = item.GID;
houseinfo.shippingNo = null;
@ -752,6 +780,30 @@ namespace djy.Service.Ams
ToList<AMS_HouseDto>();
foreach (var item in hodto)
{
var getfinrs = fin.Expend(new CustFee
{
ETD = master.ETD,
VOYNO = master.VOYNO,
VESSEL = master.VESSEL,
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 5,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}
, 0);
if (!getfinrs.Status)
{
req.Code = 201;
req.Message = getfinrs.Message;
return req;
}
if (item.ReportState == "删单成功")
{
req.Code = 201;
@ -877,7 +929,7 @@ namespace djy.Service.Ams
if (docType == "AMSDOC")
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { ReportState = "已提交", NewNotice = "新增发送成功" }).Where(w => w.PID == oid).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState="", ReportState = "已提交", NewNotice = "新增发送成功" }).Where(w => w.PID == oid).ExecuteAffrows();
foreach (var item in hodto)
{
var getfinrs = fin.Expend(new CustFee
@ -901,7 +953,7 @@ namespace djy.Service.Ams
else if (docType == "AMSAR")
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { ReportState = "已提交", NewNotice = "重发发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "", ReportState = "已提交", NewNotice = "重发发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
foreach (var item in hodto)
{
var getfinrs = fin.Expend(new CustFee
@ -924,12 +976,50 @@ namespace djy.Service.Ams
}
else if (docType == "AMSM")
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { ReportState = "已提交", NewNotice = "修改发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
foreach (var item in hodto)
{
var getfinrs = fin.Expend(new CustFee
{
CARRIER = master.CARRIER,
ETD = master.ETA,
VOYNO = master.VOYNO,
VESSEL = master.VESSEL,
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 2,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}, 1);
}
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "", ReportState = "已提交", NewNotice = "修改发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { ReportState = "已提交", NewNotice = "删除发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
foreach (var item in hodto)
{
var getfinrs = fin.Expend(new CustFee
{
CARRIER = master.CARRIER,
ETD = master.ETA,
VOYNO = master.VOYNO,
VESSEL = master.VESSEL,
HBLNO = item.HBLNo,
SENDUSERID = user.GID,
LURURENID = user.GID,
CtnrCount = 1,
CtnrInfo = string.Empty,
BSTYPE = 15,
SENDTYPE = 5,
BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(),
}, 1);
}
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "", ReportState = "已提交", NewNotice = "删除发送成功" }).Where(w => House.Contains(w.GID)).ExecuteAffrows();
}
}
@ -974,7 +1064,7 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = masterid;
history.SendTime = DateTime.Now;
history.State = "匹配成功";
history.State = "海关接收成功";
history.Type = "匹配成功";
history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关接收成功";
@ -986,13 +1076,27 @@ namespace djy.Service.Ams
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState)) {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState+","+retdto.status, NewNotice = "海关接收成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
if (string.IsNullOrEmpty(house.MateState))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
}
@ -1006,7 +1110,7 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = masterid;
history.SendTime = DateTime.Now;
history.State = "匹配成功";
history.State = "船司匹配成功";
history.Type = "匹配成功";
history.Operator = "系统管理员";
history.Remark = "您的单据"+house.HBLNo+"于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "船司匹配成功";
@ -1018,13 +1122,31 @@ namespace djy.Service.Ams
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
}
@ -1039,7 +1161,7 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = masterid;
history.SendTime = DateTime.Now;
history.State = "匹配成功";
history.State = "ISF匹配成功";
history.Type = "匹配成功";
history.Operator = "系统管理员";
history.Remark = "您的单据"+house.HBLNo+"于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF匹配成功";
@ -1051,16 +1173,36 @@ namespace djy.Service.Ams
}
if (house.NewNotice == "修改发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "修改成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功")
{
if (string.IsNullOrEmpty(house.MateState))
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
}
}
var faillist = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && x.PID == masterid && x.State == "0").ToList();
}
else if (retdto.status == "W1")
{
@ -1068,7 +1210,7 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = masterid;
history.SendTime = DateTime.Now;
history.State = "匹配失败";
history.State = "海关拒绝";
history.Type = "匹配失败";
history.Operator = "系统管理员";
history.Remark = "您的单据"+house.HBLNo+"于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝";
@ -1097,7 +1239,7 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = masterid;
history.SendTime = DateTime.Now;
history.State = "匹配失败";
history.State = "箱货信息不匹配";
history.Type = "匹配失败";
history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo+ "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "箱货信息不匹配";

40
web/djy.Service/ISF/IsfService.cs
Unescape Escape View File

@ -21,7 +21,7 @@ namespace djy.Service.Isf
{
#region 查询接口
public TableData Load(ISFQuery req, User user)
public TableData Load(ISFQuery req, User user, UserAuthorityDto aut)
{
var result = new TableData();
string[] ReportStates = null;
@ -31,15 +31,17 @@ namespace djy.Service.Isf
ReportStates = req.ReportState.Split(',');
}
var dto = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().
Where(x => x.IsDel != true && x.CompID == user.CompId).
WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO)).
WhereIf(req.InFoType != null, x => x.InFoType == req.InFoType).
WhereIf(req.ReportState != null && req.ReportState != "0" && req.ReportState != "1", x => ReportStates.Contains(x.ReportState)).
WhereIf(req.ReportState == "0", x => x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败").
WhereIf(req.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败"))
.WhereIf(req.UserName != null, x => x.UserName.Contains(req.UserName.Trim()))
.WhereIf(req.BDate != null, x => x.CreateTime >= req.BDate)
.WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime); ;
Where(x => x.IsDel != true).
WhereIf(aut.CompayId != null, x => x.CompID == aut.CompayId.ToString()).
WhereIf(aut.UserId != null, x => x.UserID == aut.UserId.ToString()).
WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO)).
WhereIf(req.InFoType != null, x => x.InFoType == req.InFoType).
WhereIf(req.ReportState != null && req.ReportState != "0" && req.ReportState != "1", x => ReportStates.Contains(x.ReportState)).
WhereIf(req.ReportState == "0", x => x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败").
WhereIf(req.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败")).
WhereIf(req.UserName != null, x => x.UserName.Contains(req.UserName.Trim())).
WhereIf(req.BDate != null, x => x.CreateTime >= req.BDate).
WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime); ;
result.count = dto.ToList().Count();
var list = dto.Page(req.Page, req.Limit).ToList<ISFDto>();
if (list != null)
@ -157,7 +159,7 @@ namespace djy.Service.Isf
}
}
#endregion
#region 删除
@ -399,7 +401,8 @@ namespace djy.Service.Isf
_LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}");
}
else {
else
{
var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var Account = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFAccount").ToOne();
var method = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFMethod").ToOne();
@ -425,7 +428,7 @@ namespace djy.Service.Isf
JObject rlt = JObject.Parse(gethtml);
var code = rlt.GetValue("code").ToString();
var msg = rlt.GetValue("msg").ToString();
if (code == "F")
{
@ -458,7 +461,7 @@ namespace djy.Service.Isf
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg;
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
req.Code = 201;
req.Message = "操作失败," + msg ;
req.Message = "操作失败," + msg;
return req;
}
if (code == "T")
@ -467,8 +470,9 @@ namespace djy.Service.Isf
var data = rlt.GetValue("data").ToString();
JObject drlt = JObject.Parse(data);
var result = drlt.GetValue("code").ToString();
if (result!="1") {
if (result != "1")
{
var errorInfo = drlt.GetValue("msg").ToString();
history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid;
@ -498,12 +502,12 @@ namespace djy.Service.Isf
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg;
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
req.Code = 201;
req.Message = "操作失败," + msg+errorInfo;
req.Message = "操作失败," + msg + errorInfo;
return req;
}
history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid;
history.SendTime = DateTime.Now;

11
web/djy.WebApi/Controllers/AMS/AmsController.cs
Unescape Escape View File

@ -15,6 +15,7 @@ using System.Text;
using System.IO;
using djy.Service.DjyService;
using djy.IService.Ams;
using Common.DJYModel;
namespace djy_AmsApi.Controllers.AMS
{
@ -27,6 +28,14 @@ namespace djy_AmsApi.Controllers.AMS
[HttpGet("Load")]
public object Load([FromQuery] AMSQuery request)
{
UserAuthorityDto aut = GetUserAuthorityToFormDto("modAmsList");
if (!aut.IsPower)
{
var result = new Response();
result.Code = 201;
result.Message = "没有权限！";
return result;
}
var user = GetUserInfo();
if (user == null)
{
@ -35,7 +44,7 @@ namespace djy_AmsApi.Controllers.AMS
result.Message = "登录过期，请重新登录！";
return result;
}
return ser.Load(request, user);
return ser.Load(request, user, aut);
}
#endregion

2
web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

File diff suppressed because one or more lines are too long

2
web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
Unescape Escape View File

@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-07-12T08:27:25.6510813Z;True|2022-07-12T16:05:05.4184759+08:00;True|2022-07-12T10:39:59.0985811+08:00;True|2022-07-12T10:33:46.3867816+08:00;True|2022-07-08T17:01:30.6693134+08:00;True|2022-07-08T12:06:36.3838761+08:00;True|2022-07-07T16:23:24.9970320+08:00;True|2022-07-07T16:13:59.0482365+08:00;True|2022-07-07T11:23:54.2426892+08:00;True|2022-07-05T16:20:17.0177653+08:00;True|2022-07-05T16:19:13.8760086+08:00;True|2022-07-05T11:23:47.7031600+08:00;</History>
<History>True|2022-07-14T09:10:22.0747703Z;True|2022-07-12T16:27:25.6510813+08:00;True|2022-07-12T16:05:05.4184759+08:00;True|2022-07-12T10:39:59.0985811+08:00;True|2022-07-12T10:33:46.3867816+08:00;True|2022-07-08T17:01:30.6693134+08:00;True|2022-07-08T12:06:36.3838761+08:00;True|2022-07-07T16:23:24.9970320+08:00;True|2022-07-07T16:13:59.0482365+08:00;True|2022-07-07T11:23:54.2426892+08:00;True|2022-07-05T16:20:17.0177653+08:00;True|2022-07-05T16:19:13.8760086+08:00;True|2022-07-05T11:23:47.7031600+08:00;</History>
</PropertyGroup>
</Project>

2
web/djy.WebApi/djy_AmsApi.csproj.user
Unescape Escape View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

11
web/djy_IsfApi/Controllers/ISF/IsfController.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Common.Utilities;
using Common.DJYModel;
using Common.Utilities;
using djy.IService.Isf;
using djy.Model.Isf;
using djy.Model.IsfDto;
@ -21,6 +22,14 @@ namespace djy_Isfpi.Controllers.ISF
[HttpGet("Load")]
public object Load([FromQuery] ISFQuery request)
{
UserAuthorityDto aut = GetUserAuthorityToFormDto("modIsfList");
if (!aut.IsPower)
{
var result = new Response();
result.Code = 201;
result.Message = "没有权限！";
return result;
}
var user = GetUserInfo();
if (user == null)
{

Write Preview
Loading…
Cancel
Save