diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index c8298bb5..d485765c 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -613,6 +613,7 @@ namespace Myshipping.Application /// 批量编辑 /// /// + [HttpPost("/BookingOrder/BachUpdate")] public async Task BachUpdate(BatchUpdate dto) { if (dto == null || dto.Id.Count == 0) @@ -776,14 +777,12 @@ namespace Myshipping.Application } - - /// /// 下载文件 /// /// - [HttpGet("/BookingOrder/download")] + [HttpGet("/BookingOrder/Download")] public async Task Download(long id) { var printFile = await _bookingfile.FirstOrDefaultAsync(u => u.Id == id); @@ -1239,7 +1238,7 @@ namespace Myshipping.Application /// /// 文件名 /// - [HttpGet("/BookingOrder/downloadPrint")] + [HttpGet("/BookingOrder/DownloadPrint")] public IActionResult DownloadPrint(string fileName) { var opt = App.GetOptions().Path; @@ -1809,6 +1808,76 @@ namespace Myshipping.Application } + + + /// + /// 批量编辑vgm + /// + /// 业务id 逗号拼接 + /// + [HttpGet("/BookingOrder/GetVmgDataList")] + public async Task> GetVmgDataList(string ids) + { + var arr = ids.Split(','); + if (arr.Length == 0) + { + throw Oops.Bah("请传入正确数据"); + } + var main = await _rep.AsQueryable().Where(x => x.ParentId == 0).ToListAsync(); + List batchVGMs = new List(); + foreach (var item in arr) + { + BatchVGM batchVGM = new BatchVGM(); + batchVGM.Id = Convert.ToInt64(item); + batchVGM.MBLNO = main.Where(x => x.Id == batchVGM.Id).Select(x => x.MBLNO).FirstOrDefault(); + batchVGM.ctnlist = await _repCtn.Where(x => x.BILLID == batchVGM.Id).Select(x => new BatchVGMList + { + Id = x.Id, + CTNCODE = x.CTNCODE, + CTNALL = x.CTNALL, + CNTRNO = x.CNTRNO, + KGS = x.KGS, + TAREWEIGHT = x.TAREWEIGHT, + WEIGHTYPE = x.WEIGHTYPE, + WEIGHKGS = x.WEIGHKGS + }).ToListAsync(); + + batchVGMs.Add(batchVGM); + } + return batchVGMs; + } + + /// + /// 批量保存vgm + /// + /// + /// + [HttpPost("/BookingOrder/SaveBatchVgm")] + public async Task SaveBatchVgm(List dto) { + + if (dto == null) + { + throw Oops.Bah("未提交数据"); + } + + foreach (var item in dto) + { + await _repCtn.UpdateAsync(x => x.Id==item.Id, x => new BookingCtn + { + CTNCODE = item.CTNCODE, + CTNALL = item.CTNALL, + CNTRNO = item.CNTRNO, + KGS = item.KGS, + TAREWEIGHT = item.TAREWEIGHT, + WEIGHTYPE = item.WEIGHTYPE, + WEIGHKGS = item.WEIGHKGS + }); + + } + } + + + #endregion #region 订舱、截单EDI diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BatchVGM.cs b/Myshipping.Application/Service/BookingOrder/Dto/BatchVGM.cs new file mode 100644 index 00000000..bffb2e94 --- /dev/null +++ b/Myshipping.Application/Service/BookingOrder/Dto/BatchVGM.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application.Service.BookingOrder.Dto +{ + public class BatchVGM + { + /// + /// id + /// + public long Id { get; set; } + + /// + /// 提单号 + /// + public string MBLNO { get; set; } + + + public List ctnlist { get; set; } + } + + + public class BatchVGMList { + /// + /// 箱id + /// + public long Id { get; set; } + /// + /// 箱型代码 + /// + public string CTNCODE { get; set; } + /// + /// 箱型 + /// + public string CTNALL { get; set; } + + /// + /// 箱号 + /// + public string CNTRNO { get; set; } + + /// + /// 毛重 + /// + public decimal? KGS { get; set; } + /// + /// 皮重 + /// + public decimal? TAREWEIGHT { get; set; } + /// + /// 称重方式 + /// + public string WEIGHTYPE { get; set; } + /// + /// 称重重量 + /// + public decimal? WEIGHKGS { get; set; } + } +}