diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs
index 1b80e80a..e720e38e 100644
--- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs
@@ -411,6 +411,26 @@ public class ClientInfoReq
///
public bool IsShared { get; set; }
+ ///
+ /// 揽货人名字
+ ///
+ public string SaleName { get; set; }
+
+ ///
+ /// 操作名字
+ ///
+ public string OpName { get; set; }
+
+ ///
+ /// 单证名字
+ ///
+ public string DocName { get; set; }
+
+ ///
+ /// 客服名字
+ ///
+ public string CustomerServiceName { get; set; }
+
///
/// 开票方式
///
diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillReq.cs
index a824dd88..8a288b8a 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillReq.cs
@@ -17,6 +17,10 @@ namespace DS.WMS.Core.Op.Dtos
/// 主键Id
///
public long Id { get; set; }
+ ///
+ /// 是否分单
+ ///
+ public bool IsPart { get; set; } = false;
///
/// 箱信息
diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillRes.cs
index 1302218e..1dcb57ad 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillRes.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillRes.cs
@@ -17,6 +17,11 @@ namespace DS.WMS.Core.Op.Dtos
///
public long Id { get; set; }
+ ///
+ /// 是否分单
+ ///
+ public bool IsPart { get; set; } = false;
+
///
/// 业务Id
///
diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillShortRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/ShippingBillShortRes.cs
new file mode 100644
index 00000000..6dcc917c
--- /dev/null
+++ b/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
+{
+ ///
+ ///
+ ///
+ public class ShippingBillShortRes
+ {
+ ///
+ /// 主键Id
+ ///
+ public long Id { get; set; }
+ ///
+ /// 是否分单
+ ///
+ public bool IsPart { get; set; } = false;
+
+
+ ///
+ /// 业务Id
+ ///
+ public long BusinessId { get; set; }
+ ///
+ /// 主提单号
+ ///
+ public string MBLNO { get; set; }
+
+ ///
+ /// 分提单号
+ ///
+ public string HBLNO { get; set; }
+ }
+}
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBill.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBill.cs
index 08be0827..ec2ce0e0 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBill.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBill.cs
@@ -15,6 +15,12 @@ public class SeaExportShippingBill : BaseModel
///
[SqlSugar.SugarColumn(ColumnDescription = "业务Id", IsNullable = false, Length = 100)]
public long BusinessId { get; set; }
+
+ ///
+ /// 是否分单
+ ///
+ [SqlSugar.SugarColumn(ColumnDescription = "是否分单", IsNullable = true,DefaultValue ="0")]
+ public bool IsPart { get; set; } = false;
///
/// 主提单号
///
diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/IShippingBillService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/IShippingBillService.cs
index 4d44fea1..e5926112 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Interface/IShippingBillService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Interface/IShippingBillService.cs
@@ -15,6 +15,13 @@ namespace DS.WMS.Core.Op.Interface
///
public interface IShippingBillService
{
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public Task>> GetShippingBillShortList(string id);
///
/// 列表
///
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillService.cs
index 0413e52d..561c9df1 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillService.cs
@@ -99,6 +99,22 @@ namespace DS.WMS.Core.Op.Method
#endregion
}
+
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public async Task>> GetShippingBillShortList(string id)
+ {
+ var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+ var data = await tenantDb.Queryable()
+ .Where(x=>x.BusinessId == long.Parse(id))
+ .Select().ToListAsync();
+ return await Task.FromResult(DataResult>.Success(data, MultiLanguageConst.DataQuerySuccess));
+ }
///
/// 列表
///
diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/ShippingBillController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/ShippingBillController.cs
index 04a959de..1a9e3ed2 100644
--- a/ds-wms-service/DS.WMS.OpApi/Controllers/ShippingBillController.cs
+++ b/ds-wms-service/DS.WMS.OpApi/Controllers/ShippingBillController.cs
@@ -25,6 +25,20 @@ public class ShippingBillController : ApiController
_invokeService = invokeService;
}
+
+ ///
+ /// 舱单列表
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("GetShippingBillShortList")]
+ public async Task>> GetShippingBillShortList([FromQuery] string id)
+ {
+ var res = await _invokeService.GetShippingBillShortList(id);
+ return res;
+ }
+
///
/// 列表
///