Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

yanjinhui

2 天以前 e8323315b683a76509b9c1ecc717bb5b6a9ee08a

Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs

@@ -9,7 +9,10 @@
{
    public class Dt_Task_Hty : Dt_Task, IBaseHistoryEntity
    {
        public new string Creater { get; set; }
        public new DateTime CreateDate { get; set; }
        public new string Modifier { get; set; }
        public new DateTime? ModifyDate { get; set; }
        public int SourceId { get; set; }

        public string OperateType { get; set; }

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -1531,7 +1531,10 @@
            {
                // æŸ¥æ‰¾æ‰€æœ‰ä»»åŠ¡ä¸­åŒ…含这个id的
                var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));

                foreach (var item in take)
                {
                    item.Modifier = App.User.UserName;
                }
                // æ‰§è¡Œç§»å…¥åŽ†å²æ“ä½œï¼Œå¹¶æ£€æŸ¥ç»“æžœ
                bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.人工删除);