diff --git a/ams/djy.Model/Ams/AMS_Cntrno.cs b/ams/djy.Model/Ams/AMS_Cntrno.cs
new file mode 100644
index 0000000..7301c5b
--- /dev/null
+++ b/ams/djy.Model/Ams/AMS_Cntrno.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.Model.Ams
+{
+ public class AMS_Cntrno
+ {
+ ///
+ /// 主键
+ ///
+ public string GID { get; set; }
+
+ ///
+ /// 父键
+ ///
+ public string HID { get; set; }
+
+
+
+ ///
+ /// 箱号
+ ///
+ public string CNTRNO { get; set; }
+
+
+ ///
+ /// 封号
+ ///
+ public string SEALNO { get; set; }
+
+
+ ///
+ /// 箱型
+ ///
+ public string CTNALL { get; set; }
+
+ ///
+ /// HSCode
+ ///
+ public string HSCode { get; set; }
+
+
+ ///
+ /// 品名
+ ///
+ public string ProductName { get; set; }
+
+
+ ///
+ /// 唛头
+ ///
+ public string MARKS { get; set; }
+
+ ///
+ /// 件数
+ ///
+ public int? PKGS { get; set; }
+
+
+ ///
+ /// 包装单位
+ ///
+ public string KINDPKGS { get; set; }
+
+
+ ///
+ /// 毛重
+ ///
+ public decimal? KGS { get; set; }
+
+ ///
+ /// 体积
+ ///
+ public decimal? CBM { get; set; }
+
+
+ ///
+ /// 联合国危险品编号
+ ///
+ public string DUNNO { get; set; }
+
+
+ ///
+ /// 危险品联系人姓名
+ ///
+ public string LINKMAN { get; set; }
+
+
+
+ }
+}
diff --git a/ams/djy.Model/Ams/AMS_House.cs b/ams/djy.Model/Ams/AMS_House.cs
new file mode 100644
index 0000000..7246540
--- /dev/null
+++ b/ams/djy.Model/Ams/AMS_House.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.Model.Ams
+{
+ public class AMS_House
+ {
+ ///
+ /// 主键
+ ///
+ public string GID { get; set; }
+
+ ///
+ /// 父键
+ ///
+ public string PID { get; set; }
+
+ ///
+ /// 货代提单号
+ ///
+ public string HBLNo { get; set; }
+
+
+ ///
+ /// 发货人名称
+ ///
+ public string SHIPPERNAME { get; set; }
+
+
+ ///
+ /// 发货人地址
+ ///
+ public string SHIPPERADDR { get; set; }
+
+
+
+ ///
+ /// 发货人电话
+ ///
+ public string SHIPPERTEL { get; set; }
+
+
+
+
+ ///
+ /// 收货人名称
+ ///
+ public string CONSIGNEE { get; set; }
+
+
+ ///
+ ///收货人地址
+ ///
+ public string CONSIGNEEDADDR { get; set; }
+
+
+
+ ///
+ /// 收货人电话
+ ///
+ public string CONSIGNEETEL { get; set; }
+
+
+
+ ///
+ /// 通知人名称
+ ///
+ public string NOTIFYPARTYNAME { get; set; }
+
+
+ ///
+ ///通知人地址
+ ///
+ public string NOTIFYPARTYADDR { get; set; }
+
+
+
+ ///
+ /// 通知人电话
+ ///
+ public string NOTIFYPARTYTEL { get; set; }
+ }
+}
diff --git a/ams/djy.Model/Ams/AMS_Master.cs b/ams/djy.Model/Ams/AMS_Master.cs
new file mode 100644
index 0000000..d4bf998
--- /dev/null
+++ b/ams/djy.Model/Ams/AMS_Master.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.Model.Ams
+{
+ public class AMSMaster
+ {
+ ///
+ /// 主键
+ ///
+ public string GID { get; set; }
+
+ ///
+ /// 用户id
+ ///
+ public string UserID { get; set; }
+
+ ///
+ /// 用户
+ ///
+ public string UserName { get; set; }
+
+ ///
+ /// 公司id
+ ///
+ public string CompID { get; set; }
+
+ ///
+ /// 公司
+ ///
+ public string CompName { get; set; }
+
+
+ ///
+ /// 船公司id
+ ///
+ public string CARRIERID { get; set; }
+
+
+ ///
+ /// 船公司
+ ///
+ public string CARRIER { get; set; }
+
+
+
+ ///
+ /// 提单号
+ ///
+ public string MBLNO { get; set; }
+
+ ///
+ /// 船名
+ ///
+ public string VESSEL { get; set; }
+
+ ///
+ /// 航次
+ ///
+ public string VOYNO { get; set; }
+
+ ///
+ /// 运输方式
+ ///
+ public string ShippingType { get; set; }
+
+
+ ///
+ /// 发货地
+ ///
+ public string SHIPPERADDR { get; set; }
+
+
+ ///
+ /// 装货港
+ ///
+ public string LoadingPort { get; set; }
+
+ ///
+ /// 最后一个非美港
+ ///
+ public string LastNoUsPort { get; set; }
+
+
+ ///
+ /// 卸货港
+ ///
+ public string PORTDISCHARGE { get; set; }
+
+
+ ///
+ /// 预计出发
+ ///
+ public DateTime? ETA { get; set; }
+
+ ///
+ /// 预计到达
+ ///
+ public DateTime? ETD { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+ public DateTime? LastUpdate { get; set; }
+
+ }
+}
diff --git a/ams/djy.Model/Ams/AmsModel.cs b/ams/djy.Model/Ams/AmsModel.cs
deleted file mode 100644
index 20a5eee..0000000
--- a/ams/djy.Model/Ams/AmsModel.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace djy.Model.Ams
-{
- internal class AmsModel
- {
-
- public string GID { get; set; }
-
- ///
- /// 公司ID
- ///
- public string CompId { get; set; }
- }
-}
diff --git a/ams/djy.Model/AmsDto/AMSDto.cs b/ams/djy.Model/AmsDto/AMSDto.cs
new file mode 100644
index 0000000..5fed60e
--- /dev/null
+++ b/ams/djy.Model/AmsDto/AMSDto.cs
@@ -0,0 +1,164 @@
+using djy.Model.Ams;
+using System;
+using System.Collections.Generic;
+
+namespace djy.Model.Ams
+{
+ public class AMSDto
+ {
+ }
+
+ public class AMSSaveDto
+ {
+
+ ///
+ /// 主键
+ ///
+ public string GID { get; set; }
+ ///
+ /// 船公司id
+ ///
+ public string CARRIERID { get; set; }
+
+ ///
+ /// 船公司
+ ///
+ public string CARRIER { get; set; }
+
+ ///
+ /// 提单号
+ ///
+ public string MBLNO { get; set; }
+
+ ///
+ /// 船名
+ ///
+ public string VESSEL { get; set; }
+
+ ///
+ /// 航次
+ ///
+ public string VOYNO { get; set; }
+
+ ///
+ /// 运输方式
+ ///
+ public string ShippingType { get; set; }
+
+
+ ///
+ /// 发货地
+ ///
+ public string SHIPPERADDR { get; set; }
+
+
+ ///
+ /// 装货港
+ ///
+ public string LoadingPort { get; set; }
+
+ ///
+ /// 最后一个非美港
+ ///
+ public string LastNoUsPort { get; set; }
+
+ ///
+ /// 卸货港
+ ///
+ public string PORTDISCHARGE { get; set; }
+
+
+ ///
+ /// 预计出发
+ ///
+ public DateTime? ETA { get; set; }
+
+ ///
+ /// 预计到达
+ ///
+ public DateTime? ETD { get; set; }
+
+ public List HouseDto { get; set; }
+ }
+
+ public class AMS_HouseDto {
+
+ ///
+ /// 主键
+ ///
+ public string GID { get; set; }
+
+ ///
+ /// 父键
+ ///
+ public string PID { get; set; }
+
+ ///
+ /// 货代提单号
+ ///
+ public string HBLNo { get; set; }
+
+
+ ///
+ /// 发货人名称
+ ///
+ public string SHIPPERNAME { get; set; }
+
+
+ ///
+ /// 发货人地址
+ ///
+ public string SHIPPERADDR { get; set; }
+
+
+
+ ///
+ /// 发货人电话
+ ///
+ public string SHIPPERTEL { get; set; }
+
+
+
+
+ ///
+ /// 收货人名称
+ ///
+ public string CONSIGNEE { get; set; }
+
+
+ ///
+ ///收货人地址
+ ///
+ public string CONSIGNEEDADDR { get; set; }
+
+
+
+ ///
+ /// 收货人电话
+ ///
+ public string CONSIGNEETEL { get; set; }
+
+
+
+ ///
+ /// 通知人名称
+ ///
+ public string NOTIFYPARTYNAME { get; set; }
+
+
+ ///
+ ///通知人地址
+ ///
+ public string NOTIFYPARTYADDR { get; set; }
+
+
+
+ ///
+ /// 通知人电话
+ ///
+ public string NOTIFYPARTYTEL { get; set; }
+ public List CntrnoDto { get; set; }
+
+ }
+
+}
diff --git a/ams/djy.Model/djy.Model.csproj b/ams/djy.Model/djy.Model.csproj
index a04c342..4fce545 100644
--- a/ams/djy.Model/djy.Model.csproj
+++ b/ams/djy.Model/djy.Model.csproj
@@ -11,15 +11,12 @@
-
-
-
diff --git a/ams/djy.Paas.IService/Ams/IAms.cs b/ams/djy.Paas.IService/Ams/IAms.cs
new file mode 100644
index 0000000..ae5fdac
--- /dev/null
+++ b/ams/djy.Paas.IService/Ams/IAms.cs
@@ -0,0 +1,17 @@
+using djy.Model.Ams;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace djy.IService.Ams
+{
+ public interface IAms
+ {
+ void SaveInfo(AMSSaveDto Dto);
+
+
+
+ }
+}
diff --git a/ams/djy.Paas.IService/djy.IService.csproj b/ams/djy.Paas.IService/djy.IService.csproj
index 21aad95..b46558a 100644
--- a/ams/djy.Paas.IService/djy.IService.csproj
+++ b/ams/djy.Paas.IService/djy.IService.csproj
@@ -18,8 +18,4 @@
-
-
-
-
diff --git a/ams/djy.paas.Service/Ams/ServiceAms.cs b/ams/djy.paas.Service/Ams/ServiceAms.cs
index 405353b..6d588db 100644
--- a/ams/djy.paas.Service/Ams/ServiceAms.cs
+++ b/ams/djy.paas.Service/Ams/ServiceAms.cs
@@ -1,22 +1,25 @@
using Common.Repository;
using Common.Repository.Interface;
+using djy.IService.Ams;
+using djy.Model.Ams;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+
namespace djy.Service.Ams
{
- public class ServiceAms
+ public class ServiceAms : IAms
{
- public void Update()
+ private IDapperDBBase dapperDB;
+ public void SaveInfo(AMSSaveDto Dto)
{
-
-
+
}
}
}
diff --git a/ams/djyweb_djyPaasApi/Controllers/AMS/AmsController.cs b/ams/djyweb_djyPaasApi/Controllers/AMS/AmsController.cs
index 2fdadb2..e40e319 100644
--- a/ams/djyweb_djyPaasApi/Controllers/AMS/AmsController.cs
+++ b/ams/djyweb_djyPaasApi/Controllers/AMS/AmsController.cs
@@ -1,16 +1,32 @@
using Common;
+using Common.Repository.Interface;
+using djy.Model.Ams;
+using djy.Service.Ams;
+
using Microsoft.AspNetCore.Mvc;
using System;
namespace djy_AmsApi.Controllers
{
public class AmsController : ApiBase
- {
-
- [HttpPost("bindclient")]
- public string Update(string id)
+ {
+ private ServiceAms ams;
+
+ [HttpPost("Add")]
+ public Response Add(AMSSaveDto Dto)
{
- return id;
+ var result = new Response();
+ try
+ {
+ ams.Add(Dto);
+ }
+ catch (Exception ex)
+ {
+ result.Code = 500;
+ result.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+
+ return result;
}
}
}