舱单接口修改

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs

@@ -411,6 +411,26 @@ public class ClientInfoReq
     /// </summary>
     public bool IsShared { get; set; }
 
+    /// <summary>
+    /// 揽货人名字
+    /// </summary>
+    public string SaleName { get; set; }
+
+    /// <summary>
+    /// 操作名字
+    /// </summary>
+    public string OpName { get; set; }
+
+    /// <summary>
+    /// 单证名字
+    /// </summary>
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 客服名字
+    /// </summary>
+    public string CustomerServiceName { get; set; }
+
     /// <summary>
     /// 开票方式
     /// </summary>

ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillReq.cs

@@ -17,6 +17,10 @@ namespace DS.WMS.Core.Op.Dtos
         /// 主键Id
         /// </summary>
         public long Id { get; set; }
+        /// <summary>
+        /// 是否分单
+        /// </summary>
+        public bool IsPart { get; set; } = false;
 
         /// <summary>
         /// 箱信息

ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillRes.cs

@@ -17,6 +17,11 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         public long Id { get; set; }
 
+        /// <summary>
+        /// 是否分单
+        /// </summary>
+        public bool IsPart { get; set; } = false;
+
         /// <summary>
         /// 业务Id
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillShortRes.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Dtos
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ShippingBillShortRes
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public long Id { get; set; }
+        /// <summary>
+        /// 是否分单
+        /// </summary>
+        public bool IsPart { get; set; } = false;
+
+
+        /// <summary>
+        /// 业务Id
+        /// </summary>
+        public long BusinessId { get; set; }
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 分提单号
+        /// </summary>
+        public string HBLNO { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBill.cs

@@ -15,6 +15,12 @@ public class SeaExportShippingBill : BaseModel<long>
     /// </summary>
     [SqlSugar.SugarColumn(ColumnDescription = "业务Id", IsNullable = false, Length = 100)]
     public long BusinessId { get; set; }
+
+    /// <summary>
+    /// 是否分单
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "是否分单", IsNullable = true,DefaultValue ="0")]
+    public bool IsPart { get; set; } = false;
     /// <summary>
     /// 主提单号
     /// </summary>

ds-wms-service/DS.WMS.Core/Op/Interface/IShippingBillService.cs

@@ -15,6 +15,13 @@ namespace DS.WMS.Core.Op.Interface
     /// </summary>
     public interface IShippingBillService
     {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public Task<DataResult<List<ShippingBillShortRes>>> GetShippingBillShortList(string id);
         /// <summary>
         /// 列表
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillService.cs

@@ -99,6 +99,22 @@ namespace DS.WMS.Core.Op.Method
             #endregion
         }
 
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<DataResult<List<ShippingBillShortRes>>> GetShippingBillShortList(string id)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+            
+            var data = await tenantDb.Queryable<SeaExportShippingBill>()
+                .Where(x=>x.BusinessId == long.Parse(id))
+                .Select<ShippingBillShortRes>().ToListAsync();
+             return await Task.FromResult(DataResult<List<ShippingBillShortRes>>.Success(data, MultiLanguageConst.DataQuerySuccess));
+        }
         /// <summary>
         /// 列表
         /// </summary>

ds-wms-service/DS.WMS.OpApi/Controllers/ShippingBillController.cs

@@ -25,6 +25,20 @@ public class ShippingBillController : ApiController
         _invokeService = invokeService;
     }
 
+
+    /// <summary>
+    /// 舱单列表
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetShippingBillShortList")]
+    public async Task<DataResult<List<ShippingBillShortRes>>> GetShippingBillShortList([FromQuery] string id)
+    {
+        var res = await _invokeService.GetShippingBillShortList(id);
+        return res;
+    }
+
     /// <summary>
     /// 列表
     /// </summary>