1

Myshipping.Application/Entity/BookingOrderSFExpressdeliveryBusiness.cs

@@ -0,0 +1,103 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("booking_order_sfexpressdelivery_business")]
+    [Description("")]
+    public class BookingOrderSFExpressdeliveryBusiness : DBEntityTenant
+    {
+        /// <summary>
+        /// 父键
+        /// </summary>
+        public long? PId { get; set; }
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string BusinessType { get; set; }
+        /// <summary>
+        /// 业务状态
+        /// </summary>
+        public string BusinessStatus { get; set; }
+        /// <summary>
+        /// 更改单
+        /// </summary>
+        public string ChangeOrder { get; set; }
+        /// <summary>
+        /// 会计期间
+        /// </summary>
+        public DateTime? Accounting { get; set; }
+        /// <summary>
+        /// 业务日期
+        /// </summary>
+        public DateTime? BusinessDate { get; set; }
+        /// <summary>
+        /// 委托单位
+        /// </summary>
+        public string WEITUO { get; set; }
+        /// <summary>
+        /// 委托号
+        /// </summary>
+        public string WEITUOCode { get; set; }
+        /// <summary>
+        /// 运费协议号
+        /// </summary>
+        public string contractno { get; set; }
+        /// <summary>
+        /// 服务合同号
+        /// </summary>
+        public string FWContract { get; set; }
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+        /// <summary>
+        /// 分提单号
+        /// </summary>
+        public string HBLNO { get; set; }
+        /// <summary>
+        /// 开船日期
+        /// </summary>
+        public string ETD { get; set; }
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string VESSEL { get; set; }
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VOYNO { get; set; }
+        /// <summary>
+        /// 业务员
+        /// </summary>
+        public string BSPO { get; set; }
+        /// <summary>
+        /// 操作员
+        /// </summary>
+        public string OPPO { get; set; }
+        /// <summary>
+        /// 单证
+        /// </summary>
+        public string DOC { get; set; }
+        /// <summary>
+        /// 客服
+        /// </summary>
+        public string CUSTSERVICE { get; set; }
+        /// <summary>
+        /// 起运港
+        /// </summary>
+        public string PORTLOAD { get; set; }
+        /// <summary>
+        /// 目的港
+        /// </summary>
+        public string DESTINATION { get; set; }
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        public string CARRIER { get; set; }
+    }
+}

Myshipping.Application/Entity/BookingOrderSFExpressdeliveryDetail.cs

@@ -0,0 +1,107 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [SugarTable("booking_order_sfexpressdelivery_detail")]
+    [Description("")]
+    public class BookingOrderSFExpressdeliveryDetail : DBEntityTenant
+    {
+        /// <summary>
+        /// 父键
+        /// </summary>
+        public long? PId { get; set; }
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string DJCode { get; set; }
+        /// <summary>
+        /// 委托编号
+        /// </summary>
+        public string WTCode { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomName { get; set; }
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string BusinessType { get; set; }
+        /// <summary>
+        /// 销售
+        /// </summary>
+        public string Sale { get; set; }
+        /// <summary>
+        /// 操作
+        /// </summary>
+        public string Operate { get; set; }
+        /// <summary>
+        /// 接单人
+        /// </summary>
+        public string JDMan { get; set; }
+        /// <summary>
+        /// 接单日期
+        /// </summary>
+        public DateTime? JDDate { get; set; }
+        /// <summary>
+        /// 送单人
+        /// </summary>
+        public string SDMan { get; set; }
+        /// <summary>
+        /// 送单日期
+        /// </summary>
+        public DateTime? SDDate { get; set; }
+        /// <summary>
+        /// 送单快递公司
+        /// </summary>
+        public string SDCompany { get; set; }
+        /// <summary>
+        /// 是否回单
+        /// </summary>
+        public bool? ISHuiDan { get; set; }
+        /// <summary>
+        /// 回单人
+        /// </summary>
+        public string HuiDanMan { get; set; }
+        /// <summary>
+        /// 回单日期
+        /// </summary>
+        public DateTime? HuiDanDate { get; set; }
+        /// <summary>
+        /// 是否还单
+        /// </summary>
+        public bool? IsHuanDan { get; set; }
+        /// <summary>
+        /// 还单人
+        /// </summary>
+        public string HuanDanMan { get; set; }
+        /// <summary>
+        /// 还单日期
+        /// </summary>
+        public DateTime? HuanDanDate { get; set; }
+        /// <summary>
+        /// 还单快递公司
+        /// </summary>
+        public string HuanDanCompany { get; set; }
+        /// <summary>
+        /// 还单快递号
+        /// </summary>
+        public string HuanDanKDNum { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}

Myshipping.Core/Util/JsonUtil.cs

@@ -196,11 +196,13 @@ public static class JsonUtil
                     prop.SetValue(model, sourceVal.ToString().Replace("’", "'"));
                     prop.SetValue(model, sourceVal.ToString().Replace("、", ","));
                     prop.SetValue(model, sourceVal.ToString().Replace(" ", " "));
-                    if (!Regex.IsMatch(sourceVal.ToString(), @"^[a-zA-Z0-9]+$") && propName.ToUpper() == "MBLNO")
-                    {
-                        return "提单号存在中文字符或特殊字符";
+                    if (propName.ToUpper() == "MBLNO"&&! string.IsNullOrEmpty(sourceVal.ToString())) {
+                     if (!Regex.IsMatch(sourceVal.ToString(), @"^[a-zA-Z0-9]+$"))
+                        {
+                            return "提单号存在中文字符或特殊字符";
+                        }
                     }
-
+ 
                     if (Regex.IsMatch(sourceVal.ToString(), @"[\u4e00-\u9fa5]") && propName.ToUpper() == "HBLNO")
                     {
                         return "分提单号存在中文字符";