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

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

@@ -36,6 +36,15 @@ namespace DS.WMS.Core.Op.Dtos
         /// 客户类别名称
         /// </summary>
         public string CustomerTypeName { get; set; }
+
+        /// <summary>
+        /// 客户Id
+        /// </summary>
+        public long CustomerId { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomerName { get; set; }
         /// <summary>
         /// 联系人
         /// </summary>

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

@@ -36,6 +36,14 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         public string CustomerTypeName { get; set; }
         /// <summary>
+        /// 客户Id
+        /// </summary>
+        public long CustomerId { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomerName { get; set; }
+        /// <summary>
         /// 联系人
         /// </summary>
         public string Name { get; set; }

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

@@ -1029,6 +1029,43 @@ public class SeaExportReq
     /// 拆票或合票标志 1-拆票 2-合票
     /// </summary>
     public int SplitOrMergeFlag { get; set; }
+
+    /// <summary>
+    /// Desc:单证人员
+    /// </summary>
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 操作员名称
+    /// </summary>
+    public string OperatorName { get; set; }
+    /// <summary>
+    /// 客服名称
+    /// </summary>
+    public string CustomerServiceName { get; set; }
+
+    /// <summary>
+    /// 外国客服名称
+    /// </summary>
+    public string ForeignCustomerServiceName { get; set; }
+    /// <summary>
+    /// 截VGM时间
+    /// </summary>
+    public DateTime? VGMCloseDate { get; set; }
+
+    /// <summary>
+    /// 单证备注
+    /// </summary>
+    public string DocRemark { get; set; }
+    /// <summary>
+    /// 操作备注
+    /// </summary>
+    public string OperatorRemark { get; set; }
+
+    /// <summary>
+    /// 申请箱使
+    /// </summary>
+    public string ApplyCtnRemark { get; set; }
 }
 
 /// <summary>

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

@@ -1,4 +1,6 @@
 using DS.Module.Core;
+using DS.Module.Core.Enums;
+using Masuit.Tools.Systems;
 using SqlSugar;
 
 namespace DS.WMS.Core.Op.Dtos;
@@ -32,11 +34,15 @@ public class SeaExportRes
     /// 业务状态名称
     /// </summary>
     public string BusinessStatusName { get; set; } 
+
     /// <summary>
-    /// 整单费用状态
+    /// 整单费用审核状态
     /// </summary>
-    public BillAuditStatus BillFeeStatus { get; set; } = 0;
+    public BillAuditStatus BillAuditStatus { get; set; } = 0;
-
+    /// <summary>
+    /// 整单费用审核状态描述
+    /// </summary>
+    public string BillAuditStatusName => BillAuditStatus.GetDescription();
     /// <summary>
     /// 整单费用状态时间
     /// </summary>
@@ -56,31 +62,56 @@ public class SeaExportRes
     /// </summary>
     public bool? IsFeeLocking { get; set; } = false;
      
+
     /// <summary>
     /// 应收费用状态
     /// </summary>
-    public int ARFeeStatus { get; set; } = 0;
+    public BillFeeStatus? ARFeeStatus { get; set; }
+
+    /// <summary>
+    /// 应收费用状态描述
+    /// </summary>
+    public string ARFeeStatusName => ARFeeStatus?.GetDescription();
 
     /// <summary>
     /// 应付费用状态
     /// </summary>
-    public int APFeeStatus { get; set; } = 0;
+    public BillFeeStatus? APFeeStatus { get; set; }
+
+    /// <summary>
+    /// 应付费用状态描述
+    /// </summary>
+    public string APFeeStatusName => APFeeStatus?.GetDescription();
 
     /// <summary>
     /// 应收开票状态
     /// </summary>
-    public int ARInvoiceStatus { get; set; } = 0;
+    public BillInvoiceStatus? ARInvoiceStatus { get; set; }
+
+    /// <summary>
+    /// 应收费用状态描述
+    /// </summary>
+    public string ARInvoiceStatusName => ARInvoiceStatus?.GetDescription();
 
     /// <summary>
     /// 应付开票状态
     /// </summary>
-    public int APInvoiceStatus { get; set; } = 0;
+    public BillInvoiceStatus? APInvoiceStatus { get; set; }
 
+    /// <summary>
+    /// 应付费用状态描述
+    /// </summary>
+    public string APInvoiceStatusName => APInvoiceStatus?.GetDescription();
 
     /// <summary>
     /// 应收对账状态
     /// </summary>
-    public int ARCheckStatus { get; set; } = 0;
+    public BillCheckStatusEnum? ARCheckStatus { get; set; }
+
+    /// <summary>
+    /// 应收对账状态描述
+    /// </summary>
+    public string ARCheckStatusName => ARCheckStatus?.GetDescription();
     /// <summary>
     /// 录入日期
     /// </summary>
@@ -1145,4 +1176,42 @@ public class SeaExportRes
     /// 预付地点Id
     /// </summary>
     public long PayableAtId { get; set; }
+
+
+    /// <summary>
+    /// Desc:单证人员
+    /// </summary>
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 操作员名称
+    /// </summary>
+    public string OperatorName { get; set; }
+    /// <summary>
+    /// 客服名称
+    /// </summary>
+    public string CustomerServiceName { get; set; }
+
+    /// <summary>
+    /// 外国客服名称
+    /// </summary>
+    public string ForeignCustomerServiceName { get; set; }
+    /// <summary>
+    /// 截VGM时间
+    /// </summary>
+    public DateTime? VGMCloseDate { get; set; }
+
+    /// <summary>
+    /// 单证备注
+    /// </summary>
+    public string DocRemark { get; set; }
+    /// <summary>
+    /// 操作备注
+    /// </summary>
+    public string OperatorRemark { get; set; }
+
+    /// <summary>
+    /// 申请箱使
+    /// </summary>
+    public string ApplyCtnRemark { get; set; }
 }

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

@@ -38,6 +38,16 @@ namespace DS.WMS.Core.Op.Entity
         [SugarColumn(ColumnDescription = "客户类别名称", Length = 50, IsNullable = true)]
         public string CustomerTypeName { get; set; }
         /// <summary>
+        /// 客户Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "客户Id")]
+        public long CustomerId { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "客户名称", Length = 100, IsNullable = true)]
+        public string CustomerName { get; set; }
+        /// <summary>
         /// 联系人
         /// </summary>
         [SugarColumn(ColumnDescription = "联系人", Length = 50, IsNullable = true)]

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

@@ -27,29 +27,6 @@ public class SeaExport : BaseOrgModel<long>
     /// </summary>
     [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = true, Length = 50)]
     public string BusinessStatusName { get; set; } 
-    ///// <summary>
-    ///// 单据费用状态
-    ///// </summary>
-    //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态", IsNullable = false, DefaultValue = "0")]
-    //public int BillFeeStatus { get; set; }
-    ///// <summary>
-    ///// 单据费用状态名称
-    ///// </summary>
-    //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态名称", IsNullable = true, Length = 50)]
-    //public string BillFeeStatusName { get; set; }
-    ///// <summary>
-    ///// 单据费用状态时间
-    ///// </summary>
-    //[SqlSugar.SugarColumn(ColumnDescription = "单据费用状态时间", IsNullable = true)]
-    //public DateTime?   BillFeeStatusTime { get; set; }
-
-    ///// <summary>
-    ///// 费用状态
-    ///// </summary>
-    //[SqlSugar.SugarColumn(ColumnDescription = "费用状态", IsNullable = false, DefaultValue = "0")]
-    //public int FeeStatus { get; set; }
-
-
     /// <summary>
     /// Desc:是否业务锁定
     /// </summary>
@@ -1351,4 +1328,49 @@ public class SeaExport : BaseOrgModel<long>
     /// </summary>
     [SqlSugar.SugarColumn(ColumnDescription = "拆票或合票标志 1-拆票 2-合票", IsNullable = true,DefaultValue = "0")]
     public int SplitOrMergeFlag { get; set; }
+
+    /// <summary>
+    /// Desc:单证人员
+    /// </summary>
+    [SugarColumn(ColumnDescription = "单证人员", IsNullable = true, Length = 30)]
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 操作员名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作员", IsNullable = true, Length = 30)]
+    public string OperatorName { get; set; }
+    /// <summary>
+    /// 客服名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "客服名称", IsNullable = true,Length = 30)]
+    public string CustomerServiceName { get; set; }
+
+    /// <summary>
+    /// 外国客服名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "外国客服名称", IsNullable = true, Length = 30)]
+    public string ForeignCustomerServiceName { get; set; }
+    /// <summary>
+    /// 截VGM时间
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "截VGM时间", IsNullable = true)]
+    public DateTime? VGMCloseDate { get; set; }
+
+    /// <summary>
+    /// 单证备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "单证备注", IsNullable = true, Length = 100)]
+    public string DocRemark { get; set; }
+    /// <summary>
+    /// 操作备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作备注", IsNullable = true, Length = 100)]
+    public string OperatorRemark { get; set; }
+
+    /// <summary>
+    /// 申请箱使
+    /// </summary>
+    [SugarColumn(ColumnDescription = "申请箱使", IsNullable = true, Length = 100)]
+    public string ApplyCtnRemark { get; set; }
 }

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -622,6 +622,8 @@ public partial class SeaExportService : ISeaExportService
                     addList.Add(new BusinessOrderContact()
                     {
                         BusinessId = seaExport.Id,
+                        CustomerId = seaExport.CustomerId,
+                        CustomerName = seaExport.CustomerName,
                         CustomerType = "controller",
                         CustomerTypeName="委托单位",
                         Name = defaultContact.ShortName,
@@ -641,6 +643,8 @@ public partial class SeaExportService : ISeaExportService
                     addList.Add(new BusinessOrderContact()
                     {
                         BusinessId = seaExport.Id,
+                        CustomerId = seaExport.TruckerId,
+                        CustomerName = seaExport.Trucker,
                         CustomerType = "truck",
                         CustomerTypeName = "车队",
                         Name = defaultContact.ShortName,
@@ -660,6 +664,8 @@ public partial class SeaExportService : ISeaExportService
                     addList.Add(new BusinessOrderContact()
                     {
                         BusinessId = seaExport.Id,
+                        CustomerId = seaExport.YardId,
+                        CustomerName = seaExport.Yard,
                         CustomerType = "yard",
                         CustomerTypeName = "场站",
                         Name = defaultContact.ShortName,
@@ -669,7 +675,27 @@ public partial class SeaExportService : ISeaExportService
                 }
             }
         }
-
+        if (seaExport.ForwarderId != 0)
+        {
+            var defaultContact = sqlSugarScope.Queryable<InfoClientContact>().Where(x => x.ClientId == seaExport.ForwarderId && x.IsOperator == true).First();
+            if (defaultContact.IsNotNull())
+            {
+                if (!contactLists.Where(x => x.BusinessType == BusinessType.OceanShippingExport && x.CustomerType == "booking" && x.Name == defaultContact.ShortName).Any())
+                {
+                    addList.Add(new BusinessOrderContact()
+                    {
+                        BusinessId = seaExport.Id,
+                        CustomerId = seaExport.ForwarderId,
+                        CustomerName = seaExport.Forwarder,
+                        CustomerType = "booking",
+                        CustomerTypeName = "订舱公司",
+                        Name = defaultContact.ShortName,
+                        Tel = defaultContact.Tel,
+                        Email = defaultContact.Email,
+                    });
+                }
+            }
+        }
         if (addList.Count > 0)
             sqlSugarScope.Insertable(addList).ExecuteCommand();
     }

ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs

@@ -130,12 +130,12 @@ namespace DS.WMS.MainApi.Controllers
 
 
         /// <summary>
-        /// 获取Json打印信息
+        /// 获取Json本地打印信息
         /// </summary>
         /// <param name="req"></param>
         /// <returns></returns>
         [HttpPost]
-        [Route("GetOpenJsonPrintInfo")]
+        [Route("GetJsonPrintInfoAsync")]
         public async Task<DataResult<string>> GetJsonPrintInfoAsync([FromBody] OpenJsonPrintReq req)
         {
 

ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs

@@ -18,7 +18,7 @@ namespace DS.WMS.PrintApi.Service
             {
                 using (var db = SqlSugarUtil.GetInstance())
                 {
-                    var template = db.Queryable<SysPrintTemplate>().Where(x => x.Id == req.TemplateId).First();
+                    var template = db.Queryable<SysPrintTemplate>().Filter(null,true).Where(x => x.Id == req.TemplateId).First();
                     if (template == null)
                     {
                         return await Task.FromResult(PrintDataResult.Failed("打印模板不存在!"));

ds-wms-service/DS.WMS.Test/SaasTest.cs

@@ -81,7 +81,7 @@ public class SaasTest
     {
         var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
         StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 
-        tenantDb.CodeFirst.InitTables(typeof(BookingOrderUrl));
+        tenantDb.CodeFirst.InitTables(typeof(SeaExport));
         //tenantDb.CodeFirst.InitTables(typeof(BookingStatusLog));
         //tenantDb.CodeFirst.InitTables(typeof(BookingStatus));
         //tenantDb.CodeFirst.InitTables(typeof(BookingStatusLogDetail));