1

Myshipping.Application/Entity/BookingOrderSFExpressDelivery.cs

@@ -0,0 +1,135 @@
+using System;
+using SqlSugar;
+using System.ComponentModel;
+using Myshipping.Core.Entity;
+namespace Myshipping.Application.Entity
+{
+    /// <summary>
+    /// 发送快递
+    /// </summary>
+    [SugarTable("booking_order_sfexpressdelivery")]
+    [Description("发送快递")]
+    public class BookingOrderSFExpressDelivery : DBEntityTenant
+    {
+        /// <summary>
+        /// 快递号
+        /// </summary>
+        public string KDNO { get; set; }
+        /// <summary>
+        /// 快递日期
+        /// </summary>
+        public DateTime? Date { get; set; }
+        /// <summary>
+        /// 快递状态
+        /// </summary>
+        public string State { get; set; }
+        /// <summary>
+        /// 快递公司
+        /// </summary>
+        public string KDCompany { get; set; }
+        /// <summary>
+        /// 快递类型
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// 收件公司
+        /// </summary>
+        public string SJCompany { get; set; }
+        /// <summary>
+        /// 收件人
+        /// </summary>
+        public string SJPeople { get; set; }
+        /// <summary>
+        /// 收件省份
+        /// </summary>
+        public string SJProvince { get; set; }
+        /// <summary>
+        /// 收件城市
+        /// </summary>
+        public string SJCity { get; set; }
+        /// <summary>
+        /// 收件地址
+        /// </summary>
+        public string SJAddress { get; set; }
+        /// <summary>
+        /// 收件邮编
+        /// </summary>
+        public string SJPostCode { get; set; }
+        /// <summary>
+        /// 收件电话
+        /// </summary>
+        public string SJTel { get; set; }
+        /// <summary>
+        /// 发件公司
+        /// </summary>
+        public string FJCompany { get; set; }
+        /// <summary>
+        /// 发件人
+        /// </summary>
+        public string FJPeople { get; set; }
+        /// <summary>
+        /// 发件省份
+        /// </summary>
+        public string FJProvince { get; set; }
+        /// <summary>
+        /// 发件城市
+        /// </summary>
+        public string FJCity { get; set; }
+        /// <summary>
+        /// 发件地址
+        /// </summary>
+        public string FJAddress { get; set; }
+        /// <summary>
+        /// 发件邮编
+        /// </summary>
+        public string FJPostCode { get; set; }
+        /// <summary>
+        /// 发件电话
+        /// </summary>
+        public string FJTel { get; set; }
+        /// <summary>
+        /// 品名
+        /// </summary>
+        public string GOODSNAME { get; set; }
+        /// <summary>
+        /// 寄件数量
+        /// </summary>
+        public int? KDNum { get; set; }
+        /// <summary>
+        /// 快递费
+        /// </summary>
+        public decimal? KDFee { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string YWType { get; set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public string KDCode { get; set; }
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string VESSEL { get; set; }
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VOYNO { get; set; }
+        /// <summary>
+        /// 委托单位
+        /// </summary>
+        public string WTUnit { get; set; }
+        /// <summary>
+        /// ETD
+        /// </summary>
+        public DateTime? SETD { get; set; }
+        /// <summary>
+        /// ETD
+        /// </summary>
+        public DateTime? EETD { get; set; }
+    }
+}

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1210,14 +1210,16 @@ namespace Myshipping.Application
                 {
                     _GoodsConfig.InitGoodsStatusConfig((long)main.CreatedUserId, main.CreatedUserName);
                     config = _goodsStatusConfig.AsQueryable().Filter(null, true).Where(config => config.CreatedUserId == main.CreatedUserId).ToList().DistinctBy(x => x.StatusName).ToList();
-                    if (!string.IsNullOrEmpty(entity.MBLNO))
+                    if (!string.IsNullOrEmpty(entity.CUSTNO))
                     {
-                        var Config = config.Where(x => x.SystemCode == "YSDBC").FirstOrDefault();
+                        var Config = config.Where(x => x.SystemCode == "YDC").FirstOrDefault();
                         if (Config != null)
                         {
+
                             var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == Config.Id);
                             if (Status == null)
                             {
+
                                 await _goodsStatus.InsertAsync(new BookingGoodsStatus
                                 {
                                     bookingId = Id,
@@ -1241,19 +1243,16 @@ namespace Myshipping.Application
                                     it.BOOKINGNO
                                 }).ExecuteCommandAsync();
                             }
-                           
                         }
                     }
-                    if (!string.IsNullOrEmpty(entity.CUSTNO))
+                    if (!string.IsNullOrEmpty(entity.MBLNO))
                     {
-                        var Config = config.Where(x => x.SystemCode == "YDC").FirstOrDefault();
+                        var Config = config.Where(x => x.SystemCode == "YSDBC").FirstOrDefault();
                         if (Config != null)
                         {
-
                             var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == Config.Id);
                             if (Status == null)
                             {
-
                                 await _goodsStatus.InsertAsync(new BookingGoodsStatus
                                 {
                                     bookingId = Id,
@@ -1277,17 +1276,18 @@ namespace Myshipping.Application
                                     it.BOOKINGNO
                                 }).ExecuteCommandAsync();
                             }
+                           
                         }
                     }
+                   
                 }
                 else
                 {
-                    if (!string.IsNullOrEmpty(entity.MBLNO))
+                    if (!string.IsNullOrEmpty(entity.CUSTNO))
                     {
-                        var Config = config.Where(x => x.SystemCode == "YSDBC").FirstOrDefault();
+                        var Config = config.Where(x => x.SystemCode == "YDC").FirstOrDefault();
                         if (Config != null)
                         {
-
                             var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == Config.Id);
                             if (Status == null)
                             {
@@ -1315,14 +1315,16 @@ namespace Myshipping.Application
                                     it.BOOKINGNO
                                 }).ExecuteCommandAsync();
                             }
-                        
+
+
                         }
                     }
-                    if (!string.IsNullOrEmpty(entity.CUSTNO))
+                    if (!string.IsNullOrEmpty(entity.MBLNO))
                     {
-                        var Config = config.Where(x => x.SystemCode == "YDC").FirstOrDefault();
+                        var Config = config.Where(x => x.SystemCode == "YSDBC").FirstOrDefault();
                         if (Config != null)
                         {
+
                             var Status = _goodsStatus.FirstOrDefault(x => x.bookingId == Id && x.ConfigId == Config.Id);
                             if (Status == null)
                             {
@@ -1350,10 +1352,10 @@ namespace Myshipping.Application
                                     it.BOOKINGNO
                                 }).ExecuteCommandAsync();
                             }
-
-                           
+                        
                         }
                     }
+           
                 }