From bda50454b38cd0dc278505332c3de0d1906a4fca Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 31 Oct 2024 18:30:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BLIssueManage/BLIssueManageBaseDto.cs | 10 +++++++ .../Entity/BLIssueManage/BLIssueManageBase.cs | 12 ++++++++ .../BLIssueManage/BLIssueManageService.cs | 29 +++++++++++++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) 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 f6354384..ce5a5433 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 @@ -406,5 +406,15 @@ namespace DS.WMS.Core.Op.Dtos /// 单证人员 /// public string DocName { get; set; } + + /// + /// 是否改签 + /// + public bool IsBLModify { get; set; } + + /// + /// 是否扣单 + /// + public bool IsBLSeize { 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 c3296d82..27ee3a9f 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 @@ -369,5 +369,17 @@ namespace DS.WMS.Core.Op.Entity /// [SqlSugar.SugarColumn(ColumnDescription = "是否换签（背书）", IsNullable = true)] public bool IsChangeEndorse { get; set; } + + /// + /// 是否改签 + /// + [SqlSugar.SugarColumn(ColumnDescription = "是否改签", IsNullable = true)] + public bool IsBLModify { get; set; } + + /// + /// 是否扣单 + /// + [SqlSugar.SugarColumn(ColumnDescription = "是否扣单", IsNullable = true)] + public bool IsBLSeize { 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 01b002fc..c5924c39 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 @@ -105,15 +105,26 @@ namespace DS.WMS.Core.Op.Method { /* 1、海运出口的订单数据跟提单管理表的数据关联，有提单记录的以提单记录为准。 + */ var tenantDb = saasService.GetBizDbScopeById(user.TenantId); var query = tenantDb.Queryable().ClearFilter(typeof(IOrgId)) .LeftJoin((l, r) => l.Id == r.BookingId) .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) - && querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckInQuery",StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true) .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) - && querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckOutQuery", StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag) + && querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag) + && querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0) .Select((l, r) => new { order = l, bl = r }); BLIssueMangeQueryExtDto otherQuery = null; @@ -206,6 +217,20 @@ namespace DS.WMS.Core.Op.Method var query = tenantDb.Queryable().ClearFilter(typeof(IOrgId)) .LeftJoin((l, r) => l.Id == r.BookingId) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == false) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) + && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag) + && querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0) + .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag) + && querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0) .Select((l, r) => new { order = l, bl = r }); if (!querySearch.QueryCondition.IsNullOrEmpty()) From 46a67d44f484ec7dc9ac0793bf6edc8d19548a7d Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 31 Oct 2024 18:40:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BLIssueManage/BLIssueManageService.cs | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) 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 c5924c39..de3527e5 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 @@ -162,6 +162,8 @@ namespace DS.WMS.Core.Op.Method currBl.DischargePort = data.order.DischargePort; currBl.CustomerService = data.order.CustomerService; currBl.CustomerServiceName = data.order.CustomerServiceName; + currBl.Doc = data.order.Doc; + currBl.DocName = data.order.DocName; resultList.Add(currBl); @@ -194,7 +196,8 @@ namespace DS.WMS.Core.Op.Method BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), StlDate = data.order.StlDate, - + Doc = data.order.Doc, + DocName = data.order.DocName, }); start++; @@ -268,6 +271,8 @@ namespace DS.WMS.Core.Op.Method currBl.DischargePort = data.order.DischargePort; currBl.CustomerService = data.order.CustomerService; currBl.CustomerServiceName = data.order.CustomerServiceName; + currBl.Doc = data.order.Doc; + currBl.DocName = data.order.DocName; resultList.Add(currBl); @@ -299,6 +304,8 @@ namespace DS.WMS.Core.Op.Method BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + Doc = data.order.Doc, + DocName = data.order.DocName, }); start++; @@ -378,6 +385,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -594,6 +604,11 @@ namespace DS.WMS.Core.Op.Method DischargePort = data.order.DischargePort, CustomerService = data.order.CustomerService, CustomerServiceName = data.order.CustomerServiceName, + BLType = BLTypeEnum.BL.ToString(), + BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -774,6 +789,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -947,6 +965,11 @@ namespace DS.WMS.Core.Op.Method DischargePort = data.order.DischargePort, CustomerService = data.order.CustomerService, CustomerServiceName = data.order.CustomerServiceName, + BLType = BLTypeEnum.BL.ToString(), + BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -1132,6 +1155,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -1240,6 +1266,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -1345,6 +1374,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -1450,6 +1482,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto); @@ -1553,6 +1588,9 @@ namespace DS.WMS.Core.Op.Method CustomerServiceName = data.order.CustomerServiceName, BLType = BLTypeEnum.BL.ToString(), BLTypeName = BLTypeEnum.BL.GetDescription(), + BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(), + BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(), + StlDate = data.order.StlDate, }; var saveRlt = await Save(dto);