From e001065463ae82206ebf72b4bf6fc81459b2a6cf Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Tue, 29 Oct 2024 18:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VOLTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj |  1 +
 .../DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs      | 53 ++++++++++---------
 .../Op/Entity/BLIssueManage/BLManageBase.cs   | 53 +++++++++++++++++++
 3 files changed, 82 insertions(+), 25 deletions(-)
 create mode 100644 ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs

diff --git a/ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj b/ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj
index 96cee4a7..cd8adcdf 100644
--- a/ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj
+++ b/ds-wms-service/DS.WMS.Core/DS.WMS.Core.csproj
@@ -40,6 +40,7 @@
       <Folder Include="Op\Dtos\TaskInteraction\" />
       <Folder Include="Op\Entity\TaskInteraction\" />
       <Folder Include="Op\Interface\TaskInteraction\" />
+      <Folder Include="Op\Interface\新文件夹\" />
       <Folder Include="Op\Method\TaskInteraction\" />
       <Folder Include="TaskPlat\Interface\VGM\" />
       <Folder Include="TaskPlat\Interface\PODDischargeGateoutFull\" />
diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs
index c9929a44..65c30a7d 100644
--- a/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/EDI/VOLTAEdiHelper.cs
@@ -1067,35 +1067,38 @@ namespace DS.WMS.Core.Op.EDI
 
                     for (var i = 0; i < ShippingList.Count; i++)
                     {
-                        if (ShippingList[i] != "")
+                        if (!string.IsNullOrWhiteSpace(ShippingList[i]))
                         {
-                            if (m <= 5)
-                            {
-                                if (m == 1) strtemp = "47:" + ShippingList[i] + ":";
-                                else
-                                {
-                                    if (m == 5)
-                                        strtemp = strtemp + ShippingList[i];
-                                    else
-                                        strtemp = strtemp + ShippingList[i] + ":";
-                                }
-                            }
-                            else
-                            {
-                                m = 1;
-                                r.WriteLine(strtemp + "'");
-                                strtemp = "47:" + ShippingList[i] + ":";
-                                icount = icount + 1;
-                            }
-                            m = m + 1;
+                            r.WriteLine("47:" + ShippingList[i]);
+                            icount = icount + 1;
+
+                            //if (m <= 5)
+                            //{
+                            //    if (m == 1) strtemp = "47:" + ShippingList[i] + ":";
+                            //    else
+                            //    {
+                            //        if (m == 5)
+                            //            strtemp = strtemp + ShippingList[i];
+                            //        else
+                            //            strtemp = strtemp + ShippingList[i] + ":";
+                            //    }
+                            //}
+                            //else
+                            //{
+                            //    m = 1;
+                            //    r.WriteLine(strtemp + "'");
+                            //    strtemp = "47:" + ShippingList[i] + ":";
+                            //    icount = icount + 1;
+                            //}
+                            //m = m + 1;
                         }
                     }
                 }
-                if (!string.IsNullOrWhiteSpace(strtemp))
-                {
-                    r.WriteLine(strtemp + "'");
-                    icount = icount + 1;
-                }
+                //if (!string.IsNullOrWhiteSpace(strtemp))
+                //{
+                //    r.WriteLine(strtemp + "'");
+                //    icount = icount + 1;
+                //}
 
                 var ISSOC = "N";
                 if (bill.ISCONTAINERSOC) ISSOC = "Y";
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs
new file mode 100644
index 00000000..2c31bf97
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLManageBase.cs
@@ -0,0 +1,53 @@
+using DS.Module.Core.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Entity.BLManage
+{
+    /// <summary>
+    /// 提单管理主信息
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_bl_issue_base", "提单管理主信息")]
+    public class BLManageBase : BaseModel<long>
+    {
+        /// <summary>
+        /// 订舱主键,关联订舱主表ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱主键", IsNullable = true)]
+        public long BookingId { get; set; }
+
+
+        /// <summary>
+        /// 单证编号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "单证编号", Length = 64, IsNullable = true)]
+        public string BLNo { get; set; }
+
+        /// <summary>
+        /// 单证类型
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "单证类型", Length = 20, IsNullable = true)]
+        public string BLType { get; set; }
+
+        /// <summary>
+        /// 单证类型名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "单证类型名称", Length = 50, IsNullable = true)]
+        public string BLTypeName { get; set; }
+
+        /// <summary>
+        /// 状态代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态代码", Length = 20, IsNullable = true)]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 状态名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态名称", Length = 50, IsNullable = true)]
+        public string StatusName { get; set; }
+    }
+}