From d958422332378b4e55f58f1c582d6dcae98d6dba Mon Sep 17 00:00:00 2001 From: cjy Date: Thu, 8 Aug 2024 16:23:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E5=88=86=E9=83=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E8=88=B1=E4=BD=8D=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E5=87=BA=E5=8D=95=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Dtos/SeaExportReq.cs | 14 +++++++++ .../DS.WMS.Core/Op/Dtos/SeaExportRes.cs | 10 ++++++ .../DS.WMS.Core/Op/Entity/SeaExport.cs | 31 ++++++++++++++++--- .../DS.WMS.Core/Op/Method/SeaExportService.cs | 9 +++--- .../DS.WMS.Core/Sys/Method/CommonService.cs | 3 ++ 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs index 16aca35d..178a6334 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -1158,6 +1158,20 @@ public class SeaExportReq /// 航线代码 /// public string LaneCode { get; set; } + + /// + /// 所属分部名称 + /// + public long SaleOrgName { get; set; } + /// + /// 舱位类型 + /// + public string ShippingSpaceType { get; set; } + + /// + /// 出单方式 + /// + public string IssuingWay { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs index 094871be..1c44832e 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs @@ -1354,4 +1354,14 @@ public class SeaExportRes /// 航线代码 /// public string LaneCode { get; set; } + + /// + /// 舱位类型 + /// + public string ShippingSpaceType { get; set; } + + /// + /// 出单方式 + /// + public string IssuingWay { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index b6f5b38c..92072894 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs @@ -723,11 +723,7 @@ public class SeaExport : BaseOrgModel [SugarColumn(ColumnDescription = "运费协议号", IsNullable = true, Length = 100)] public string ContractNo { get; set; } - /// - /// 订舱类型 - /// - [SugarColumn(ColumnDescription = "订舱类型", IsNullable = true, Length = 50)] - public string BookingType { get; set; } + /// /// 订舱编号 @@ -1523,4 +1519,29 @@ public class SeaExport : BaseOrgModel /// [SugarColumn(ColumnDescription = "签单地点代码", IsNullable = true, Length = 100)] public string IssuePlaceCode { get; set; } + + /// + /// 所属分部名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "所属分部名称", IsNullable = true, Length = 100)] + public long SaleOrgName { get; set; } + + + /// + /// 订舱类型 + /// + [SugarColumn(ColumnDescription = "订舱类型", IsNullable = true, Length = 50)] + public string BookingType { get; set; } + + /// + /// 舱位类型 + /// + [SugarColumn(ColumnDescription = "舱位类型", IsNullable = true, Length = 50)] + public string ShippingSpaceType { get; set; } + + /// + /// 出单方式 + /// + [SugarColumn(ColumnDescription = "出单方式", IsNullable = true, Length = 50)] + public string IssuingWay { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 4b2fafc4..618c14c5 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -336,12 +336,11 @@ public partial class SeaExportService : ISeaExportService var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); var result = tenantDb.Queryable() .InnerJoin((a, b) => a.Id == b.BusinessId) - .LeftJoin((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org") - .LeftJoin((a, b, c, d) => a.SaleDeptId == d.Id, "shippingweb8_dev.sys_org") - .Select((a, b, c, d) => new SeaExportRes() + //.LeftJoin((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org") + .LeftJoin((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org") + .Select((a, b, c) => new SeaExportRes() { - SaleOrgName = c.OrgName, - SaleDeptName = d.OrgName, + SaleDeptName = c.OrgName, }, true)//true表示 其余字段自动映射，根据字段名字 //.Select() diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs index 769857a6..12a5cd01 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs @@ -1821,6 +1821,9 @@ public class CommonService : ICommonService case "const": //常量方式 sequenceNewNo += item.RuleValue; break; + //case "variable": //变量方式 TODO + // sequenceNewNo += item.RuleValue; + //break; case "shortdate": //短日期 年2位月2位日期2位 sequenceNewNo += DateTime.Now.ToString("yyyyMMdd").Substring(2); break; From ad29265ac461e3a449b075454a04f45b6678a49d Mon Sep 17 00:00:00 2001 From: cjy Date: Thu, 8 Aug 2024 16:42:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs | 2 +- ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs index 178a6334..f97cda69 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -1162,7 +1162,7 @@ public class SeaExportReq /// /// 所属分部名称 /// - public long SaleOrgName { get; set; } + public string SaleOrgName { get; set; } /// /// 舱位类型 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index 92072894..bd2828a8 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs @@ -1524,7 +1524,7 @@ public class SeaExport : BaseOrgModel /// 所属分部名称 /// [SqlSugar.SugarColumn(ColumnDescription = "所属分部名称", IsNullable = true, Length = 100)] - public long SaleOrgName { get; set; } + public string SaleOrgName { get; set; } ///