diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs index c172e6f6..d7617262 100644 --- a/Myshipping.Application/Entity/BookingOrder.cs +++ b/Myshipping.Application/Entity/BookingOrder.cs @@ -793,6 +793,17 @@ namespace Myshipping.Application.Entity [Description("航线操作")] public string ROUTE { get; set; } + /// + /// 商务id + /// + [Description("商务ID")] + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + [Description("商务")] + public string BUSINESS { get; set; } /// /// 仓库 diff --git a/Myshipping.Application/Entity/BookingSlot/BookingSlotAllocation.cs b/Myshipping.Application/Entity/BookingSlot/BookingSlotAllocation.cs index d02081c9..732c3619 100644 --- a/Myshipping.Application/Entity/BookingSlot/BookingSlotAllocation.cs +++ b/Myshipping.Application/Entity/BookingSlot/BookingSlotAllocation.cs @@ -300,6 +300,16 @@ namespace Myshipping.Application /// //[Description("单证")] public string DOC { get; set; } + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + public string BUSINESS { get; set; } + /// /// 销售日期 /// diff --git a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs index fd7461e5..39d2a11f 100644 --- a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs +++ b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs @@ -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, diff --git a/Myshipping.Application/Service/BookingSlot/Dto/BookingGenerateDto.cs b/Myshipping.Application/Service/BookingSlot/Dto/BookingGenerateDto.cs index 02e12ef8..10fb952d 100644 --- a/Myshipping.Application/Service/BookingSlot/Dto/BookingGenerateDto.cs +++ b/Myshipping.Application/Service/BookingSlot/Dto/BookingGenerateDto.cs @@ -54,6 +54,16 @@ namespace Myshipping.Application /// public string DocName { get; set; } + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + public string BUSINESS { get; set; } + /// /// 航线操作ID /// diff --git a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs index 2ad759d2..479fe19f 100644 --- a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs +++ b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs @@ -633,6 +633,17 @@ namespace Myshipping.Application.Service.BookingSlot.Dto /// 单证 /// public string DOC { get; set; } + + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + public string BUSINESS { get; set; } + /// /// 销售日期 /// diff --git a/Myshipping.Core/Entity/DJY/DjyCustomer.cs b/Myshipping.Core/Entity/DJY/DjyCustomer.cs index df42ab4c..570bf423 100644 --- a/Myshipping.Core/Entity/DJY/DjyCustomer.cs +++ b/Myshipping.Core/Entity/DJY/DjyCustomer.cs @@ -132,6 +132,16 @@ namespace Myshipping.Core.Entity /// 客服 /// public string CUSTSERVICE { get; set; } + + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + /// + /// 商务 + /// + public string BUSINESS { get; set; } + /// /// 提单信息 /// diff --git a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs index 77b1e89c..881b5a89 100644 --- a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs +++ b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs @@ -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(); } diff --git a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs index 1d0d8413..925cd2ab 100644 --- a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs +++ b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs @@ -159,6 +159,17 @@ namespace Myshipping.Core.Service /// 客服 /// public string CUSTSERVICE { get; set; } + + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + public string BUSINESS { get; set; } + /// /// 提单信息 /// @@ -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; } /// /// 操作id /// @@ -390,5 +402,15 @@ namespace Myshipping.Core.Service /// 客服 /// public string CUSTSERVICE { get; set; } + + /// + /// 商务id + /// + public string BUSINESSID { get; set; } + + /// + /// 商务 + /// + public string BUSINESS { get; set; } } }