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..f97cda69 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 string 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..bd2828a8 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 string 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 bbd4b497..29889b3d 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;