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

ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs

@@ -1865,9 +1865,9 @@ public static class MultiLanguageConst
     public const string ServiceProjectBatchIdsNull = "ServiceProject_BatchIdsNull";
 
     /// <summary>
-    /// 部分服务项目获取失败，请服务项目信息是否存在
+    /// 部分服务项目获取失败，请确认服务项目信息是否存在
     /// </summary>
-    [Description("服务项目获取失败，请服务项目信息是否存在")]
+    [Description("服务项目获取失败，请确认服务项目信息是否存在")]
     public const string ServiceProjectEntityPartNull = "ServiceProject_EntityPartNull";
 
     /// <summary>
@@ -1913,10 +1913,46 @@ public static class MultiLanguageConst
     public const string ServiceWorkFlowBaseSavePKIDNull = "ServiceWorkFlowBase_SavePKIDNull";
 
     /// <summary>
-    /// 状态获取失败，状态信息不存在或已作废
+    /// 服务流程获取失败，服务流程信息不存在或已作废
     /// </summary>
-    [Description("状态获取失败，状态信息不存在或已作废")]
+    [Description("状服务流程获取失败，服务流程信息不存在或已作废")]
     public const string ServiceWorkFlowBaseEntityNull = "ServiceWorkFlowBase_EntityNull";
 
+    /// <summary>
+    /// 服务流程主键数组不能为空
+    /// </summary>
+    [Description("服务流程主键数组不能为空")]
+    public const string ServiceWorkFlowBaseBatchIdsNull = "ServiceWorkFlowBase_BatchIdsNull";
+
+    /// <summary>
+    /// 服务流程获取失败，请确认服务流程信息是否存在
+    /// </summary>
+    [Description("服务流程获取失败，请确认服务流程信息是否存在")]
+    public const string ServiceWorkFlowBaseNoRecord = "ServiceWorkFlowBase_NoRecord";
+
+    /// <summary>
+    /// 服务流程状态必需指定大于零的顺序号
+    /// </summary>
+    [Description("状态必需指定大于零的顺序号")]
+    public const string ServiceWorkFlowBaseSortNotEqualLessZero = "ServiceWorkFlowBase_SortNotEqualLessZero";
+
+    /// <summary>
+    /// 服务流程状态顺序号不能重复
+    /// </summary>
+    [Description("状态必需指定大于零的顺序号")]
+    public const string ServiceWorkFlowBaseSortNotRepeat = "ServiceWorkFlowBase_SortNotRepeat";
+
+    /// <summary>
+    /// 部分服务流程获取失败，请服务流程信息是否存在
+    /// </summary>
+    [Description("部分服务流程获取失败，请服务流程信息是否存在")]
+    public const string ServiceWorkFlowBaseEntityPartNull = "ServiceWorkFlowBase_EntityPartNull";
+
+    /// <summary>
+    /// 服务流程未修改，不需要重复发布
+    /// </summary>
+    [Description("服务流程未修改，不需要重复发布")]
+    public const string ServiceWorkFlowBasePublishFailNoChange = "ServiceWorkFlowBase_PublishFailNoChange";
+    
     #endregion
 }

ds-wms-service/DS.WMS.Core/Op/Dtos/ServiceProject/ServiceWorkFlowBaseQueryExtDto.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Dtos
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ServiceWorkFlowBaseQueryExtDto
+    {
+        /// <summary>
+        /// 创建起始时间
+        /// </summary>
+        public Nullable<DateTime> CreateStart { get; set; }
+
+        /// <summary>
+        /// 创建结束时间
+        /// </summary>
+        public Nullable<DateTime> CreateEnd { get; set; }
+
+        /// <summary>
+        /// 更新起始时间
+        /// </summary>
+        public Nullable<DateTime> UpdateStart { get; set; }
+
+        /// <summary>
+        /// 更新结束时间
+        /// </summary>
+        public Nullable<DateTime> UpdateEnd { get; set; }
+
+        /// <summary>
+        /// 是否启用 1-已启用 2-未启用
+        /// </summary>
+        ///  <example></example>
+        public string IsEnable { get; set; }
+
+        /// <summary>
+        /// 服务流程名称
+        /// </summary>
+        public string ServiceWorkFlowName { get; set; }
+
+        /// <summary>
+        /// 服务流程备注
+        /// </summary>
+        public string ServiceWorkFlowNote { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public Nullable<long> CreateBy { get; set; }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        public Nullable<long> UpdateBy { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/ServiceWorkFlowActivitiesInfo.cs

@@ -13,8 +13,14 @@ namespace DS.WMS.Core.Op.Entity
     /// 服务流程活动表
     /// </summary>
     [SqlSugar.SugarTable("service_workflow_activities", "服务流程活动表")]
-    public class ServiceWorkFlowActivitiesInfo : BaseModelV2<long>
+    public class ServiceWorkFlowActivitiesInfo
     {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        public string PK_ID { get; set; }
+
         /// <summary>
         /// 状态主键
         /// </summary>
@@ -25,5 +31,74 @@ namespace DS.WMS.Core.Op.Entity
         /// </summary>
         public string SHOW_NAME { get; set; }
 
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Description("创建时间")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, ColumnDescription = "创建时间")]
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Description("创建人")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, IsNullable = true, ColumnDescription = "创建人")]
+        public long CreateBy { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Description("修改人")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "修改人")]
+        public long? UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [Description("更新时间")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "更新时间")]
+        public Nullable<DateTime> UpdateTime { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        [Description("删除")]
+        [SugarColumn(ColumnDescription = "是否删除", DefaultValue = "0")]
+        public bool Deleted { get; set; }
+
+        /// <summary>
+        /// 删除时间
+        /// </summary>
+        [Description("删除时间")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除时间", IsOnlyIgnoreInsert = true)]
+        public Nullable<DateTime> DeleteTime { get; set; }
+
+        /// <summary>
+        /// 删除人
+        /// </summary>
+        [Description("删除人")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除人", IsOnlyIgnoreInsert = true)]
+        public Nullable<long> DeleteBy { get; set; }
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        [Description("创建人名称")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, IsNullable = true, ColumnDescription = "创建人名称", Length = 50)]
+        public string CreateUserName { get; set; }
+
+        /// <summary>
+        /// 修改人名称
+        /// </summary>
+        [Description("修改人名称")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "修改人名称", Length = 50)]
+        public string UpdateUserName { get; set; }
+
+        /// <summary>
+        /// 删除人名称
+        /// </summary>
+        [Description("删除人名称")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除人名称", Length = 50, IsOnlyIgnoreInsert = true)]
+        public string DeleteUserName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusTriggerBaseInfo.cs

@@ -13,8 +13,14 @@ namespace DS.WMS.Core.Op.Entity
     /// 触发器主表
     /// </summary>
     [SqlSugar.SugarTable("status_trigger_base", "触发器主表")]
-    public class StatusTriggerBaseInfo : BaseModelV2<long>
+    public class StatusTriggerBaseInfo
     {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        public string PK_ID { get; set; }
+
         /// <summary>
         /// 触发器代码
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Entity/ServiceProject/StatusTriggerConditionInfo.cs

@@ -13,8 +13,14 @@ namespace DS.WMS.Core.Op.Entity
     /// 触发器条件明细
     /// </summary>
     [SqlSugar.SugarTable("status_trigger_condition", "触发器条件明细")]
-    public class StatusTriggerConditionInfo : BaseModelV2<long>
+    public class StatusTriggerConditionInfo
     {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)]
+        public string PK_ID { get; set; }
+
         /// <summary>
         /// 父主键
         /// </summary>
@@ -59,5 +65,75 @@ namespace DS.WMS.Core.Op.Entity
         /// LIQUID表达式JSON
         /// </summary>
         public string LIQUID_EXPRESSION { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Description("创建时间")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, ColumnDescription = "创建时间")]
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Description("创建人")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, IsNullable = true, ColumnDescription = "创建人")]
+        public long CreateBy { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Description("修改人")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "修改人")]
+        public long? UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [Description("更新时间")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "更新时间")]
+        public Nullable<DateTime> UpdateTime { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        [Description("删除")]
+        [SugarColumn(ColumnDescription = "是否删除", DefaultValue = "0")]
+        public bool Deleted { get; set; }
+
+        /// <summary>
+        /// 删除时间
+        /// </summary>
+        [Description("删除时间")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除时间", IsOnlyIgnoreInsert = true)]
+        public Nullable<DateTime> DeleteTime { get; set; }
+
+        /// <summary>
+        /// 删除人
+        /// </summary>
+        [Description("删除人")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除人", IsOnlyIgnoreInsert = true)]
+        public Nullable<long> DeleteBy { get; set; }
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        [Description("创建人名称")]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, IsNullable = true, ColumnDescription = "创建人名称", Length = 50)]
+        public string CreateUserName { get; set; }
+
+        /// <summary>
+        /// 修改人名称
+        /// </summary>
+        [Description("修改人名称")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "修改人名称", Length = 50)]
+        public string UpdateUserName { get; set; }
+
+        /// <summary>
+        /// 删除人名称
+        /// </summary>
+        [Description("删除人名称")]
+        [SugarColumn(IsNullable = true, ColumnDescription = "删除人名称", Length = 50, IsOnlyIgnoreInsert = true)]
+        public string DeleteUserName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Interface/ServiceProject/IServiceWorkFlowBaseService.cs

@@ -19,49 +19,42 @@ namespace DS.WMS.Core.Op.Interface
         /// </summary>
         /// <param name="info">服务流程详情</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<long>> Save(ServiceWorkFlowBaseDto info);
+        Task<DataResult<string>> Save(ServiceWorkFlowBaseDto info);
 
         /// <summary>
         /// 保存并启用
         /// </summary>
         /// <param name="info">服务流程详情</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<long>> SaveAndEnable(ServiceWorkFlowBaseDto info);
+        Task<DataResult<string>> SaveAndEnable(ServiceWorkFlowBaseDto info);
 
         /// <summary>
         /// 启用
         /// </summary>
-        /// <param name="pkIds">服务流程主键数组</param>
+        /// <param name="ids">服务流程主键数组</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<string>> SetEnable(string[] pkIds);
+        Task<DataResult<string>> SetEnable(string[] ids);
 
         /// <summary>
         /// 取消启用
         /// </summary>
-        /// <param name="pkIds">服务流程主键数组</param>
+        /// <param name="ids">服务流程主键数组</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<string>> SetUnEnable(string[] pkIds);
+        Task<DataResult<string>> SetUnEnable(string[] ids);
 
         /// <summary>
         /// 删除
         /// </summary>
-        /// <param name="pkIds">服务流程主键数组</param>
+        /// <param name="ids">服务流程主键数组</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<string>> Delete(string[] pkIds);
-
-        /// <summary>
-        /// 复制
-        /// </summary>
-        /// <param name="pkId">服务流程主键</param>
-        /// <returns>返回回执</returns>
-        Task<DataResult<long>> Copy(string pkId);
+        Task<DataResult<string>> Delete(string[] ids);
 
         /// <summary>
         /// 获取服务流程详情
         /// </summary>
-        /// <param name="pkId">服务流程主键</param>
+        /// <param name="id">服务流程主键</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<ServiceWorkFlowBaseShowDto>> GetInfo(string pkId);
+        Task<DataResult<ServiceWorkFlowBaseShowDto>> GetInfo(string id);
 
         /// <summary>
         /// 检索服务流程列表
@@ -74,32 +67,32 @@ namespace DS.WMS.Core.Op.Interface
         /// <summary>
         /// 服务流程台账查询
         /// </summary>
-        /// <param name="QuerySearch">服务流程台账查询请求</param>
+        /// <param name="querySearch">服务流程台账查询请求</param>
         /// <returns>返回结果</returns>
-        Task<SqlSugarPagedList<ServiceWorkFlowBasePageDto>> GetPageAsync(QueryServiceWorkFlowBaseDto QuerySearch);
+        Task<DataResult<List<ServiceWorkFlowBasePageDto>>> GetPageAsync(PageRequest querySearch);
 
 
         /// <summary>
         /// 发布服务流程
         /// </summary>
-        /// <param name="pkIds">服务流程主键数组</param>
+        /// <param name="ids">服务流程主键数组</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<string>> PublishRelease(string[] pkIds);
+        Task<DataResult<string>> PublishRelease(string[] ids);
 
 
         /// <summary>
         /// 获取展示服务流程时间轴列表
         /// </summary>
-        /// <param name="pkId">服务流程主键</param>
+        /// <param name="id">服务流程主键</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<ServiceWorkFlowRunDto>> GetShowTimeLine(string pkId);
+        Task<DataResult<ServiceWorkFlowRunDto>> GetShowTimeLine(string id);
 
         /// <summary>
         /// 保存服务流程活动
         /// </summary>
         /// <param name="info">保存服务流程活动详情</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<long>> SaveWFActivities(ServiceWorkFlowActivitiesDto info);
+        Task<DataResult<string>> SaveWFActivities(ServiceWorkFlowActivitiesDto info);
 
         /// <summary>
         /// 通过服务活动主键获取所有相关服务流程列表