Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -1158,6 +1158,20 @@ public class SeaExportReq
     /// 航线代码 
     /// </summary>
     public string LaneCode { get; set; }
+
+    /// <summary>
+    /// 所属分部名称 
+    /// </summary>
+    public string SaleOrgName { get; set; } 
+    /// <summary>
+    /// 舱位类型
+    /// </summary>
+    public string ShippingSpaceType { get; set; }
+
+    /// <summary>
+    /// 出单方式
+    /// </summary>
+    public string IssuingWay { get; set; }
 }
 
 /// <summary>

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -1354,4 +1354,14 @@ public class SeaExportRes
     /// 航线代码 
     /// </summary>
     public string LaneCode { get; set; }
+     
+    /// <summary>
+    /// 舱位类型
+    /// </summary>
+    public string ShippingSpaceType { get; set; }
+
+    /// <summary>
+    /// 出单方式
+    /// </summary>
+    public string IssuingWay { get; set; }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs

@@ -723,11 +723,7 @@ public class SeaExport : BaseOrgModel<long>
     [SugarColumn(ColumnDescription = "运费协议号", IsNullable = true, Length = 100)]
     public string ContractNo { get; set; }
 
-    /// <summary>
+    
-    /// 订舱类型
-    /// </summary>
-    [SugarColumn(ColumnDescription = "订舱类型", IsNullable = true, Length = 50)]
-    public string BookingType { get; set; }
 
     /// <summary>
     /// 订舱编号
@@ -1523,4 +1519,29 @@ public class SeaExport : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "签单地点代码", IsNullable = true, Length = 100)]
     public string IssuePlaceCode { get; set; }
+
+    /// <summary>
+    /// 所属分部名称 
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "所属分部名称", IsNullable = true, Length = 100)]
+    public string SaleOrgName { get; set; }
+
+      
+    /// <summary>
+    /// 订舱类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "订舱类型", IsNullable = true, Length = 50)]
+    public string BookingType { get; set; }
+
+    /// <summary>
+    /// 舱位类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "舱位类型", IsNullable = true, Length = 50)]
+    public string ShippingSpaceType { get; set; }
+
+    /// <summary>
+    /// 出单方式
+    /// </summary>
+    [SugarColumn(ColumnDescription = "出单方式", IsNullable = true, Length = 50)]
+    public string IssuingWay { get; set; }
 }

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<SeaExport>()
             .InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
-            .LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
+            //.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
-            .LeftJoin<SysOrg>((a, b, c, d) => a.SaleDeptId == d.Id, "shippingweb8_dev.sys_org")
+            .LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
-            .Select((a, b, c, d) => new SeaExportRes()
+            .Select((a, b, c) => new SeaExportRes()
             {
-                SaleOrgName = c.OrgName,
+                SaleDeptName  = c.OrgName,
-                SaleDeptName  = d.OrgName,
             },
                 true)//true表示 其余字段自动映射，根据字段名字
             //.Select<SeaExportRes>()

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;