chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改订单更新接口请求字段

Browse Source 
修改舱位引入
dev
jianghaiqing 3 weeks ago
parent 272bca25d8
commit ac2fe136ff
3 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File

65
ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportOpenEditReq.cs
Unescape Escape View File

@ -24,7 +24,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 场站Id t_crm_client CUSTNAME /// 场站Id t_crm_client CUSTNAME
/// </summary> /// </summary>
public long YardId { get; set; } public Nullable<long> YardId { get; set; }
/// <summary> /// <summary>
/// 场站 t_crm_client CUSTNAME /// 场站 t_crm_client CUSTNAME
/// </summary> /// </summary>
@ -33,7 +33,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 船公司Id /// 船公司Id
/// </summary> /// </summary>
public long CarrierId { get; set; } public Nullable<long> CarrierId { get; set; }
/// <summary> /// <summary>
/// 船公司 /// 船公司
/// </summary> /// </summary>
@ -41,7 +41,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 货代公司Id /// 货代公司Id
/// </summary> /// </summary>
public long ForwarderId { get; set; } public Nullable<long> ForwarderId { get; set; }
/// <summary> /// <summary>
/// 货代公司 /// 货代公司
/// </summary> /// </summary>
@ -55,7 +55,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 航线Id /// 航线Id
/// </summary> /// </summary>
public long LaneId { get; set; } public Nullable<long> LaneId { get; set; }
/// <summary> /// <summary>
/// 航线 /// 航线
@ -64,7 +64,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 揽货人Id /// 揽货人Id
/// </summary> /// </summary>
public long SaleId { get; set; } public Nullable<long> SaleId { get; set; }
/// <summary> /// <summary>
/// 揽货人 /// 揽货人
/// </summary> /// </summary>
@ -73,7 +73,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 报关行Id /// 报关行Id
/// </summary> /// </summary>
public long CustomserId { get; set; } public Nullable<long> CustomserId { get; set; }
/// <summary> /// <summary>
/// 报关行 /// 报关行
/// </summary> /// </summary>
@ -82,7 +82,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 承运车队Id /// 承运车队Id
/// </summary> /// </summary>
public long TruckerId { get; set; } public Nullable<long> TruckerId { get; set; }
/// <summary> /// <summary>
/// 承运车队 /// 承运车队
/// </summary> /// </summary>
@ -91,7 +91,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 装货港代码 /// 装货港代码
/// </summary> /// </summary>
public long LoadPortId { get; set; } public Nullable<long> LoadPortId { get; set; }
/// <summary> /// <summary>
/// 装货港 /// 装货港
@ -101,7 +101,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 卸货港代码 /// 卸货港代码
/// </summary> /// </summary>
public long DischargePortId { get; set; } public Nullable<long> DischargePortId { get; set; }
/// <summary> /// <summary>
/// 卸货港 /// 卸货港
@ -116,7 +116,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 船名Id /// 船名Id
/// </summary> /// </summary>
public long VesselId { get; set; } public Nullable<long> VesselId { get; set; }
/// <summary> /// <summary>
/// 内部航次 /// 内部航次
/// </summary> /// </summary>
@ -129,7 +129,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 国外代理人Id t_info_client CUSTNAME /// 国外代理人Id t_info_client CUSTNAME
/// </summary> /// </summary>
public long? AgentId { get; set; } public Nullable<long> AgentId { get; set; }
/// <summary> /// <summary>
/// 国外代理人 t_info_client CUSTNAME /// 国外代理人 t_info_client CUSTNAME
/// </summary> /// </summary>
@ -143,21 +143,21 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// Desc:单证 /// Desc:单证
/// </summary> /// </summary>
public long Doc { get; set; } public Nullable<long> Doc { get; set; }
/// <summary> /// <summary>
/// 客服 /// 客服
/// </summary> /// </summary>
public long CustomerService { get; set; } public Nullable<long> CustomerService { get; set; }
/// <summary> /// <summary>
/// 海外客服 /// 海外客服
/// </summary> /// </summary>
public long ForeignCustomerService { get; set; } public Nullable<long> ForeignCustomerService { get; set; }
/// <summary> /// <summary>
/// 操作员 /// 操作员
/// </summary> /// </summary>
public long OperatorId { get; set; } public Nullable<long> OperatorId { get; set; }
/// <summary> /// <summary>
/// ATD /// ATD
/// </summary> /// </summary>
@ -189,24 +189,24 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// Desc:业务来源Id /// Desc:业务来源Id
/// </summary> /// </summary>
public long SourceId { get; set; } public Nullable<long> SourceId { get; set; }
/// <summary> /// <summary>
/// Desc:业务来源明细Id /// Desc:业务来源明细Id
/// </summary> /// </summary>
public long SourceDetailId { get; set; } public Nullable<long> SourceDetailId { get; set; }
/// <summary> /// <summary>
/// 船代Id /// 船代Id
/// </summary> /// </summary>
public long ShipAgencyId { get; set; } public Nullable<long> ShipAgencyId { get; set; }
/// <summary> /// <summary>
/// 船代 /// 船代
/// </summary> /// </summary>
public long ShipAgency { get; set; } public Nullable<long> ShipAgency { get; set; }
@ -227,7 +227,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 交货地代码 /// 交货地代码
/// </summary> /// </summary>
public long DeliveryPlaceId { get; set; } public Nullable<long> DeliveryPlaceId { get; set; }
/// <summary> /// <summary>
/// 交货地 /// 交货地
@ -244,7 +244,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 签单地点Id /// 签单地点Id
/// </summary> /// </summary>
public long IssuePlaceId { get; set; } public Nullable<long> IssuePlaceId { get; set; }
/// <summary> /// <summary>
/// 签单地点 /// 签单地点
@ -263,7 +263,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// Desc:所属业务部门 /// Desc:所属业务部门
/// </summary> /// </summary>
public long SaleDeptId { get; set; } public Nullable<long> SaleDeptId { get; set; }
/// <summary> /// <summary>
/// 代理内容 /// 代理内容
@ -278,7 +278,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 委托单位Id /// 委托单位Id
/// </summary> /// </summary>
public long CustomerId { get; set; } public Nullable<long> CustomerId { get; set; }
/// <summary> /// <summary>
/// 委托单位 t_info_client CUSTNAME /// 委托单位 t_info_client CUSTNAME
/// </summary> /// </summary>
@ -291,7 +291,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 销售公司Id /// 销售公司Id
/// </summary> /// </summary>
public long SaleOrgId { get; set; } public Nullable<long> SaleOrgId { get; set; }
/// <summary> /// <summary>
/// 货物标识 S/R/D/O /// 货物标识 S/R/D/O
@ -317,36 +317,36 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// Desc:报检 /// Desc:报检
/// </summary> /// </summary>
public bool? IsInspection { get; set; } = false; public bool? IsInspection { get; set; }
/// <summary> /// <summary>
/// Desc:仅报关 /// Desc:仅报关
/// </summary> /// </summary>
public bool? IsCustoms { get; set; } = false; public bool? IsCustoms { get; set; }
/// <summary> /// <summary>
/// Desc:订舱 /// Desc:订舱
/// </summary> /// </summary>
public bool? IsBooking { get; set; } = false; public bool? IsBooking { get; set; }
/// <summary> /// <summary>
/// Desc:分单签单 /// Desc:分单签单
/// </summary> /// </summary>
public bool? IsHBLNO { get; set; } = false; public bool? IsHBLNO { get; set; }
/// <summary> /// <summary>
/// Desc:陆运 /// Desc:陆运
/// </summary> /// </summary>
public bool? IsLand { get; set; } = false; public bool? IsLand { get; set; }
/// <summary> /// <summary>
/// Desc:使用代理 /// Desc:使用代理
/// </summary> /// </summary>
public bool? IsAgent { get; set; } = false; public bool? IsAgent { get; set; }
/// <summary> /// <summary>
/// Desc:仓储 /// Desc:仓储
/// </summary> /// </summary>
public bool? IsStorage { get; set; } = false; public bool? IsStorage { get; set; }
/// <summary> /// <summary>
@ -417,7 +417,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary> /// <summary>
/// 收货地点Id /// 收货地点Id
/// </summary> /// </summary>
public long ReceiptPlaceId { get; set; } public Nullable<long> ReceiptPlaceId { get; set; }
/// <summary> /// <summary>
/// 截VGM时间 /// 截VGM时间
@ -433,5 +433,6 @@ namespace DS.WMS.Core.Op.Dtos
/// 主提单号 /// 主提单号
/// </summary> /// </summary>
public string MBLNO { get; set; } public string MBLNO { get; set; }
} }
} }

3
ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
Unescape Escape View File

@ -3085,6 +3085,8 @@ namespace DS.WMS.Core.Op.Method
CtnInfo = new List<OpCtnReq>() CtnInfo = new List<OpCtnReq>()
}; };
if (!model.isOrderImport)
{
if (bookingSlotBase.ETD.HasValue) if (bookingSlotBase.ETD.HasValue)
{ {
bkModel.AccountDate = bookingSlotBase.ETD.Value.ToString("yyyy-MM"); bkModel.AccountDate = bookingSlotBase.ETD.Value.ToString("yyyy-MM");
@ -3093,6 +3095,7 @@ namespace DS.WMS.Core.Op.Method
{ {
bkModel.AccountDate = DateTime.Now.ToString("yyyy-MM"); bkModel.AccountDate = DateTime.Now.ToString("yyyy-MM");
} }
}
var ctnList = model.slots.SelectMany(b => b.CtnList).ToList(); var ctnList = model.slots.SelectMany(b => b.CtnList).ToList();

29
ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs
Unescape Escape View File

@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Owin.Security.Provider; using Microsoft.Owin.Security.Provider;
using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Ocsp;
using SqlSugar; using SqlSugar;
namespace DS.WMS.OpApi.Controllers namespace DS.WMS.OpApi.Controllers
@ -457,5 +458,33 @@ namespace DS.WMS.OpApi.Controllers
return await _bookingSlotStockService.BookingSlotStock(model); return await _bookingSlotStockService.BookingSlotStock(model);
} }
#endregion #endregion
#region 保存舱位预甩或换舱
/// <summary>
/// 保存舱位预甩或换舱
/// </summary>
/// <param name="req">请求详情</param>
/// <returns>返回回执</returns>
[HttpPost]
[Route("SaveRolling")]
public async Task<DataResult> SaveRolling([FromBody] BookingSlotRollingDto req)
{
return await _bookingSlotService.SaveRolling(req);
}
#endregion
#region 获取舱位预甩或换舱列表
/// <summary>
/// 获取舱位预甩或换舱列表
/// </summary>
/// <param name="slotId">舱位ID</param>
/// <returns>返回列表</returns>
[HttpGet]
[Route("GetRollingList")]
public async Task<DataResult<List<BookingSlotRollingDto>>> GetRollingList([FromQuery] long slotId)
{
return await _bookingSlotService.GetRollingList(slotId);
}
#endregion
} }
} }

Write Preview
Loading…
Cancel
Save