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

Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Browse Source
master
jianghaiqing 6 months ago
parent 99c5147ebd 5172fd349a
commit 6dfef1a678
10 changed files with 142 additions and 1 deletions
Show Stats Download Patch File Download Diff File

11
Myshipping.Application/Entity/BookingOrder.cs
Unescape Escape View File

@ -793,6 +793,17 @@ namespace Myshipping.Application.Entity
[Description("航线操作")]
public string ROUTE { get; set; }
/// <summary>
/// 商务id
/// </summary>
[Description("商务ID")]
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
[Description("商务")]
public string BUSINESS { get; set; }
/// <summary>
/// 仓库

10
Myshipping.Application/Entity/BookingSlot/BookingSlotAllocation.cs
Unescape Escape View File

@ -300,6 +300,16 @@ namespace Myshipping.Application
/// </summary>
//[Description("单证")]
public string DOC { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 销售日期
/// </summary>

12
Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
Unescape Escape View File

@ -247,6 +247,8 @@ namespace Myshipping.Application
x.OPID,
x.DOC,
x.DOCID,
x.BUSINESSID,
x.BUSINESS,
x.SHIPPER,
x.SALE_TIME,
x.GOODSNAME,
@ -271,6 +273,8 @@ namespace Myshipping.Application
bookingOrder.OPID = allocation.OPID;
bookingOrder.DOC = allocation.DOC;
bookingOrder.DOCID = allocation.DOCID;
bookingOrder.BUSINESS = allocation.BUSINESS;
bookingOrder.BUSINESSID = allocation.BUSINESSID;
await _repBookingOrder.AsUpdateable(bookingOrder).UpdateColumns(x => new
{
@ -533,6 +537,8 @@ namespace Myshipping.Application
OP = x.OP,
DOCID = x.DOCID,
DOC = x.DOC,
BUSINESS = x.BUSINESS,
BUSINESSID = x.BUSINESSID,
SALE = x.SALE,
SALE_TIME = x.SALE_TIME,
SHIPPER = x.SHIPPER,
@ -1714,6 +1720,8 @@ namespace Myshipping.Application
newSlotAllocation.DOC = generateModel.DocName;
newSlotAllocation.OPID = generateModel.OpId?.ToString();
newSlotAllocation.OP = generateModel.OpName;
newSlotAllocation.BUSINESS = generateModel.BUSINESS;
newSlotAllocation.BUSINESSID = generateModel.BUSINESSID;
newSlotAllocation.SALE_TIME = generateModel.SALE_TIME;
newSlotAllocation.SHIPPER = generateModel.SHIPPER;
newSlotAllocation.GOODSNAME = generateModel.GOODSNAME;
@ -1926,6 +1934,8 @@ namespace Myshipping.Application
OP = x.OP,
DOCID = x.DOCID,
DOC = x.DOC,
BUSINESS = x.BUSINESS,
BUSINESSID = x.BUSINESSID,
SALE_TIME = x.SALE_TIME,
SHIPPER = x.SHIPPER,
GOODSNAME = x.GOODSNAME,
@ -2673,6 +2683,8 @@ namespace Myshipping.Application
OP = x.OP,
DOCID = x.DOCID,
DOC = x.DOC,
BUSINESS = x.BUSINESS,
BUSINESSID = x.BUSINESSID,
SALE_TIME = x.SALE_TIME,
SHIPPER = x.SHIPPER,
GOODSNAME = x.GOODSNAME,

10
Myshipping.Application/Service/BookingSlot/Dto/BookingGenerateDto.cs
Unescape Escape View File

@ -54,6 +54,16 @@ namespace Myshipping.Application
/// </summary>
public string DocName { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 航线操作ID
/// </summary>

11
Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
Unescape Escape View File

@ -633,6 +633,17 @@ namespace Myshipping.Application.Service.BookingSlot.Dto
/// 单证
/// </summary>
public string DOC { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 销售日期
/// </summary>

10
Myshipping.Core/Entity/DJY/DjyCustomer.cs
Unescape Escape View File

@ -132,6 +132,16 @@ namespace Myshipping.Core.Entity
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 提单信息
/// </summary>

40
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -2075,6 +2075,16 @@
客服
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.BUSINESSID">
<summary>
商务id
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.BUSINESS">
<summary>
商务
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.TIDANINFO">
<summary>
提单信息
@ -12481,6 +12491,16 @@
客服
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.BUSINESSID">
<summary>
商务id
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.BUSINESS">
<summary>
商务
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.TIDANINFO">
<summary>
提单信息
@ -12706,6 +12726,16 @@
客服
</summary>
</member>
<member name="P:Myshipping.Core.Service.BatchUpdateInput.BUSINESSID">
<summary>
商务id
</summary>
</member>
<member name="P:Myshipping.Core.Service.BatchUpdateInput.BUSINESS">
<summary>
商务
</summary>
</member>
<member name="T:Myshipping.Core.Service.DjyCustomerOutput">
<summary>
客户输出参数
@ -12866,6 +12896,16 @@
客服
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerOutput.BUSINESSID">
<summary>
商务id
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerOutput.BUSINESS">
<summary>
商务
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerOutput.TIDANINFO">
<summary>
提单信息

7
Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
Unescape Escape View File

@ -457,7 +457,12 @@ namespace Myshipping.Core.Service
updateable.SetColumns(x => x.DOC == input.DOC);
updateable.SetColumns(x => x.DOCID == input.DOCID);
}
if (input.IsSetCUSTSERVICE || input.IsSetSALE || input.IsSetOP || input.IsSetDOC)
if (input.IsSetBUSINESS)
{
updateable.SetColumns(x => x.BUSINESS == input.BUSINESS);
updateable.SetColumns(x => x.BUSINESSID == input.BUSINESSID);
}
if (input.IsSetCUSTSERVICE || input.IsSetSALE || input.IsSetOP || input.IsSetDOC || input.IsSetBUSINESS)
{
await updateable.Where(x => input.CustomnerIdList.Contains(x.Id)).ExecuteCommandAsync();
}

22
Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs
Unescape Escape View File

@ -159,6 +159,17 @@ namespace Myshipping.Core.Service
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 提单信息
/// </summary>
@ -358,6 +369,7 @@ namespace Myshipping.Core.Service
public bool IsSetDOC { get; set; }
public bool IsSetSALE { get; set; }
public bool IsSetCUSTSERVICE { get; set; }
public bool IsSetBUSINESS { get; set; }
/// <summary>
/// 操作id
/// </summary>
@ -390,5 +402,15 @@ namespace Myshipping.Core.Service
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
}
}

10
Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs
Unescape Escape View File

@ -155,6 +155,16 @@ namespace Myshipping.Core.Service
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
/// <summary>
/// 商务id
/// </summary>
public string BUSINESSID { get; set; }
/// <summary>
/// 商务
/// </summary>
public string BUSINESS { get; set; }
/// <summary>
/// 提单信息
/// </summary>

Write Preview
Loading…
Cancel
Save