yanjinhui
2025-03-14 563ce4cedd764d3e53e9384197fc14e618d776d5
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/NjTaskServer.cs
@@ -23,7 +23,6 @@
        private readonly ITemplateRepository _templateRepository;
        private readonly INJtakeHistoryRepository _nJtakeHistoryRepository;
        private readonly IPutakeRepository _putakeRepository;
        private IUnitOfWorkManage _unitOfWorkManage;
@@ -38,9 +37,16 @@
            
        }
        public override PageGridData<Dt_NjTask> GetPageData(PageDataOptions options)
        {
            OrderByParameters = new Dictionary<string, SqlSugar.OrderByType> {
                {
                    nameof(Dt_NjTask.trainKind),SqlSugar.OrderByType.Asc
                } };
            return base.GetPageData(options);
        }
        //保存模板
        public WebResponseContent Submtandsave(NjtakeDTO njtakeDTO)
        {
@@ -387,28 +393,40 @@
            try
            {
                #region è‡ªå®šä¹‰å‘½åç»™Njtaskid
                // èŽ·å–ä»Šå¤©çš„æ—¥æœŸéƒ¨åˆ†ï¼Œå¦‚ "KH0306"
                string todayPrefix = $"KH{DateTime.Now:MMdd}";
                // æŸ¥è¯¢æ•°æ®åº“,找出当天最大的 NJtaskID
                var lastTask = BaseDal.QueryData(i => i.NJtaskID.StartsWith(todayPrefix))
                                      .OrderByDescending(i => i.NJtaskID)
                                      .FirstOrDefault();
                int nextNumber = 1; // é»˜è®¤ç¼–号
                if (lastTask != null)
                string CustomizeID = "";
                if (addNjtDTO.NJtaskID == 0)
                {
                    // èŽ·å–åŽä¸¤ä½åˆ†é’Ÿç¼–å·
                    string lastNumberPart = lastTask.NJtaskID.Substring(6, 2);
                    if (int.TryParse(lastNumberPart, out int lastNumber))
                    {
                        nextNumber = lastNumber + 1;
                    }
                }
                    // èŽ·å–ä»Šå¤©çš„æ—¥æœŸéƒ¨åˆ†ï¼Œå¦‚ "K20250306"
                    string todayPrefix = $"K{DateTime.Now:yyyyMMdd}";
                // ç”Ÿæˆ NJtaskID,例如 KH0306001, KH0306002...
                string CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3表示 3位数,不足补0
                    // æŸ¥è¯¢æ•°æ®åº“,找出当天最大的 NJtaskID
                    var lastTask = BaseDal.QueryData(i => i.NJtaskID.StartsWith(todayPrefix))
                                          .OrderByDescending(i => i.NJtaskID)
                                          .FirstOrDefault();
                    int nextNumber = 1; // é»˜è®¤ç¼–号
                    if (lastTask != null)
                    {
                        // èŽ·å–åŽä¸¤ä½åˆ†é’Ÿç¼–å·
                        string lastNumberPart = lastTask.NJtaskID.Substring(6, 2);
                        if (int.TryParse(lastNumberPart, out int lastNumber))
                        {
                            nextNumber = lastNumber + 1;
                        }
                    }
                    // ç”Ÿæˆ NJtaskID,例如 KH0306001, KH0306002...
                    CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3表示 3位数,不足补0
                }
                else
                {
                    CustomizeID = addNjtDTO.NJtaskID.ToString();
                }
                if (addNjtDTO.Creater=="")
                {
                    addNjtDTO.Creater = "admin";
                }
                #endregion
                var addnj = new Dt_NjTask()
@@ -435,17 +453,15 @@
                    createTime = DateTime.Now,
                };
                _unitOfWorkManage.BeginTran();
                BaseDal.AddData(addnj);
                _unitOfWorkManage.CommitTran();
                return new WebResponseContent { Status = true, Data = addnj };
                return new WebResponseContent { Status = true, Message = "成功", Code = 200, Data = addnj };
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return new WebResponseContent { Status = false, Message = "失败" + ex.Message };
                return new WebResponseContent { Status = false, Message = "失败" + ex.Message,Code= 400 };
            }
        }
@@ -454,20 +470,16 @@
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                var datatail = BaseDal.QueryData(x => x.NJtaskID == njtaskID).FirstOrDefault();
                if (datatail == null)
                {
                    return new WebResponseContent { Status = false, Message = "没有找到" };
                }
                _unitOfWorkManage.CommitTran();
                return new WebResponseContent { Status = true,Data = datatail };
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return new WebResponseContent() { Status = false, Message ="失败"+ ex.Message };
            }
        }
@@ -488,14 +500,14 @@
                putake.coachNum=putake.coachNum;
                putake.bogie=putNjtDTO.bogie;
                putake.processDept=putake.processDept;
                _unitOfWorkManage.BeginTran();
                BaseDal.UpdateData(putake);
                _unitOfWorkManage.CommitTran();
                return new WebResponseContent { Status = true, Data = putake };
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return new WebResponseContent { Status = false, Message = "查询失败:" + ex.Message };
            }
        }