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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -613,6 +613,7 @@ namespace Myshipping.Application
         /// 批量编辑
         /// </summary>
         /// <returns></returns>
+        [HttpPost("/BookingOrder/BachUpdate")]
         public async Task BachUpdate(BatchUpdate dto)
         {
             if (dto == null || dto.Id.Count == 0)
@@ -776,14 +777,12 @@ namespace Myshipping.Application
         }
 
 
-
-
         /// <summary>
         /// 下载文件
         /// </summary>
         /// <returns></returns>
 
-        [HttpGet("/BookingOrder/download")]
+        [HttpGet("/BookingOrder/Download")]
         public async Task<IActionResult> Download(long id)
         {
             var printFile = await _bookingfile.FirstOrDefaultAsync(u => u.Id == id);
@@ -1239,7 +1238,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="fileName">文件名</param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/downloadPrint")]
+        [HttpGet("/BookingOrder/DownloadPrint")]
         public IActionResult DownloadPrint(string fileName)
         {
             var opt = App.GetOptions<TempFileOptions>().Path;
@@ -1809,6 +1808,76 @@ namespace Myshipping.Application
 
         }
 
+
+
+        /// <summary>
+        /// 批量编辑vgm
+        /// </summary>
+        /// <param name="ids">业务id 逗号拼接</param>
+        /// <returns></returns>
+        [HttpGet("/BookingOrder/GetVmgDataList")]
+        public async Task<List<BatchVGM>> 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<BatchVGM> batchVGMs = new List<BatchVGM>();
+            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;
+        }
+
+        /// <summary>
+        /// 批量保存vgm
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("/BookingOrder/SaveBatchVgm")]
+        public async Task SaveBatchVgm(List<BatchVGMList> 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

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
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+
+
+        public List<BatchVGMList> ctnlist { get; set; }
+    }
+
+
+    public class BatchVGMList {
+        /// <summary>
+        /// 箱id
+        /// </summary>
+        public long Id { get; set; }
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        public string CTNCODE { get; set; }
+        /// <summary>
+        /// 箱型
+        /// </summary>
+        public string CTNALL { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string CNTRNO { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        public decimal? KGS { get; set; }
+        /// <summary>
+        /// 皮重
+        /// </summary>
+        public decimal? TAREWEIGHT { get; set; }
+        /// <summary>
+        /// 称重方式
+        /// </summary>
+        public string WEIGHTYPE { get; set; }
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        public decimal? WEIGHKGS { get; set; }
+    }
+}