diff --git a/web/djy.IService/Ams/IAmsService.cs b/web/djy.IService/Ams/IAmsService.cs index 2e50c45..43f9732 100644 --- a/web/djy.IService/Ams/IAmsService.cs +++ b/web/djy.IService/Ams/IAmsService.cs @@ -59,7 +59,7 @@ namespace djy.IService.Ams string SaveTemplate(AMS_AddrTemplate dto, User user); List GetTemplate(User user, string type,string TemPlateName); - byte[] PDF(string GID); + byte[] PDF(string ids); } } diff --git a/web/djy.IService/Isf/IIsfService.cs b/web/djy.IService/Isf/IIsfService.cs index 742555e..2948893 100644 --- a/web/djy.IService/Isf/IIsfService.cs +++ b/web/djy.IService/Isf/IIsfService.cs @@ -63,5 +63,9 @@ namespace djy.IService.Isf /// /// Task SendDE(string Gid, User user, string msgType); + + + + Response SaveReceipt(string msg ); } } diff --git a/web/djy.Model/IsfDto/ISFReceipt.cs b/web/djy.Model/IsfDto/ISFReceipt.cs new file mode 100644 index 0000000..cd1d0e8 --- /dev/null +++ b/web/djy.Model/IsfDto/ISFReceipt.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace djy.Model.IsfDto +{ + public class ISFReceipt + { + /// + /// + /// + public string businessId { get; set; } + /// + /// + /// + public string AMSBLNumber { get; set; } + /// + /// + /// + public string status { get; set; } + /// + /// + /// + public string content { get; set; } + /// + /// + /// + public string businessDate { get; set; } + } +} diff --git a/web/djy.Service/Ams/AmsService.cs b/web/djy.Service/Ams/AmsService.cs index ccda7bf..507a719 100644 --- a/web/djy.Service/Ams/AmsService.cs +++ b/web/djy.Service/Ams/AmsService.cs @@ -130,8 +130,8 @@ namespace djy.Service.Ams string guid = ""; List hblist = null; hblist = dto.HouseDto.Select(x => x.HBLNo).ToList(); - var mlist= DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && x.MBLNO == dto.MBLNO&&x.GID!=dto.GID).ToOne(); - var hlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && hblist.Contains(x.HBLNo)).ToOne(); + var mlist= DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && x.MBLNO == dto.MBLNO && x.GID!=dto.GID).ToOne(); + var hlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && hblist.Contains(x.HBLNo)&& x.PID!=dto.GID).ToOne(); if (mlist!=null|| hlist!=null) { return "-1"; @@ -322,7 +322,7 @@ namespace djy.Service.Ams , 0); if (!getfinrs.Status) { - req.Code = 200; + req.Code = 201; req.Message = getfinrs.Message; return req; } @@ -636,12 +636,12 @@ namespace djy.Service.Ams if (master.NewNotice == "修改发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "修改失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); } if (master.NewNotice == "重发发送成功" || master.NewNotice == "新增发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); } } @@ -900,8 +900,9 @@ namespace djy.Service.Ams /// /// /// - public byte[] PDF(string GID) + public byte[] PDF(string ids) { + string[] id = ids.Split(','); Document document = new Document(PageSize.A4); //指定字体文件，IDENTITY_H：支持中文 var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "msyh.ttc,0"); @@ -914,14 +915,13 @@ namespace djy.Service.Ams PdfWriter writer = PdfWriter.GetInstance(document, baos); document.Open(); ///获取数据源 - var houselist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.PID == GID).ToList(); - var masterlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.GID == GID).ToOne(); + var houselist = DbBus.Get(DbList.AMSCenter).Select().Where(x => id.Contains(x.GID)).ToList(); var cARRIERIDList = DbBus.Get(DbList.Common).Select().Where(map => map.Module == "AMS").ToList(); - if (houselist != null && masterlist != null) + if (houselist != null) { for (int i = 0; i < houselist.Count(); i++) { - + var masterlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.GID == houselist[i].PID).ToOne(); string heardText = "NIAV" + houselist[i].HBLNo + " ISF INFORMATION"; Paragraph heardTexts = new Paragraph(heardText, font); heardTexts.IndentationLeft = 150; diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs index 1432e16..e22b75b 100644 --- a/web/djy.Service/ISF/IsfService.cs +++ b/web/djy.Service/ISF/IsfService.cs @@ -17,9 +17,9 @@ using System.Threading.Tasks; namespace djy.Service.Isf { - public class IsfService : ServBase, IIsfService + public class IsfService : ServBase, IIsfService { - + #region 查询接口 public TableData Load(ISFQuery req, User user) { @@ -32,11 +32,11 @@ namespace djy.Service.Isf } var dto = DbBus.Get(DbList.AMSCenter).Select(). 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.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.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败")); result.count = dto.ToList().Count(); var list = dto.Page(req.Page, req.Limit).ToList(); if (list != null) @@ -60,7 +60,7 @@ namespace djy.Service.Isf { string guid = ""; var mlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && x.MBLNO == dto.MBLNO && x.GID != dto.GID).ToOne(); - if (mlist != null ) + if (mlist != null) { return "-1"; @@ -109,7 +109,7 @@ namespace djy.Service.Isf } else { - + DbBus.Get(DbList.AMSCenter).Transaction(() => { @@ -124,7 +124,7 @@ namespace djy.Service.Isf master.ShipmentTypeName = dto.ShipmentTypeName; master.HstCode = dto.HstCode; master.BlTypeCode = dto.BlTypeCode; - master.BlTypeName= dto.BlTypeName; + master.BlTypeName = dto.BlTypeName; master.LastUpdate = DateTime.Now; DbBus.Get(DbList.AMSCenter).Update().SetSource(master).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Delete().Where(w => w.PID == master.GID).ExecuteAffrows(); @@ -168,7 +168,7 @@ namespace djy.Service.Isf { if (oid != "") { - + DbBus.Get(DbList.AMSCenter).Transaction(() => { ISF_MasterHistory history = new ISF_MasterHistory(); @@ -182,7 +182,7 @@ namespace djy.Service.Isf DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update().Set(w => w.IsDel, true).Where(w => w.GID == oid).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update().Set(w => w.IsDel, true).Where(w => w.PID == oid).ExecuteAffrows(); - + }); } } @@ -192,13 +192,13 @@ namespace djy.Service.Isf #region 获取模板 - public List GetTemplate(User user, string CompanyType, string InFoType,string TemPlateName) + public List GetTemplate(User user, string CompanyType, string InFoType, string TemPlateName) { try { var List = DbBus.Get(DbList.AMSCenter).Select(). - Where(x=> x.IsDel == false || x.IsDel == null). - Where(x => x.UserID== user.GID). + Where(x => x.IsDel == false || x.IsDel == null). + Where(x => x.UserID == user.GID). WhereIf(CompanyType != null, x => x.CompanyType == CompanyType). WhereIf(InFoType != null, x => x.InFoType == InFoType). WhereIf(TemPlateName != null, x => TemPlateName.Contains(x.TemPlateName)). @@ -218,7 +218,7 @@ namespace djy.Service.Isf public string SaveTemplate(ISF_CompanyTemplate dto, User user) { string guid = ""; - var list = DbBus.Get(DbList.AMSCenter).Select().Where(w => w.UserID == user.GID && w.TemPlateName == dto.TemPlateName && w.CompanyType == dto.CompanyType&& w.InFoType == dto.InFoType&&w.GID!=dto.GID).ToOneAsync(); + var list = DbBus.Get(DbList.AMSCenter).Select().Where(w => w.UserID == user.GID && w.TemPlateName == dto.TemPlateName && w.CompanyType == dto.CompanyType && w.InFoType == dto.InFoType && w.GID != dto.GID).ToOneAsync(); if (!list.IsNullOrEmpty()) { return "-1"; @@ -238,7 +238,8 @@ namespace djy.Service.Isf DbBus.Get(DbList.AMSCenter).Insert(template).ExecuteAffrows(); guid = template.GID; } - else { + else + { ISF_CompanyTemplate template = dto.MapTo(); @@ -252,13 +253,13 @@ namespace djy.Service.Isf #region 第三方接口 - public async Task SendDE(string Gid, User user , string msgType) + public async Task SendDE(string Gid, User user, string msgType) { Response req = new Response(); try { string[] id = Gid.Split(','); - + foreach (string oid in id) { if (oid != "") @@ -269,45 +270,45 @@ namespace djy.Service.Isf var comlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); if (msgType != "3") { - + if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败")) { req.Code = 200; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; return req; } - //if (msgType == "1" || msgType == "4") - //{ - // ///扣费接口 - // var getfinrs = fin.Expend(new CustFee - // { - // SENDUSERID = userid, - // LURURENID = userid, - // CtnrCount = 1, - // CtnrInfo = string.Empty, - // BSTYPE = 16, - // SENDTYPE = 0, - // BSNO = oid.ToString(), - // MBLNO = master.MBLNO.ToString(), - // } - // , 0); - // if (!getfinrs.Status) - // { - // req.Code = 200; - // req.Message = getfinrs.Message; - // return req; - // } - //} + if (msgType == "1" || msgType == "4") + { + ///扣费接口 + var getfinrs = fin.Expend(new CustFee + { + SENDUSERID = user.GID, + LURURENID = user.GID, + CtnrCount = 1, + CtnrInfo = string.Empty, + BSTYPE = 16, + SENDTYPE = 0, + BSNO = oid.ToString(), + MBLNO = master.MBLNO.ToString(), + } + , 0); + if (!getfinrs.Status) + { + req.Code = 201; + req.Message = getfinrs.Message; + return req; + } + } var portList = DbBus.Get(DbList.Common).Select().ToList(); var CodePortLoadList = DbBus.Get(DbList.Common).Select().ToList(); Info info = new Info(); info.masterBillNo = master.MBLNO; info.infoType = master.InFoType; - info.dischargeHarbourCode = portList.Where(x => x.Code == master.DischargeHarbourCode).Select(x => x.EdiCode).FirstOrDefault(); - info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault(); + info.dischargeHarbourCode = portList.Where(x => x.Code == master.DischargeHarbourCode).Select(x => x.EdiCode).FirstOrDefault(); + info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault(); info.shipmentTypeCode = master.ShipmentTypeCode; info.hstCode = master.HstCode; - + info.blTypeCode = master.BlTypeCode; info.refId = master.GID; List companyList = new List(); @@ -317,24 +318,25 @@ namespace djy.Service.Isf { companyType = item.CompanyType, companyName = item.CompanyName, - idTypeCode=item.IdTypeCode, - address=item.Address, - city=item.City, - province=item.Province, - provinceCode=item.ProvinceCode, - countryCode=item.ProvinceCode, - postcode=item.PostCode, - hstCode=item.HstCode, - + idTypeCode = item.IdTypeCode, + address = item.Address, + city = item.City, + province = item.Province, + provinceCode = item.ProvinceCode, + countryCode = item.ProvinceCode, + postcode = item.PostCode, + hstCode = item.HstCode, + }); } var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); var AMSAccount = DbBus.Get(DbList.djydb).Select().Where(x => x.PARAMNAME == "AMSAccount").ToOne(); - + var method = DbBus.Get(DbList.djydb).Select().Where(x => x.PARAMNAME == "ISFMethod").ToOne(); var key = DbBus.Get(DbList.djydb).Select().Where(x => x.PARAMNAME == "AMSKEY").ToOne(); + var url = DbBus.Get(DbList.djydb).Select().Where(x => x.PARAMNAME == "AMSURL").ToOne(); /////MD5加密 - string stringSign = string.Format("companyList={0}&format=json&info={1}&method=eportyun.manifest.isf.sendBill&msgType={2}×tamp={3}&user_id=nbforwarder&version=2.0&key=2dde55e422d2461b913f510e95da73b3", - JsonConvert.SerializeObject(companyList), JsonConvert.SerializeObject(info), Convert.ToInt32(msgType),timestamp); + string stringSign = string.Format("companyList={0}&format=json&info={1}&method={2}&msgType={3}×tamp={4}&user_id={5}&version=2.0&key={6}", + JsonConvert.SerializeObject(companyList), JsonConvert.SerializeObject(info), method.PARAMVALUE, Convert.ToInt32(msgType), timestamp, AMSAccount.PARAMVALUE, key.PARAMVALUE); string sign = stringSign.ToMd5().ToUpper(); ///post参数 @@ -342,7 +344,7 @@ namespace djy.Service.Isf isfinfo.companyList = companyList; isfinfo.format = "json"; isfinfo.info = info; - isfinfo.method = "eportyun.manifest.isf.sendBill"; + isfinfo.method = method.PARAMVALUE; isfinfo.msgType = Convert.ToInt32(msgType); isfinfo.user_id = AMSAccount.PARAMVALUE; isfinfo.sign = sign; @@ -351,14 +353,18 @@ namespace djy.Service.Isf isfinfo.format = "json"; string json = JsonConvert.SerializeObject(isfinfo); _LogsAdd("SendDE", "post", $"ISF接口调用发送{oid}：{json}"); - string gethtml = await HttpHelp.Post(isfinfo, "http://api.trainer.nbeport.com/router/rest", PsotType.Json); + string gethtml = await HttpHelp.Post(isfinfo, url.PARAMVALUE, PsotType.Json); _LogsAdd("SendDE", "post", $"ISF接口调用返回{oid}：{gethtml}"); if (gethtml != null) { JObject rlt = JObject.Parse(gethtml); var code = rlt.GetValue("code").ToString(); var msg = rlt.GetValue("msg").ToString(); - if (code == "F") + var data = rlt.GetValue("data").ToString(); + JObject drlt = JObject.Parse(data); + var result = drlt.GetValue("code").ToString(); + var errorInfo = drlt.GetValue("msg").ToString(); + if (code == "F" || result != "1") { ISF_MasterHistory history = new ISF_MasterHistory(); @@ -389,11 +395,11 @@ namespace djy.Service.Isf history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); - req.Code = 200; - req.Message = "操作失败," + msg; + req.Code = 201; + req.Message = "操作失败," + msg + errorInfo; return req; } - if (code == "T") + if (code == "T" && result == "1") { ISF_MasterHistory history = new ISF_MasterHistory(); history.GID = Guid.NewGuid().ToString("N"); @@ -426,34 +432,34 @@ namespace djy.Service.Isf if (msgType == "1") { - // var getfinrs = fin.Expend(new CustFee - // { - // SENDUSERID = userid, - // LURURENID = userid, - // CtnrCount = 1, - // CtnrInfo = string.Empty, - // BSTYPE = 16, - // SENDTYPE = 0, - // BSNO = oid.ToString(), - // MBLNO = master.MBLNO.ToString(), - // } - //, 1); + var getfinrs = fin.Expend(new CustFee + { + SENDUSERID = user.GID, + LURURENID = user.GID, + CtnrCount = 1, + CtnrInfo = string.Empty, + BSTYPE = 16, + SENDTYPE = 0, + BSNO = oid.ToString(), + MBLNO = master.MBLNO.ToString(), + } + , 1); DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "新增发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); } else if (msgType == "4") { - // var getfinrs = fin.Expend(new CustFee - // { - // SENDUSERID = userid, - // LURURENID = userid, - // CtnrCount = 1, - // CtnrInfo = string.Empty, - // BSTYPE = 16, - // SENDTYPE = 0, - // BSNO = oid.ToString(), - // MBLNO = master.MBLNO.ToString(), - // } - //, 1); + var getfinrs = fin.Expend(new CustFee + { + SENDUSERID = user.GID, + LURURENID = user.GID, + CtnrCount = 1, + CtnrInfo = string.Empty, + BSTYPE = 16, + SENDTYPE = 0, + BSNO = oid.ToString(), + MBLNO = master.MBLNO.ToString(), + } + , 1); DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "重发发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); } @@ -468,9 +474,6 @@ namespace djy.Service.Isf } } } - - - } } } @@ -486,6 +489,114 @@ namespace djy.Service.Isf } } + public Response SaveReceipt(string msg) + { + _LogsAdd("ISFReceipt", "post", $"ISF接口推送{msg}"); + Response req = new Response(); + + try + { + + if (msg != null) + { + ISFReceipt retdto = Json.JsonToObject(msg); + var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.GID == retdto.businessId).ToOne(); + + if (retdto.status == "SI") + { + ISF_MasterHistory history = new ISF_MasterHistory(); + history.GID = Guid.NewGuid().ToString("N"); + history.ISF_ID = master.GID; + history.SendTime = DateTime.Now; + history.State = "匹配失败"; + history.Type = "匹配失败"; + history.Operator = "系统管理员"; + history.Remark = "您的明细单据" + retdto.businessId + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "匹配失败"; + DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + + //if (master.NewNotice == "删除发送成功") + //{ + + // DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + //} + //if (master.NewNotice == "修改发送成功") + //{ + + // DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + //} + if (master.NewNotice == "重发发送成功" || master.NewNotice == "新增发送成功") + { + + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收成功" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } + + } + else if (retdto.status == "02") + { + ISF_MasterHistory history = new ISF_MasterHistory(); + history.GID = Guid.NewGuid().ToString("N"); + history.ISF_ID = master.GID; + history.SendTime = DateTime.Now; + history.State = "删除成功"; + history.Type = "删除成功"; + history.Operator = "系统管理员"; + history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关删除成功"; + DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "ISF和AMS匹配成功", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } + else if (retdto.status == "01") + { + ISF_MasterHistory history = new ISF_MasterHistory(); + history.GID = Guid.NewGuid().ToString("N"); + history.ISF_ID = master.GID; + history.SendTime = DateTime.Now; + history.State = "海关拒绝"; + history.Type = "删除成功"; + history.Operator = "系统管理员"; + history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; + DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } + else if (retdto.status == "SB"|| retdto.status == "S2" || retdto.status == "S3" || retdto.status == "S4" || retdto.status == "S5" || retdto.status == "S6") + { + ISF_MasterHistory history = new ISF_MasterHistory(); + history.GID = Guid.NewGuid().ToString("N"); + history.ISF_ID = master.GID; + history.SendTime = DateTime.Now; + history.State = "未匹配AMS"; + history.Type = "未匹配AMS"; + history.Operator = "系统管理员"; + history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; + DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_Master { MateState = retdto.status, NewNotice = "未匹配AMS", ReportState = "删单失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } + } + else + { + + req.Code = 200; + req.Message = "未收到参数"; + return req; + + } + + } + catch (Exception ex) + { + req.Code = 500; + req.Message = ex.InnerException?.Message ?? ex.Message; + _LogsAdd("SendDE", "post", $"AMS_SaveReceipt接口：{req.Message }"); + return req; + } + + req.Code = 200; + req.Message = "请求成功"; + return req; + + } + + + #endregion } } \ No newline at end of file diff --git a/web/djy.WebApi/Controllers/AMS/AmsController.cs b/web/djy.WebApi/Controllers/AMS/AmsController.cs index 3475c02..67f4b2f 100644 --- a/web/djy.WebApi/Controllers/AMS/AmsController.cs +++ b/web/djy.WebApi/Controllers/AMS/AmsController.cs @@ -42,7 +42,7 @@ namespace djy_AmsApi.Controllers.AMS #region 新增/编辑 [HttpPost("AddOrUpdate")] - public Response AddOrUpdate(AMSDto Dto) + public Response AddOrUpdate([FromBody] AMSDto Dto) { var result = new Response(); var user = GetUserInfo(); @@ -68,6 +68,7 @@ namespace djy_AmsApi.Controllers.AMS return result; } #endregion + #region 删除 /// /// 删除接口 @@ -343,9 +344,9 @@ namespace djy_AmsApi.Controllers.AMS #region pdf导出 [HttpGet("ExportPDF")] - public IActionResult ExportPDF(String Gid) + public IActionResult ExportPDF(string ids) { - byte[] bytes = ser.PDF(Gid); + byte[] bytes = ser.PDF(ids); return File(bytes, "application/octet-stream"); } #endregion diff --git a/web/djy.WebApi/Controllers/ApiBase.cs b/web/djy.WebApi/Controllers/ApiBase.cs index e292489..efa8a5f 100644 --- a/web/djy.WebApi/Controllers/ApiBase.cs +++ b/web/djy.WebApi/Controllers/ApiBase.cs @@ -51,7 +51,6 @@ namespace djy_AmsApi.Controllers if (rs.Status) { return rs.Data; - } else { return null; diff --git a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 41f3514..d44d602 100644 --- a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\DJY.AMS\web\djy.WebApi\bin\publish\net5 - True|2022-06-29T09:05:03.3034364Z;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; + True|2022-06-30T07:06:12.0032112Z;True|2022-06-30T15:05:33.2540874+08:00;True|2022-06-30T10:26:41.3365814+08:00;True|2022-06-30T09:56:20.9021741+08:00;True|2022-06-30T08:53:10.0864638+08:00;True|2022-06-29T17:05:03.3034364+08:00;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; \ No newline at end of file diff --git a/web/djy.WebApi/Startup.cs b/web/djy.WebApi/Startup.cs index 2606d32..d24613d 100644 --- a/web/djy.WebApi/Startup.cs +++ b/web/djy.WebApi/Startup.cs @@ -159,10 +159,7 @@ namespace djy_AmsApi app.UseEndpoints(endpoints => { endpoints.MapControllers(); - }); - - } } diff --git a/web/djy.WebApi/logo.png b/web/djy.WebApi/logo.png index d63efe2..c5e02e7 100644 Binary files a/web/djy.WebApi/logo.png and b/web/djy.WebApi/logo.png differ diff --git a/web/djy.WebApi/msyh.ttc b/web/djy.WebApi/msyh.ttc new file mode 100644 index 0000000..37c28de Binary files /dev/null and b/web/djy.WebApi/msyh.ttc differ diff --git a/web/djy_IsfApi/Controllers/ApiBase.cs b/web/djy_IsfApi/Controllers/ApiBase.cs index 369dcac..b0eeedb 100644 --- a/web/djy_IsfApi/Controllers/ApiBase.cs +++ b/web/djy_IsfApi/Controllers/ApiBase.cs @@ -67,7 +67,7 @@ namespace djy_Isfpi.Controllers { var _suser = IOC.AddServer(); if (UserGid == null) - { UserGid = GetLoginId; } + { UserGid = "d85fd590-d9f6-4410-93a1-f6fac77b606e".ToGuid(); } var rs = _suser.GetUserInfo(UserGid.ToString()); if (rs.Status) { diff --git a/web/djy_IsfApi/Controllers/ISF/IsfController.cs b/web/djy_IsfApi/Controllers/ISF/IsfController.cs index d02833b..1ef0f44 100644 --- a/web/djy_IsfApi/Controllers/ISF/IsfController.cs +++ b/web/djy_IsfApi/Controllers/ISF/IsfController.cs @@ -173,7 +173,15 @@ namespace djy_Isfpi.Controllers.ISF req.Message = result.Result.Message; return req; } + [AllowAnonymous] + [HttpPost("Receipt")] + public Response SaveReceipt([FromForm] string msg) + { + return ser.SaveReceipt(msg); + + + } #endregion } } diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 0a58eb2..161229f 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\DJY.AMS\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2022-06-29T08:34:08.2367476Z; + True|2022-06-30T07:28:48.8212173Z;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; \ No newline at end of file