修改舱位导出

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

@@ -429,5 +429,8 @@ namespace DS.WMS.Core.Op.Entity
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "提单类型（MBL-Master单,HBL-House单）", Length = 20, IsNullable = true)]
         public string BLIssueType { get; set; }
+
+
+
     }
 }

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

@@ -1014,7 +1014,7 @@ namespace DS.WMS.Core.Op.Method
             BookingSlotBase model = null;
 
             //接口方法直接调用save、delete等方法会报错，可能因为非token授权登录导致，故重写一遍保存、删除代码
-            if (dto.OpType == "add" || dto.OpType == "update" || dto.OpType == "del" || dto.OpType == "cancellation" || dto.OpType == "back")
+            if (dto.OpType == "add" || dto.OpType == "update" || dto.OpType == "del" || dto.OpType == "cancellation" || dto.OpType == "back" || dto.OpType == "backcreate")
             {
                 //翻译船公司
                 if (!string.IsNullOrWhiteSpace(dto.DataObj.CarrierCode) && string.IsNullOrWhiteSpace(dto.DataObj.CarrierCode))
@@ -1504,6 +1504,20 @@ namespace DS.WMS.Core.Op.Method
                     //await InsLog("Cancellation", model.Id, "取消舱位");
                 }
                 else if (dto.OpType == "back")
+                {
+                    /*
+                     back-返还舱位
+                     1、（如果有对应舱位）删除舱位与订单的关系
+                     */
+                    var slotNO = dto.DataObj.SlotBookingNo;
+                    model = await tenantDb.Queryable<BookingSlotBase>().FirstAsync(x => x.SlotBookingNo == slotNO);
+
+                    if(model != null)
+                    {
+
+                    }
+                }
+                else if (dto.OpType == "backcreate")
                 {
                     /*
                      back-返还舱位
@@ -3511,7 +3525,7 @@ namespace DS.WMS.Core.Op.Method
 
             //var sql = select.OrderByDescending(u => u.CreatedTime).ToSqlString();
 
-            var entities = await select.OrderByDescending(u => u.Id).ToListAsync();
+            var entities = await select.OrderByDescending(a => a.Id).ToListAsync();
 
             var data = entities.Adapt<List<BookingSlotBaseDto>>();
 
@@ -3647,20 +3661,24 @@ namespace DS.WMS.Core.Op.Method
 
             }
 
-            string fileRoot = AppSetting.app(new string[] { "FileSettings", "BasePath" });
+            var basePath = AppSetting.app(new string[] { "ExportFileSettings", "BasePath" });
-            string relativePath = AppSetting.app(new string[] { "FileSettings", "RelativePath" });
+            var relativePath = AppSetting.app(new string[] { "ExportFileSettings", "RelativePath" });
+            var dirAbs = string.Empty;
+            var fileRelaPath = string.Empty;
+            var fileAbsPath = string.Empty;
+            if (string.IsNullOrEmpty(basePath))
+            {
+                dirAbs = Path.Combine(_environment.WebRootPath ?? "", relativePath);
+            }
+            else
+            {
+                dirAbs = Path.Combine(basePath, relativePath);
+            }
 
-            var tempDic = Path.Combine(fileRoot, relativePath, DateTime.Now.Ticks.ToString());
+            if (!Directory.Exists(dirAbs))
-            Directory.CreateDirectory(tempDic);
+                Directory.CreateDirectory(dirAbs);
-            var fileAbsPath = Path.Combine(tempDic, "");
 
-            //var opt = App.GetOptions<PrintTemplateOptions>();
+            fileAbsPath = Path.Combine(dirAbs, "舱位信息导出模板.xlsx");
-            //var dirAbs = opt.basePath;
-            //if (string.IsNullOrEmpty(dirAbs))
-            //{
-            //    dirAbs = App.WebHostEnvironment.WebRootPath;
-            //}
-            //var fileAbsPath = Path.Combine(dirAbs, "upload/printtemplate/舱位信息导出模板.xlsx");
             if (!File.Exists(fileAbsPath))
             {
                 //舱位台账导出模板【舱位台账导出模板】文件不存在

ds-wms-service/DS.WMS.OpApi/appsettings.json

@@ -120,7 +120,7 @@
       "Port": 465,
       "UseSSL": true,
       "Receivers": "daisusu@dongshengsoft.com",
-      "Content" : ""
+      "Content": ""
     }
   },
   "FeeService": {
@@ -139,5 +139,10 @@
     "MQQueueNameDingCang": "djy.output.dingcang.ds6",
     "MQExchangeNameFangCang": "djy.output.dingcang.ds6",
     "MQQueueNameFangCang": "djy.output.dingcang.ds6_fangcang"
+  },
+  "ExportFileSettings": {
+    "BasePath": "", //基础路径，不配置则使用当前系统目录
+    "RelativePath": "ExportTemplate",
+    "FileType": [ ".xls", ".xlsx" ]
   }
 }