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

ISF

Browse Source
master
wet 2 years ago
parent 81f7066c61
commit 753bcd5fad
4 changed files with 98 additions and 73 deletions
Show Stats Download Patch File Download Diff File

6
ams/Djy.Common/DjyService/ApiBase.cs
Unescape Escape View File

@ -175,18 +175,18 @@ namespace Common.DjyService
/// <summary> /// <summary>
/// 获取登录名称 /// 获取登录名称
/// </summary> /// </summary>
protected string GetLoginName { get { return GetClaimsValue("loginname"); } } protected string GetLoginName { get { return GetClaimsValue("showname"); } }
/// <summary> /// <summary>
/// 获取登录公司名称 /// 获取登录公司名称
/// </summary> /// </summary>
protected string GetLoginComptName { get { return GetClaimsValue("COMNAME"); } } protected string GetLoginComptName { get { return GetClaimsValue("comname"); } }
/// <summary> /// <summary>
/// 获取登录公司id /// 获取登录公司id
/// </summary> /// </summary>
protected string GetLoginCompId { get { return GetClaimsValue("CompayId"); } } protected string GetLoginCompId { get { return GetClaimsValue("compayid"); } }
/// <summary> /// <summary>
/// 获取登录类型 /// 获取登录类型

4
ams/Djy.Common/DjyService/ServBase.cs
Unescape Escape View File

@ -494,4 +494,8 @@ namespace Common.DjyService
} }
} }

104
ams/djy.Model/IsfDto/IsfInfo.cs
Unescape Escape View File

@ -8,117 +8,123 @@ namespace djy.Model.IsfDto
public class Info public class Info
{ {
/// <summary> /// <summary>
/// 提单号 /// 提单类型CODE
/// </summary> /// </summary>
public string masterBillNo { get; set; } public string blTypeCode { get; set; }
/// <summary> /// <summary>
/// 类型(1.ISF5 2.ISF10) /// 交货地代码
/// </summary> /// </summary>
public string infoType { get; set; } public string deliveryHarbourCode { get; set; }
/// <summary> /// <summary>
/// 卸货港代码 /// 卸货港代码
/// </summary> /// </summary>
public string dischargeHarbourCode { get; set; } public string dischargeHarbourCode { get; set; }
/// <summary> /// <summary>
/// 交货地代码 /// HSTCode多个用英文逗号隔开
/// </summary> /// </summary>
public string deliveryHarbourCode { get; set; } public string hstCode { get; set; }
/// <summary> /// <summary>
/// 贸易类型代码 /// 类型(1.ISF5 2.ISF10)
/// </summary> /// </summary>
public string shipmentTypeCode { get; set; } public string infoType { get; set; }
/// <summary> /// <summary>
/// HSTCode多个用英文逗号隔开 /// 提单号
/// </summary> /// </summary>
public string hstCode { get; set; } public string masterBillNo { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
public string memo { get; set; } public string memo { get; set; }
/// <summary> /// <summary>
/// 提单类型CODE
/// </summary>
public string blTypeCode { get; set; }
/// <summary>
/// 业务id /// 业务id
/// </summary> /// </summary>
public string refId { get; set; } public string refId { get; set; }
/// <summary>
/// 贸易类型代码
/// </summary>
public string shipmentTypeCode { get; set; }
} }
public class CompanyList public class CompanyList
{ {
/// <summary> /// <summary>
/// 公司类型 /// 地址
/// </summary> /// </summary>
public string companyType { get; set; } public string address { get; set; }
/// <summary> /// <summary>
/// 公司名称 /// 城市
/// </summary> /// </summary>
public string companyName { get; set; } public string city { get; set; }
/// <summary> /// <summary>
/// 公司ID /// 公司ID
/// </summary> /// </summary>
public string companyId { get; set; } public string companyId { get; set; }
/// <summary> /// <summary>
/// id类型代码 /// 公司名称
/// </summary> /// </summary>
public string idTypeCode { get; set; } public string companyName { get; set; }
/// <summary> /// <summary>
/// 地址 /// 公司类型
/// </summary> /// </summary>
public string address { get; set; } public string companyType { get; set; }
/// <summary> /// <summary>
/// 城市 /// 国家代码
/// </summary> /// </summary>
public string city { get; set; } public string countryCode { get; set; }
/// <summary> /// <summary>
/// 省份 /// HSTCode多个用英文逗号隔开
/// </summary> /// </summary>
public string province { get; set; } public string hstCode { get; set; }
/// <summary> /// <summary>
/// 省份代码 /// id类型代码
/// </summary> /// </summary>
public string provinceCode { get; set; } public string idTypeCode { get; set; }
/// <summary> /// <summary>
/// 国家代码 /// 进出口类型(1.进口2.出口)
/// </summary> /// </summary>
public string countryCode { get; set; } public string ieType { get; set; }
/// <summary> /// <summary>
/// 邮编 /// 邮编
/// </summary> /// </summary>
public string postcode { get; set; } public string postcode { get; set; }
/// <summary> /// <summary>
/// HSTCode多个用英文逗号隔开 /// 省份
/// </summary> /// </summary>
public string hstCode { get; set; } public string province { get; set; }
/// <summary> /// <summary>
/// 进出口类型(1.进口2.出口) /// 省份代码
/// </summary> /// </summary>
public string ieType { get; set; } public string provinceCode { get; set; }
} }
public class IsfInfo public class IsfInfo
{ {
public Info info { get; set; }
public List<CompanyList> companyList { get; set; } public List<CompanyList> companyList { get; set; }
/// <summary>
/// 类型1.原始2.修改3.删除4.重发 public string format { get; set; }
/// </summary>
public int msgType { get; set; } public Info info { get; set; }
/// <summary>
/// 用户id
/// </summary>
public string user_id { get; set; }
/// <summary> /// <summary>
/// 服务名称，值为：eportyun.manifest.isf.sendBill /// 服务名称，值为：eportyun.manifest.isf.sendBill
/// </summary> /// </summary>
public string method { get; set; } public string method { get; set; }
/// <summary> /// <summary>
/// json /// 类型1.原始2.修改3.删除4.重发
/// </summary> /// </summary>
public string format { get; set; } public int msgType { get; set; }
/// <summary> /// <summary>
/// 加密 /// 加密
/// </summary> /// </summary>
@ -128,6 +134,10 @@ namespace djy.Model.IsfDto
/// </summary> /// </summary>
public DateTime timestamp { get; set; } public DateTime timestamp { get; set; }
/// <summary> /// <summary>
/// 用户id
/// </summary>
public string user_id { get; set; }
/// <summary>
/// 2.0 /// 2.0
/// </summary> /// </summary>
public string version { get; set; } public string version { get; set; }

57
ams/djy.Service/ISF/IsfService.cs
Unescape Escape View File

@ -6,6 +6,7 @@ using djy.IService.Isf;
using djy.Model.Ams; using djy.Model.Ams;
using djy.Model.Isf; using djy.Model.Isf;
using djy.Model.IsfDto; using djy.Model.IsfDto;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -243,28 +244,28 @@ namespace djy.Service.ISF
req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！";
return req; return req;
} }
if (msgType == "1" || msgType == "4") //if (msgType == "1" || msgType == "4")
{ //{
///扣费接口 // ///扣费接口
var getfinrs = fin.Expend(new CustFee // var getfinrs = fin.Expend(new CustFee
{ // {
SENDUSERID = userid, // SENDUSERID = userid,
LURURENID = userid, // LURURENID = userid,
CtnrCount = 1, // CtnrCount = 1,
CtnrInfo = string.Empty, // CtnrInfo = string.Empty,
BSTYPE = 16, // BSTYPE = 16,
SENDTYPE = 0, // SENDTYPE = 0,
BSNO = oid.ToString(), // BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(), // MBLNO = master.MBLNO.ToString(),
} // }
, 0); // , 0);
if (!getfinrs.Status) // if (!getfinrs.Status)
{ // {
req.Code = 200; // req.Code = 200;
req.Message = getfinrs.Message; // req.Message = getfinrs.Message;
return req; // return req;
} // }
} //}
var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList(); var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList();
var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList(); var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList();
Info info = new Info(); Info info = new Info();
@ -296,7 +297,17 @@ namespace djy.Service.ISF
ieType=item.IeType ieType=item.IeType
}); });
} }
companyList.Sort();
IsfInfo isfinfo = new IsfInfo();
isfinfo.companyList = companyList;
isfinfo.format = "json";
isfinfo.info = info;
isfinfo.method = "1";
var str = JsonConvert.SerializeObject(isfinfo);
} }
} }
} }

Write Preview
Loading…
Cancel
Save