diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs index 2c7054c9..c50b15f4 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs @@ -63,6 +63,11 @@ namespace DS.WMS.Core.Op.Dtos /// public Nullable StlDate { get; set; } + /// + /// 结算方式 + /// + public string StlName { get; set; } + /// /// 提单签发状态代码 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLIssueManageBase.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLIssueManageBase.cs index 543b8ffb..f133d96b 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLIssueManageBase.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLIssueManageBase.cs @@ -57,6 +57,12 @@ namespace DS.WMS.Core.Op.Entity [SqlSugar.SugarColumn(ColumnDescription = "结算日期", IsNullable = true)] public Nullable StlDate { get; set; } + /// + /// 结算方式 + /// + [SugarColumn(ColumnDescription = "结算方式", IsNullable = true, Length = 30)] + public string StlName { get; set; } + /// /// 提单签发状态代码 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs index 254fa613..08ce2c72 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs @@ -151,7 +151,8 @@ namespace DS.WMS.Core.Op.Method Vessel = a.Vessel, Voyno = a.Voyno, IssuePlaceCode = a.IssuePlaceCode, - StlDate = a.StlDate + StlDate = a.StlDate, + StlName = a.StlName, }); var q2 = q1.InnerJoin((l, r) => l.Id == r.BusinessId) @@ -185,7 +186,8 @@ namespace DS.WMS.Core.Op.Method Vessel = r.Vessel, Voyno = r.Voyno, IssuePlaceCode = "", - StlDate = null, + StlDate = l.StlDate, + StlName = l.StlName, }); var queryBase = tenantDb.UnionAll(q1, q2); @@ -306,6 +308,8 @@ namespace DS.WMS.Core.Op.Method currBl.DocName = data.order.DocName; currBl.MasterHBill = data.order.BillType; currBl.MasterHBillName = data.order.BillType == "M" ? "主单" : "分单"; + currBl.StlDate = data.order.StlDate; + currBl.StlName = data.order.StlName; resultList.Add(currBl); @@ -338,6 +342,7 @@ namespace DS.WMS.Core.Op.Method BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), StlDate = data.order.StlDate, + StlName = data.order.StlName, Doc = data.order.Doc, DocName = data.order.DocName, MasterHBill = data.order.BillType, @@ -1928,5 +1933,10 @@ namespace DS.WMS.Core.Op.Method /// Desc:月结算时间 /// public DateTime? StlDate { get; set; } + + /// + /// 结算方式 + /// + public string StlName { get; set; } } }