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>
protected string GetLoginName { get { return GetClaimsValue("loginname"); } }
protected string GetLoginName { get { return GetClaimsValue("showname"); } }
/// <summary>
/// 获取登录公司名称
/// </summary>
protected string GetLoginComptName { get { return GetClaimsValue("COMNAME"); } }
protected string GetLoginComptName { get { return GetClaimsValue("comname"); } }
/// <summary>
/// 获取登录公司id
/// </summary>
protected string GetLoginCompId { get { return GetClaimsValue("CompayId"); } }
protected string GetLoginCompId { get { return GetClaimsValue("compayid"); } }
/// <summary>
/// 获取登录类型

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

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

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

@ -8,117 +8,123 @@ namespace djy.Model.IsfDto
public class Info
{
/// <summary>
/// 提单号
/// 提单类型CODE
/// </summary>
public string masterBillNo { get; set; }
public string blTypeCode { get; set; }
/// <summary>
/// 类型(1.ISF5 2.ISF10)
/// 交货地代码
/// </summary>
public string infoType { get; set; }
public string deliveryHarbourCode { get; set; }
/// <summary>
/// 卸货港代码
/// </summary>
public string dischargeHarbourCode { get; set; }
/// <summary>
/// 交货地代码
/// HSTCode多个用英文逗号隔开
/// </summary>
public string deliveryHarbourCode { get; set; }
public string hstCode { get; set; }
/// <summary>
/// 贸易类型代码
/// 类型(1.ISF5 2.ISF10)
/// </summary>
public string shipmentTypeCode { get; set; }
public string infoType { get; set; }
/// <summary>
/// HSTCode多个用英文逗号隔开
/// 提单号
/// </summary>
public string hstCode { get; set; }
public string masterBillNo { get; set; }
/// <summary>
/// 备注
/// </summary>
public string memo { get; set; }
/// <summary>
/// 提单类型CODE
/// </summary>
public string blTypeCode { get; set; }
/// <summary>
/// 业务id
/// </summary>
public string refId { get; set; }
/// <summary>
/// 贸易类型代码
/// </summary>
public string shipmentTypeCode { get; set; }
}
public class CompanyList
{
/// <summary>
/// 公司类型
/// 地址
/// </summary>
public string companyType { get; set; }
public string address { get; set; }
/// <summary>
/// 公司名称
/// 城市
/// </summary>
public string companyName { get; set; }
public string city { get; set; }
/// <summary>
/// 公司ID
/// </summary>
public string companyId { get; set; }
/// <summary>
/// id类型代码
/// 公司名称
/// </summary>
public string idTypeCode { get; set; }
public string companyName { get; set; }
/// <summary>
/// 地址
/// 公司类型
/// </summary>
public string address { get; set; }
public string companyType { get; set; }
/// <summary>
/// 城市
/// 国家代码
/// </summary>
public string city { get; set; }
public string countryCode { get; set; }
/// <summary>
/// 省份
/// HSTCode多个用英文逗号隔开
/// </summary>
public string province { get; set; }
public string hstCode { get; set; }
/// <summary>
/// 省份代码
/// id类型代码
/// </summary>
public string provinceCode { get; set; }
public string idTypeCode { get; set; }
/// <summary>
/// 国家代码
/// 进出口类型(1.进口2.出口)
/// </summary>
public string countryCode { get; set; }
public string ieType { get; set; }
/// <summary>
/// 邮编
/// </summary>
public string postcode { get; set; }
/// <summary>
/// HSTCode多个用英文逗号隔开
/// 省份
/// </summary>
public string hstCode { get; set; }
public string province { get; set; }
/// <summary>
/// 进出口类型(1.进口2.出口)
/// 省份代码
/// </summary>
public string ieType { get; set; }
public string provinceCode { get; set; }
}
public class IsfInfo
{
public List<CompanyList> companyList { get; set; }
public string format { get; set; }
public Info info { get; set; }
public List<CompanyList> companyList { get; set; }
/// <summary>
/// 类型1.原始2.修改3.删除4.重发
/// </summary>
public int msgType { get; set; }
/// <summary>
/// 用户id
/// </summary>
public string user_id { get; set; }
/// <summary>
/// 服务名称，值为：eportyun.manifest.isf.sendBill
/// </summary>
public string method { get; set; }
/// <summary>
/// json
/// 类型1.原始2.修改3.删除4.重发
/// </summary>
public string format { get; set; }
public int msgType { get; set; }
/// <summary>
/// 加密
/// </summary>
@ -128,6 +134,10 @@ namespace djy.Model.IsfDto
/// </summary>
public DateTime timestamp { get; set; }
/// <summary>
/// 用户id
/// </summary>
public string user_id { get; set; }
/// <summary>
/// 2.0
/// </summary>
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.Isf;
using djy.Model.IsfDto;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@ -243,28 +244,28 @@ namespace djy.Service.ISF
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 = 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;
// }
//}
var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList();
var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList();
Info info = new Info();
@ -296,7 +297,17 @@ namespace djy.Service.ISF
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