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

AMSISF 修改

Browse Source
master
wet 2 years ago
parent 3bc7be7e1d
commit 13c9bfaad8
12 changed files with 200 additions and 179 deletions
Show Stats Download Patch File Download Diff File

2
web/djy.IService/Report/IReportService.cs
Unescape Escape View File

@ -29,6 +29,6 @@ namespace djy.IService.Report
string SaveInfo(DS_Report dto, User user); string SaveInfo(DS_Report dto, User user);
string IsBook(string Gid, string TemplateId, bool isBook, string DJson, User user); Response IsBook(string Gid, string TemplateId, bool isBook, string DJson, User user);
} }
} }

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

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dapper;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using Common; using Common;
@ -34,9 +33,7 @@ namespace djy.Service.Ams
/// </summary> /// </summary>
public class AmsService : ServBase, IAmsService public class AmsService : ServBase, IAmsService
{ {
#region 查询列表 #region 查询列表
public TableData Load(AMSQuery req, User user, UserAuthorityDto aut) public TableData Load(AMSQuery req, User user, UserAuthorityDto aut)
{ {
var result = new TableData(); var result = new TableData();
@ -125,8 +122,8 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = oid; history.AM_ID = oid;
history.SendTime = DateTime.Now;///此处为删除时间 history.SendTime = DateTime.Now;///此处为删除时间
history.State = "已删除"; history.State = "删除";
history.Type = "删除"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -202,8 +199,8 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = house.GID; history.AM_ID = house.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "已新增"; history.State = "新增";
history.Type = "新增"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -271,8 +268,8 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = house.GID; history.AM_ID = house.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "已新增"; history.State = "新增";
history.Type = "新增"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -346,15 +343,15 @@ namespace djy.Service.Ams
} }
} }
AMS_MasterHistory history = new AMS_MasterHistory(); //AMS_MasterHistory history = new AMS_MasterHistory();
history.GID = Guid.NewGuid().ToString("N"); //history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = item.GID; //history.AM_ID = item.GID;
history.SendTime = DateTime.Now; //history.SendTime = DateTime.Now;
history.State = "已修改"; //history.State = "修改";
history.Type = "修改"; //history.Type = "0";
history.Operator = user.SHOWNAME; //history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; //history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); //DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
} }
else else
{ {
@ -384,8 +381,8 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = house.GID; history.AM_ID = house.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "已新增"; history.State = "新增";
history.Type = "新增"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -438,8 +435,7 @@ namespace djy.Service.Ams
if (docType == "AMSDOC") if (docType == "AMSDOC")
{ {
hodto = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && x.PID == oid && x.State == "0"). hodto = DbBus.Get(DbList.AMSCenter).Select<AMS_House>().Where(x => x.IsDel != true && x.PID == oid && x.State == "0").ToList<AMS_HouseDto>();
ToList<AMS_HouseDto>();
#region docContent 新增 #region docContent 新增
var cARRIERIDList = DbBus.Get(DbList.Common).Select<MappingCarrier>().Where(map => map.Module == "AMS").ToList(); var cARRIERIDList = DbBus.Get(DbList.Common).Select<MappingCarrier>().Where(map => map.Module == "AMS").ToList();
@ -477,7 +473,6 @@ namespace djy.Service.Ams
List<HouseBillInfoListItem> houseBillInfoListItems = new List<HouseBillInfoListItem>(); List<HouseBillInfoListItem> houseBillInfoListItems = new List<HouseBillInfoListItem>();
foreach (var item in hodto) foreach (var item in hodto)
{ {
var getfinrs = fin.Expend(new CustFee var getfinrs = fin.Expend(new CustFee
{ {
ETD = master.ETD, ETD = master.ETD,
@ -617,12 +612,18 @@ namespace djy.Service.Ams
List<HouseBillInfoListItem> houseBillInfoListItems = new List<HouseBillInfoListItem>(); List<HouseBillInfoListItem> houseBillInfoListItems = new List<HouseBillInfoListItem>();
foreach (var item in hodto) foreach (var item in hodto)
{ {
if (docType == "AMSAR" && !(item.ReportState == "删单成功" || item.MateState == "接收失败")) if (docType == "AMSAR" && (item.NewNotice == "删除发送成功" || item.MateState == "匹配失败"))
{ {
req.Code = 201; req.Code = 201;
req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！";
return req; return req;
} }
if (docType == "AMSDOC"&&(item.NewNotice== "新增发送成功"))
{
req.Code = 201;
req.Message = "当前单据已经发送，不能再次发送！如有疑问，请联系相关客服！";
return req;
}
if (docType == "AMSAR") if (docType == "AMSAR")
@ -774,7 +775,7 @@ namespace djy.Service.Ams
return req; return req;
} }
if (item.ReportState == "删单成功") if (item.NewNotice == "删除发送成功")
{ {
req.Code = 201; req.Code = 201;
req.Message = "已删除单据不可以再次删除"; req.Message = "已删除单据不可以再次删除";
@ -851,26 +852,26 @@ namespace djy.Service.Ams
if (docType == "AMSDOC") if (docType == "AMSDOC")
{ {
history.State = "新增发送失败"; history.State = "新增发送失败";
history.Type = "接收失败"; history.Type = "0";
} }
else if (docType == "AMSAR") else if (docType == "AMSAR")
{ {
history.State = "重发失败"; history.State = "重发失败";
history.Type = "接收失败"; history.Type = "0";
} }
else if (docType == "AMSM") else if (docType == "AMSM")
{ {
history.State = "修改发送失败"; history.State = "修改发送失败";
history.Type = "修改失败"; history.Type = "0";
} }
else else
{ {
history.State = "删除发送失败"; history.State = "删除发送失败";
history.Type = "删单失败"; history.Type = "0";
} }
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg + errorInfo;
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
} }
@ -884,25 +885,26 @@ namespace djy.Service.Ams
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.AM_ID = oid; history.AM_ID = oid;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.Type = "0";
if (docType == "AMSDOC") if (docType == "AMSDOC")
{ {
history.State = "新增发送成功"; history.State = "新增发送成功";
history.Type = "接收成功";
} }
else if (docType == "AMSAR") else if (docType == "AMSAR")
{ {
history.State = "重发成功"; history.State = "重发成功";
history.Type = "接收成功";
} }
else if (docType == "AMSM") else if (docType == "AMSM")
{ {
history.State = "修改发送成功"; history.State = "修改发送成功";
history.Type = "修改成功";
} }
else else
{ {
history.State = "删除发送成功"; history.State = "删除发送成功";
history.Type = "删单成功";
} }
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据";
@ -1050,33 +1052,33 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "海关接收成功"; history.State = "海关接收成功";
history.Type = "匹配成功"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关接收成功"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关接收成功";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else if (house.NewNotice == "修改发送成功") else if (house.NewNotice == "修改发送成功")
{ {
if (house.MateState.Contains("3Z")) if (house.MateState.Contains("3Z"))
{ {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "海关接收成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = house.MateState + "," + retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
else 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 = house.MateState + "," + retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
@ -1094,32 +1096,32 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "船司匹配成功"; history.State = "船司匹配成功";
history.Type = "匹配成功"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "船司匹配成功"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "船司匹配成功";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else if (house.NewNotice == "修改发送成功") else if (house.NewNotice == "修改发送成功")
{ {
if (house.MateState.Contains("3Z")) if (house.MateState.Contains("3Z"))
{ {
DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "船司匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
else 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 = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
@ -1136,18 +1138,18 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "ISF匹配成功"; history.State = "ISF匹配成功";
history.Type = "匹配成功"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF匹配成功"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF匹配成功";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (house.NewNotice == "删除发送成功") if (house.NewNotice == "删除发送成功")
{ {
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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
@ -1160,7 +1162,7 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "海关拒绝"; history.State = "海关拒绝";
history.Type = "匹配失败"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -1168,24 +1170,24 @@ namespace djy.Service.Ams
if (house.NewNotice == "删除发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "修改发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") 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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
@ -1196,7 +1198,7 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "箱货信息不匹配"; history.State = "箱货信息不匹配";
history.Type = "匹配失败"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "箱货信息不匹配"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "箱货信息不匹配";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -1204,24 +1206,24 @@ namespace djy.Service.Ams
if (house.NewNotice == "删除发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "修改发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") 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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
@ -1232,7 +1234,7 @@ namespace djy.Service.Ams
history.AM_ID = retdto.businessId; history.AM_ID = retdto.businessId;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "匹配失败"; history.State = "匹配失败";
history.Type = "匹配失败"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "匹配失败"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "匹配失败";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -1240,24 +1242,24 @@ namespace djy.Service.Ams
if (house.NewNotice == "删除发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "修改发送成功") if (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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else else
if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") 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(); DbBus.Get(DbList.AMSCenter).Update<AMS_House>().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
else 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 = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows();
} }
} }
@ -1689,7 +1691,6 @@ namespace djy.Service.Ams
} }
#endregion #endregion
#region 获取模板 #region 获取模板

6
web/djy.Service/DjyService/DjyUserService.cs
Unescape Escape View File

@ -80,7 +80,6 @@ namespace djy.Service.DjyService
if (list == null || list.Count == 0) if (list == null || list.Count == 0)
{ {
var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("SELECT * FROM ( ");
strSql.Append("SELECT GID,USERID,VISIBLERANGE,OPERATERANGE,AUTHORITYID,DESCRIPTION,NAME as KeyName,ISNULL((case VISIBLERANGE when 0 then '全部' when 1 then '本公司' "); strSql.Append("SELECT GID,USERID,VISIBLERANGE,OPERATERANGE,AUTHORITYID,DESCRIPTION,NAME as KeyName,ISNULL((case VISIBLERANGE when 0 then '全部' when 1 then '本公司' ");
strSql.Append("when 2 then '本部门' when 3 then '本人' when 4 then '无' when 5 then '选择公司' "); strSql.Append("when 2 then '本部门' when 3 then '本人' when 4 then '无' when 5 then '选择公司' ");
strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') VISIBLERANGEREF,ISNULL((case OPERATERANGE when 0 then '全部' when 1 then '本公司' "); strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') VISIBLERANGEREF,ISNULL((case OPERATERANGE when 0 then '全部' when 1 then '本公司' ");
@ -88,11 +87,6 @@ namespace djy.Service.DjyService
strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') OPERATERANGEREF "); strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') OPERATERANGEREF ");
strSql.Append(" from VW_User_Authority "); strSql.Append(" from VW_User_Authority ");
strSql.Append(" where USERID='" + userid + "'"); strSql.Append(" where USERID='" + userid + "'");
strSql.Append(" UNION SELECT '' GID,'" + userid + "' USERID, 4 VISIBLERANGE,4 OPERATERANGE,GID AUTHORITYID,DESCRIPTION,NAME, ");
strSql.Append(" '无' VISIBLERANGEREF,'无' OPERATERANGEREF ");
strSql.Append(" from user_authority_info ");
strSql.Append(" where GID NOT IN (SELECT AUTHORITYID FROM user_authority_range WHERE USERID='" + userid + "')");
strSql.Append(" ) AS DL ");
list = DbBus.Get(DbList.djyolddb).Ado.Query<DJyUserAuthorityDto>(strSql.ToString()); list = DbBus.Get(DbList.djyolddb).Ado.Query<DJyUserAuthorityDto>(strSql.ToString());

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

@ -27,7 +27,6 @@ namespace djy.Service.Isf
string[] ReportStates = null; string[] ReportStates = null;
if (req.ReportState != null) if (req.ReportState != null)
{ {
ReportStates = req.ReportState.Split(','); ReportStates = req.ReportState.Split(',');
} }
var dto = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>(). var dto = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().
@ -37,11 +36,11 @@ namespace djy.Service.Isf
WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO)). WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO)).
WhereIf(req.InFoType != null, x => x.InFoType == req.InFoType). 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 != 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 == "0", x => x.ReportState == "未申报").
WhereIf(req.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败")). WhereIf(req.ReportState == "1", x => x.ReportState != "未申报").
WhereIf(req.UserName != null, x => x.UserName.Contains(req.UserName.Trim())). WhereIf(req.UserName != null, x => x.UserName.Contains(req.UserName.Trim())).
WhereIf(req.BDate != null, x => x.CreateTime >= req.BDate). WhereIf(req.BDate != null, x => x.CreateTime >= req.BDate).
WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime); ; WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime);
result.count = dto.ToList().Count(); result.count = dto.ToList().Count();
var list = dto.Page(req.Page, req.Limit).ToList<ISFDto>(); var list = dto.Page(req.Page, req.Limit).ToList<ISFDto>();
if (list != null) if (list != null)
@ -61,6 +60,7 @@ namespace djy.Service.Isf
#region 新增编辑 #region 新增编辑
public string SaveInfo(ISFDto dto, User user) public string SaveInfo(ISFDto dto, User user)
{ {
string guid = ""; string guid = "";
@ -84,13 +84,14 @@ namespace djy.Service.Isf
master.CompName = user.COMNAME; master.CompName = user.COMNAME;
master.IsDel = false; master.IsDel = false;
master.ReportState = "未申报"; master.ReportState = "未申报";
master.NewNotice = "新增";
DbBus.Get(DbList.AMSCenter).Insert(master).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(master).ExecuteAffrows();
ISF_MasterHistory history = new ISF_MasterHistory(); ISF_MasterHistory history = new ISF_MasterHistory();
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = master.GID; history.ISF_ID = master.GID;
history.SendTime = DateTime.Now;/// history.SendTime = DateTime.Now;///
history.State = "已新增"; history.State = "新增";
history.Type = "新增"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -129,18 +130,19 @@ namespace djy.Service.Isf
master.HstCode = dto.HstCode; master.HstCode = dto.HstCode;
master.BlTypeCode = dto.BlTypeCode; master.BlTypeCode = dto.BlTypeCode;
master.BlTypeName = dto.BlTypeName; master.BlTypeName = dto.BlTypeName;
master.NewNotice = "修改";
master.LastUpdate = DateTime.Now; master.LastUpdate = DateTime.Now;
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().SetSource(master).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().SetSource(master).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Delete<ISF_Company>().Where(w => w.PID == master.GID).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Delete<ISF_Company>().Where(w => w.PID == master.GID).ExecuteAffrows();
ISF_MasterHistory history = new ISF_MasterHistory(); //ISF_MasterHistory history = new ISF_MasterHistory();
history.GID = Guid.NewGuid().ToString("N"); //history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = master.GID; //history.ISF_ID = master.GID;
history.SendTime = DateTime.Now; //history.SendTime = DateTime.Now;
history.State = "已修改"; //history.State = "修改";
history.Type = "修改"; //history.Type = "0";
history.Operator = user.SHOWNAME; //history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; //history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); //DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (dto.companyList != null && dto.companyList.Count() > 0) if (dto.companyList != null && dto.companyList.Count() > 0)
{ {
foreach (var item in dto.companyList) foreach (var item in dto.companyList)
@ -172,15 +174,14 @@ namespace djy.Service.Isf
{ {
if (oid != "") if (oid != "")
{ {
DbBus.Get(DbList.AMSCenter).Transaction(() => DbBus.Get(DbList.AMSCenter).Transaction(() =>
{ {
ISF_MasterHistory history = new ISF_MasterHistory(); ISF_MasterHistory history = new ISF_MasterHistory();
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid; history.ISF_ID = oid;
history.SendTime = DateTime.Now;///此处为删除时间 history.SendTime = DateTime.Now;///此处为删除时间
history.State = "已删除"; history.State = "删除";
history.Type = "删除"; history.Type = "0";
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
@ -248,10 +249,10 @@ namespace djy.Service.Isf
ISF_CompanyTemplate template = dto.MapTo<ISF_CompanyTemplate>(); ISF_CompanyTemplate template = dto.MapTo<ISF_CompanyTemplate>();
var i= DbBus.Get(DbList.AMSCenter).Update<ISF_CompanyTemplate>().SetSource(template).ExecuteAffrows(); var i = DbBus.Get(DbList.AMSCenter).Update<ISF_CompanyTemplate>().SetSource(template).ExecuteAffrows();
return i.ToString(); return i.ToString();
} }
} }
#endregion #endregion
@ -295,7 +296,7 @@ namespace djy.Service.Isf
var fin = new FinanceService(); var fin = new FinanceService();
var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne(); var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne();
var comlist = DbBus.Get(DbList.AMSCenter).Select<ISF_Company>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); var comlist = DbBus.Get(DbList.AMSCenter).Select<ISF_Company>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList();
if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败")) if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02"))
{ {
req.Code = 200; req.Code = 200;
req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！";
@ -303,15 +304,20 @@ namespace djy.Service.Isf
} }
if (master.ReportState == "删单成功" && msgType == "3") if (master.ReportState == "删单成功" && msgType == "3")
{ {
req.Code = 201; req.Code = 201;
req.Message = "已删除单据不可以再次删除"; req.Message = "已删除单据不可以再次删除";
return req; return req;
} }
var gethtml = ""; var gethtml = "";
if (msgType != "3") if (msgType != "3")
{ {
if (msgType == "1" && master.NewNotice == "新增发送")
{
req.Code = 200;
req.Message = "当前单据已经发送，不能再次发送！如有疑问，请联系相关客服！";
return req;
}
if (msgType == "1" || msgType == "4") if (msgType == "1" || msgType == "4")
{ {
@ -437,29 +443,30 @@ namespace djy.Service.Isf
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid; history.ISF_ID = oid;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.Type = "0";
if (msgType == "1") if (msgType == "1")
{ {
history.State = "新增发送失败"; history.State = "新增发送失败";
history.Type = "接收失败";
} }
else if (msgType == "4") else if (msgType == "4")
{ {
history.State = "重发失败"; history.State = "重发失败";
history.Type = "接收失败";
} }
else if (msgType == "2") else if (msgType == "2")
{ {
history.State = "修改发送失败"; history.State = "修改发送失败";
history.Type = "修改失败";
} }
else else
{ {
history.State = "删除发送失败"; history.State = "删除发送失败";
history.Type = "删单失败";
} }
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg+ " ";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
req.Code = 201; req.Code = 201;
req.Message = "操作失败," + msg; req.Message = "操作失败," + msg;
@ -478,59 +485,60 @@ namespace djy.Service.Isf
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid; history.ISF_ID = oid;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.Type = "0";
if (msgType == "1") if (msgType == "1")
{ {
history.State = "新增发送失败"; history.State = "新增发送失败";
history.Type = "接收失败";
} }
else if (msgType == "4") else if (msgType == "4")
{ {
history.State = "重发失败"; history.State = "重发失败";
history.Type = "接收失败";
} }
else if (msgType == "2") else if (msgType == "2")
{ {
history.State = "修改发送失败"; history.State = "修改发送失败";
history.Type = "修改失败";
} }
else else
{ {
history.State = "删除发送失败"; history.State = "删除发送失败";
history.Type = "删单失败";
} }
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + errorInfo + " ";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
req.Code = 201; req.Code = 201;
req.Message = "操作失败," + msg + errorInfo; req.Message = "操作失败," + msg + errorInfo;
return req; return req;
} }
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = oid; history.ISF_ID = oid;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.Type = "0";
if (msgType == "1") if (msgType == "1")
{ {
history.State = "新增发送成功"; history.State = "新增发送成功";
history.Type = "接收成功";
} }
else if (msgType == "4") else if (msgType == "4")
{ {
history.State = "重发成功"; history.State = "重发成功";
history.Type = "接收成功";
} }
else if (msgType == "2") else if (msgType == "2")
{ {
history.State = "修改发送成功"; history.State = "修改发送成功";
history.Type = "修改成功";
} }
else else
{ {
history.State = "删除发送成功"; history.State = "删除发送成功";
history.Type = "删单成功";
} }
history.Operator = user.SHOWNAME; history.Operator = user.SHOWNAME;
history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据";
@ -551,7 +559,7 @@ namespace djy.Service.Isf
MBLNO = master.MBLNO.ToString(), MBLNO = master.MBLNO.ToString(),
} }
, 1); , 1);
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "新增发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "新增发送" }).Where(w => w.GID == oid).ExecuteAffrows();
} }
else if (msgType == "4") else if (msgType == "4")
{ {
@ -567,17 +575,16 @@ namespace djy.Service.Isf
MBLNO = master.MBLNO.ToString(), MBLNO = master.MBLNO.ToString(),
} }
, 1); , 1);
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "重发发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "重发发送" }).Where(w => w.GID == oid).ExecuteAffrows();
} }
else if (msgType == "2") else if (msgType == "2")
{ {
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "修改发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "修改发送" }).Where(w => w.GID == oid).ExecuteAffrows();
} }
else else
{ {
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "删除发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "删除发送" }).Where(w => w.GID == oid).ExecuteAffrows();
} }
} }
} }
@ -600,15 +607,12 @@ namespace djy.Service.Isf
{ {
_LogsAdd("ISFReceipt", "post", $"ISF接口推送{msg}"); _LogsAdd("ISFReceipt", "post", $"ISF接口推送{msg}");
Response req = new Response(); Response req = new Response();
try try
{ {
if (msg != null) if (msg != null)
{ {
ISFReceipt retdto = Json.JsonToObject<ISFReceipt>(msg); ISFReceipt retdto = Json.JsonToObject<ISFReceipt>(msg);
var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => x.GID == retdto.businessId).ToOne(); var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => x.GID == retdto.businessId).ToOne();
if (retdto.status == "S1") if (retdto.status == "S1")
{ {
ISF_MasterHistory history = new ISF_MasterHistory(); ISF_MasterHistory history = new ISF_MasterHistory();
@ -616,16 +620,13 @@ namespace djy.Service.Isf
history.ISF_ID = master.GID; history.ISF_ID = master.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "ISF和AMS匹配"; history.State = "ISF和AMS匹配";
history.Type = "ISF和AMS匹配"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的明细单据" + retdto.businessId + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF和AMS匹配"; history.Remark = "您的明细单据" + retdto.businessId + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF和AMS匹配";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
if (master.NewNotice == "重发发送" || master.NewNotice == "新增发送")
if (master.NewNotice == "重发发送成功" || master.NewNotice == "新增发送成功")
{ {
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "ISF和AMS匹配", ReportState = "匹配成功" }).Where(w => w.GID == master.GID).ExecuteAffrows();
} }
} }
else if (retdto.status == "02") else if (retdto.status == "02")
@ -634,12 +635,20 @@ namespace djy.Service.Isf
history.GID = Guid.NewGuid().ToString("N"); history.GID = Guid.NewGuid().ToString("N");
history.ISF_ID = master.GID; history.ISF_ID = master.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "接收成功"; history.State = "海关已接受";
history.Type = "接收成功"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关已接受"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关已接受";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "海关已接受", ReportState = "接收成功" }).Where(w => w.GID == master.GID).ExecuteAffrows();
if (retdto.content.IndexOf("DELETED") != -1)
{
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = "海关删除" }).Where(w => w.GID == master.GID).ExecuteAffrows();
}
else
{
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows();
}
} }
else if (retdto.status == "01") else if (retdto.status == "01")
{ {
@ -648,11 +657,11 @@ namespace djy.Service.Isf
history.ISF_ID = master.GID; history.ISF_ID = master.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "海关拒绝"; history.State = "海关拒绝";
history.Type = "海关拒绝"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "海关已拒绝", ReportState = "海关拒绝" }).Where(w => w.GID == master.GID).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status }).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") else if (retdto.status == "SB" || retdto.status == "S2" || retdto.status == "S3" || retdto.status == "S4" || retdto.status == "S5" || retdto.status == "S6")
{ {
@ -661,20 +670,18 @@ namespace djy.Service.Isf
history.ISF_ID = master.GID; history.ISF_ID = master.GID;
history.SendTime = DateTime.Now; history.SendTime = DateTime.Now;
history.State = "未匹配AMS"; history.State = "未匹配AMS";
history.Type = "未匹配AMS"; history.Type = "1";
history.Operator = "系统管理员"; history.Operator = "系统管理员";
history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "未匹配AMS"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "未匹配AMS";
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "未匹配AMS", ReportState = "匹配失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Update<ISF_Master>().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows();
} }
} }
else else
{ {
req.Code = 200; req.Code = 200;
req.Message = "未收到参数"; req.Message = "未收到参数";
return req; return req;
} }
} }
@ -692,8 +699,6 @@ namespace djy.Service.Isf
} }
#endregion #endregion
} }
} }

74
web/djy.Service/Report/ReportService.cs
Unescape Escape View File

@ -37,31 +37,32 @@ namespace djy.Service.Report
var result = new TableData(); var result = new TableData();
var templist = DbBus.Get(DbList.DSDB).Select<DS_ReportTemplate>().ToList(); var templist = DbBus.Get(DbList.DSDB).Select<DS_ReportTemplate>().ToList();
if (user.CompId != null) {
List<ReportDto> query = DbBus.Get(DbList.DSDB).Select<DS_ReportTemplate, DS_Report>().LeftJoin((temp, main) => main.TemplateID == temp.GID). List<ReportDto> query = DbBus.Get(DbList.DSDB).Select<DS_ReportTemplate, DS_Report>().LeftJoin((temp, main) => main.TemplateID == temp.GID).
WhereIf(user.CompId != null, x => x.t2.CompID == user.CompId).ToList((temp, main) => new ReportDto Where(x => x.t2.CompID == user.CompId).ToList((temp, main) => new ReportDto
{ {
GID = main.GID, GID = main.GID,
UserID = main.UserID, UserID = main.UserID,
UserName = main.UserName, UserName = main.UserName,
CompID = main.CompID, CompID = main.CompID,
CompName = main.CompName, CompName = main.CompName,
TemplateID = main.TemplateID, TemplateID = main.TemplateID,
TemplateName = temp.TemplateName, TemplateName = temp.TemplateName,
TemplateDescribe = temp.TemplateDescribe, TemplateDescribe = temp.TemplateDescribe,
IsBook = main.IsBook, IsBook = main.IsBook,
IsWechat = main.IsWechat, IsWechat = main.IsWechat,
IsEmail = main.IsEmail, IsEmail = main.IsEmail,
DJson = main.DJson, DJson = main.DJson,
EndTime = main.EndTime, EndTime = main.EndTime,
CreateTime = main.CreateTime, CreateTime = main.CreateTime,
TemplateType=temp.TemplateType TemplateType = temp.TemplateType
}).ToList(); }).ToList();
foreach (var item in templist) foreach (var item in templist)
{ {
var it = query.Where(x => x.TemplateID == item.GID).FirstOrDefault(); var it = query.Where(x => x.TemplateID == item.GID).FirstOrDefault();
if (it==null) { if (it == null)
{
query.Add(new ReportDto query.Add(new ReportDto
{ {
GID = null, GID = null,
@ -83,8 +84,10 @@ namespace djy.Service.Report
} }
} }
result.data = query; result.data = query;
result.count = (int)query.Count(); result.count = (int)query.Count();
}
return result; return result;
} }
#endregion #endregion
@ -134,7 +137,8 @@ namespace djy.Service.Report
#region 取消订阅/订阅 #region 取消订阅/订阅
public string IsBook(string Gid,string TemplateId, bool isbook,string DJson, User user) { public Response IsBook(string Gid,string TemplateId, bool isbook,string DJson, User user) {
var result = new Response();
if (isbook) { if (isbook) {
if (Gid.IsNull()) if (Gid.IsNull())
{ {
@ -153,8 +157,9 @@ namespace djy.Service.Report
} }
if (DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID==Gid).ToOne().IsBook==true) { if (DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID==Gid).ToOne().IsBook==true) {
result.Code = 201;
return "该模板已经订阅过了"; result.Message = "该模板已经订阅过了";
return result;
} }
var endtime = DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID == Gid).ToOne().EndTime; var endtime = DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID == Gid).ToOne().EndTime;
if (endtime != null&& endtime>DateTime.Now) { if (endtime != null&& endtime>DateTime.Now) {
@ -167,7 +172,10 @@ namespace djy.Service.Report
LastUpdate = DateTime.Now, LastUpdate = DateTime.Now,
LastUserId = user.GID LastUserId = user.GID
}).Where(w => w.GID == Gid).ExecuteAffrows(); }).Where(w => w.GID == Gid).ExecuteAffrows();
return "订阅成功！";
result.Code = 200;
result.Message = "订阅成功！";
return result;
} }
////订阅 ////订阅
var fin = new FinanceService(); var fin = new FinanceService();
@ -186,7 +194,10 @@ namespace djy.Service.Report
}, 0); }, 0);
if (!getfinrs.Status) if (!getfinrs.Status)
{ {
return getfinrs.Message; result.Code = 201;
result.Message = getfinrs.Message;
return result;
} }
DbBus.Get(DbList.DSDB).Update<DS_Report>().Set(w => new DS_Report DbBus.Get(DbList.DSDB).Update<DS_Report>().Set(w => new DS_Report
{ {
@ -208,7 +219,9 @@ namespace djy.Service.Report
SENDTYPE = templist.SendType, SENDTYPE = templist.SendType,
BSNO = Gid, BSNO = Gid,
}, 1); }, 1);
return "订阅成功！"; result.Code = 200;
result.Message = "订阅成功！";
return result;
} }
else { else {
DbBus.Get(DbList.DSDB).Update<DS_Report>().Set(w => new DS_Report DbBus.Get(DbList.DSDB).Update<DS_Report>().Set(w => new DS_Report
@ -217,8 +230,11 @@ namespace djy.Service.Report
LastUpdate = DateTime.Now, LastUpdate = DateTime.Now,
LastUserId = user.GID LastUserId = user.GID
}).Where(w => w.GID == Gid).ExecuteAffrows(); }).Where(w => w.GID == Gid).ExecuteAffrows();
return "取消成功！"; result.Code = 200;
result.Message = "取消成功！";
return result;
} }
return result;
} }
#endregion #endregion

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

@ -131,9 +131,8 @@ namespace djy_AmsApi.Controllers
case 4://无权限或或默认权限 case 4://无权限或或默认权限
//_uerid = notguid; //_uerid = notguid;
//_companyid = notguid; //_companyid = notguid;
RetrunData.UserId = notguid; RetrunData.UserId = null;
RetrunData.CompayId = notguid; RetrunData.CompayId = null;
RetrunData.IsPower = false;
break; break;
case 7://注册公司 case 7://注册公司
@ -149,9 +148,9 @@ namespace djy_AmsApi.Controllers
} }
else else
{ {
RetrunData.UserId = notguid; RetrunData.UserId = GetLoginId;
RetrunData.CompayId = notguid; RetrunData.CompayId = null;
RetrunData.IsPower = false; RetrunData.IsPower = true;
} }
//if (sysOptionConfig.Webconfig.IsDev) //if (sysOptionConfig.Webconfig.IsDev)

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

File diff suppressed because one or more lines are too long

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

@ -222,6 +222,16 @@ namespace djy_Isfpi.Controllers.ISF
} }
[AllowAnonymous]
[HttpGet("GetTime")]
public string GetTime() {
return DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
#endregion #endregion
} }
} }

2
web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-08-25T05:52:10.9522475Z;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;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;</History> <History>True|2022-09-29T06:06:18.1120086Z;True|2022-08-25T13:52:10.9522475+08:00;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;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;</History>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -6,6 +6,6 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-08-23T06:37:55.9777827Z;True|2022-08-22T15:49:27.7983465+08:00;</History> <History>True|2022-09-29T01:19:00.7683602Z;True|2022-09-29T09:13:52.5346287+08:00;True|2022-09-28T17:20:00.5132329+08:00;True|2022-09-28T17:12:55.5194328+08:00;True|2022-09-28T17:08:40.9334943+08:00;True|2022-09-28T17:05:05.8696515+08:00;True|2022-09-28T16:31:42.3084773+08:00;True|2022-09-28T09:20:15.3600913+08:00;True|2022-08-31T11:05:06.8122818+08:00;True|2022-08-23T14:37:55.9777827+08:00;True|2022-08-22T15:49:27.7983465+08:00;</History>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

10
web/djy_Report/Controllers/Report/ReportController.cs
Unescape Escape View File

@ -92,13 +92,9 @@ namespace djy_Report.Controllers.Report
result.Message = "未订阅数据不能取消订阅"; result.Message = "未订阅数据不能取消订阅";
return result; return result;
} }
result.data = ser.IsBook(Gid, TemplateId,isBook, DJson,user); return ser.IsBook(Gid, TemplateId,isBook, DJson,user);
if(result.data == "没有找到此业务的计费规则！")
{
result.Code = 201;
result.Message = "没有找到此业务的计费规则！";
}
return result;
} }
#endregion #endregion

2
web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\bin\Release\net5.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\bin\Release\net5.0\publish\</_PublishTargetUrl>
<History>True|2022-08-16T07:07:48.5795668Z;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History> <History>True|2022-09-26T02:36:28.6725563Z;True|2022-09-26T10:19:28.4063280+08:00;True|2022-09-26T10:15:50.6060906+08:00;True|2022-08-16T15:07:48.5795668+08:00;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
Write Preview
Loading…
Cancel
Save