任务类型枚举名称修改

3 months ago · ae98cb9811
parent fcff2f3750
commit ae98cb9811
5 changed files with 52 additions and 53 deletions
--- a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs
+++ b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs
@ -191,46 +191,45 @@ namespace DS.Module.Core

        #region 工作流--主要流程
        /// <summary>
-        /// 待审单
+        /// 审单
        /// </summary>
-        [Description("待审单")]
+        [Description("审单")]
        WAIT_ORDER_AUDIT = 201,
        /// <summary>
-        /// 待订舱
+        /// 订舱
        /// </summary>
-        [Description("待订舱")]
+        [Description("订舱")]
        WAIT_BOOKING = 202,
        /// <summary>
-        /// 待收BC
+        /// 收BC
        /// </summary>
-        [Description("待收BC")]
+        [Description("收BC")]
        WAIT_BC = 203,
        /// <summary>
-        /// 待放舱
+        /// 放舱
        /// </summary>
-        [Description("待放舱")]
+        [Description("放舱")]
        WAIT_SPACE_RELEASE = 204,
        /// <summary>
-        /// 待提单确认
+        /// 提单确认
        /// </summary>
-        [Description("待提单确认")]
+        [Description("提单确认")]
        WAIT_BILL_CONFIRM = 205,
        /// <summary>
-        /// 待提交SI
+        /// 提交SI
        /// </summary>
-        [Description("待提交SI")]
+        [Description("提交SI")]
        WAIT_SI = 206,
        /// <summary>
-        /// 待处理Draft
+        /// 处理Draft
        /// </summary>
-        [Description("待处理Draft")]
+        [Description("处理Draft")]
        WAIT_DRAFT = 207,
        /// <summary>
-        /// 待放单
+        /// 放单
        /// </summary>
-        [Description("待放单")]
+        [Description("放单")]
        WAIT_CHECKOUT_BILL = 208,
-
        /// <summary>
        /// 审单驳回
        /// </summary>
@ -240,84 +239,84 @@ namespace DS.Module.Core

        #region 工作流--可选服务项目
        /// <summary>
-        /// 待报关
+        /// 报关
        /// </summary>
-        [Description("待报关")]
+        [Description("报关")]
        WAIT_BAOGUAN = 301,
        /// <summary>
-        /// 待发舱单
+        /// 发舱单
        /// </summary>
-        [Description("待发舱单")]
+        [Description("发舱单")]
        WAIT_CANGDAN = 302,
        /// <summary>
-        /// 待提交VGM
+        /// 提交VGM
        /// </summary>
-        [Description("待提交VGM")]
+        [Description("提交VGM")]
        WAIT_VGM = 303,
        /// <summary>
-        /// 待发AFR
+        /// 发AFR
        /// </summary>
-        [Description("待发AFR")]
+        [Description("发AFR")]
        WAIT_AFR = 304,
        /// <summary>
-        /// 待发AMS
+        /// 发AMS
        /// </summary>
-        [Description("待发AMS")]
+        [Description("发AMS")]
        WAIT_AMS = 305,
        /// <summary>
-        /// 待发ISF
+        /// 发ISF
        /// </summary>
-        [Description("待发ISF")]
+        [Description("发ISF")]
        WAIT_ISF = 306,
        /// <summary>
-        /// 待熏蒸
+        /// 熏蒸
        /// </summary>
-        [Description("待熏蒸")]
+        [Description("熏蒸")]
        WAIT_XUNZHENG = 307,
        /// <summary>
-        /// 待报商检
+        /// 报商检
        /// </summary>
-        [Description("待报商检")]
+        [Description("报商检")]
        WAIT_SHANGJIAN = 308,
        /// <summary>
-        /// 待报COA
+        /// 报COA
        /// </summary>
-        [Description("待报COA")]
+        [Description("报COA")]
        WAIT_COA = 309,
        /// <summary>
-        /// 待出产地证
+        /// 出产地证
        /// </summary>
-        [Description("待出产地证")]
+        [Description("出产地证")]
        WAIT_CHANDIZHENG = 310,
        /// <summary>
-        /// 待拖车
+        /// 拖车
        /// </summary>
-        [Description("待拖车")]
+        [Description("拖车")]
        WAIT_TUOCHE = 311,
        /// <summary>
-        /// 待办保险
+        /// 办保险
        /// </summary>
-        [Description("待办保险")]
+        [Description("办保险")]
        WAIT_Insurance = 312,
        /// <summary>
-        /// 待出号
+        /// 出号
        /// </summary>
-        [Description("待出号")]
+        [Description("出号")]
        WAIT_CHUHAO = 313,
        /// <summary>
-        /// 待内点入货
+        /// 内点入货
        /// </summary>
-        [Description("待内点入货")]
+        [Description("内点入货")]
        WAIT_NDRH = 314,
        /// <summary>
-        /// 待发快递
+        /// 发快递
        /// </summary>
-        [Description("待发快递")]
+        [Description("发快递")]
        WAIT_DELIVERY = 315,
        /// <summary>
-        /// 待箱使
+        /// 箱使
        /// </summary>
-        [Description("待箱使")]
+        [Description("箱使")]
        WAIT_XIANGSHI = 316,
        #endregion
    }
--- a/ds-wms-service/DS.WMS.Core/Sys/Interface/ICommonService.cs
+++ b/ds-wms-service/DS.WMS.Core/Sys/Interface/ICommonService.cs
@ -283,7 +283,7 @@ public interface ICommonService
    /// 批量获取任务台用户字段设置
    /// </summary>
    /// <param name="permissionId"></param>
-    /// <param name="isGetDefault">是否获取默认配置 false：仅获取默认配置 true：如果存在个人配置优先获取个人配置，否则获取默认配置</param>
+    /// <param name="isGetDefault">是否获取默认配置 false：如果存在个人配置优先获取个人配置，否则获取默认配置 true：仅获取默认配置</param>
    /// <param name="taskTypeCodeArray">任务类型Code</param>
    Task<DataResult<List<SysFieldSetTaskPlatQueryDtos>>> GetUserTaskPlatFieldSet(string permissionId, bool isGetDefault, string[] taskTypeCodeArray);
 }
--- a/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
+++ b/ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs
@ -1428,7 +1428,7 @@ public class CommonService : ICommonService
    /// 批量获取任务台用户字段设置
    /// </summary>
    /// <param name="permissionId"></param>
-    /// <param name="isGetDefault">是否获取默认配置 false：仅获取默认配置 true：如果存在个人配置优先获取个人配置，否则获取默认配置</param>
+    /// <param name="isGetDefault">是否获取默认配置 false：如果存在个人配置优先获取个人配置，否则获取默认配置 true：仅获取默认配置</param>
    /// <param name="taskTypeCodeArray">任务类型Code</param>
    /// <returns></returns>
    public async Task<DataResult<List<SysFieldSetTaskPlatQueryDtos>>> GetUserTaskPlatFieldSet(string permissionId, bool isGetDefault, string[] taskTypeCodeArray)
--- a/ds-wms-service/DS.WMS.MainApi/Controllers/CommonController.cs
+++ b/ds-wms-service/DS.WMS.MainApi/Controllers/CommonController.cs
@ -431,7 +431,7 @@ public class CommonController : ApiController
    /// 批量获取任务台用户字段设置
    /// </summary>
    /// <param name="permissionId"></param>
-    /// <param name="isGetDefault">是否获取默认配置 false：仅获取默认配置 true：如果存在个人配置优先获取个人配置，否则获取默认配置</param>
+    /// <param name="isGetDefault">是否获取默认配置 false：如果存在个人配置优先获取个人配置，否则获取默认配置 true：仅获取默认配置</param>
    /// <param name="taskTypeCodeArray">任务类型Code</param>
    [HttpGet]
    [Route("GetUserTaskPlatFieldSet")]
--- a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user
+++ b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Code\ds8-solution-pro\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
  </PropertyGroup>
 </Project>