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

ds-wms-service/DS.WMS.Core/Sys/Dtos/SysPrintTemplateReq.cs

@@ -23,6 +23,10 @@ namespace DS.WMS.Core.Sys.Dtos
         /// </summary>
         public long ModuleId { get; set; }
         /// <summary>
+        /// 打印模块唯一编码
+        /// </summary>
+        public string ModuleCode { get; set; }
+        /// <summary>
         ///打印模板唯一编码
         /// </summary>
         [Description("打印模板唯一编码")]

ds-wms-service/DS.WMS.Core/Sys/Dtos/SysPrintTemplateRes.cs

@@ -23,6 +23,10 @@ namespace DS.WMS.Core.Sys.Dtos
         /// </summary>
         public long ModuleId { get; set; }
         /// <summary>
+        /// 打印模块唯一编码
+        /// </summary>
+        public string ModuleCode { get; set; }
+        /// <summary>
         ///打印模板唯一编码
         /// </summary>
         [Description("打印模板唯一编码")]

ds-wms-service/DS.WMS.Core/Sys/Entity/SysPrintTemplate.cs

@@ -15,6 +15,11 @@ public class SysPrintTemplate : BaseTenantModel<long>
     [SqlSugar.SugarColumn(ColumnDescription = "打印模块Id", IsNullable = false, DefaultValue = "0")]
     public long ModuleId { get; set; }
     /// <summary>
+    /// 打印模块唯一编码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "打印模块唯一编码", IsNullable = false, Length = 100)]
+    public string ModuleCode { get; set; }
+    /// <summary>
     ///打印模板唯一编码
     /// </summary>
     [Description("打印模板唯一编码")]

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

@@ -62,6 +62,29 @@ public class BookingGoodsStatusConfigController : ApiController
         var res = _invokeService.GetBookingGoodsStatusConfigInfo(id);
         return res;
     }
-    
+    /// <summary>
-     
+    /// 批量删除
+    /// </summary>
+    /// <param name="req">主表Ids</param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("BatchDelBookingStatusConfig")]
+    public DataResult BatchDelBookingStatusConfig([FromBody] IdModel req)
+    {
+        var res = _invokeService.BatchDelBookingStatusConfig(req);
+        return res;
+    }
+    /// <summary>
+    /// 按Excel导入订舱货物状态
+    /// </summary>
+    /// <param name="file">Excel文件</param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("ImportBookingStatusConfigByExcel")]
+    public async Task<DataResult<string>> ImportBookingStatusConfigByExcel(IFormFile file)
+    {
+        var res = await _invokeService.ImportBookingStatusConfigByExcel(file);
+        return res;
+    }
+
 }