后端

yanjinhui

2025-03-10 f391144114bedefe44c700a590bd50272ff067ec

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/PutakeServer.cs

@@ -3,7 +3,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
@@ -55,10 +57,12 @@
                {
                    case cond.待领筒:
                        putake.Pustatus = cond.待作业.ToString();
                        
                        //_iNjTaskRepository
                        break;
                    case cond.待作业:
                        putake.Pustatus = cond.待归筒.ToString();
                      //  _iNjTaskRepository.QueryData(x=>x.)
                        break;
                    case cond.待归筒:
                        putake.Pustatus = cond.待质检.ToString();
@@ -113,7 +117,7 @@
        }


        //查看这个下发任务的中任务表中的详情数据
        //查看这个下发任务的中任务表中的详情数据（和njtaskServe中一样）
        public WebResponseContent GetNjtake(string njid)
        {
            try
@@ -144,5 +148,72 @@
                return new WebResponseContent { Status = false, Message = "更新失败：" + ex.Message };
            }
        }

        //更具任务状态查询
        public WebResponseContent seletTaskeStatus(string status)
        {
            try
            {
                //开启事务
                _uniUnitOfWorkManage.BeginTran();

                var Nj = BaseDal.QueryData(i => i.Pustatus == status);

                if (Nj != null)
                {
                    //提交事务
                    _uniUnitOfWorkManage.CommitTran();
                    return new WebResponseContent { Status = true, Data = Nj };
                }
                else
                {
                    return new WebResponseContent { Status = false, Message = "没有找到" };
                }

            }
            catch (Exception ex)
            {

                //回滚事务
                _uniUnitOfWorkManage.RollbackTran();
                return new WebResponseContent { Status = false, Message = "更新失败：" + ex.Message };
            }
        }

        public WebResponseContent GetNJandPu()
        {
            try
            {
                var nj = _iNjTaskRepository.QueryData();  // èŽ·å– NJ ä»»åŠ¡åˆ—表
                //var pu = BaseDal.QueryData();  // èŽ·å– PU ä»»åŠ¡åˆ—表
                //var result = nj.Join(
                //    pu,
                //    n => n.NJtaskID,  // å¤–é”® (主表)
                //    p => p.ID.ToString(),  // å†…é”® (从表)
                //    (n, p) => new  // è¿žæŽ¥åŽçš„结果
                //    {
                //        n.NJtaskID,
                //        n.trainKind,
                //        n.trainNum,
                //        n.track,
                //        n.coachNum,
                //        n.bogie,
                //        n.processDept,
                //        n.createTime,
                //        p.Pustatus,
                       
                //    }).ToList();
               

                return new WebResponseContent { Status = true, Data = nj };
           
            }
            
            catch (Exception)
            {

                throw;
            }
        }
    }
}