MeiXinLaiRui/NiuJuKongZhi.git

			@@ -9,18 +9,19 @@
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			using WIDESEAWCS_Core.BaseServices;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;

			namespace WIDESEAWCS_TaskInfoService
			{
			public class Putake : ServiceBase<Dt_Putake, IPutakeRepository>, IPutakeServer
			public class PutakeServer : ServiceBase<Dt_Putake, IPutakeRepository>, IPutakeServer
			{
			private IUnitOfWorkManage _uniUnitOfWorkManage;
			private INjTaskRepository _iNjTaskRepository;

			public Putake(IPutakeRepository BaseDal, IUnitOfWorkManage uniUnitOfWorkManage, INjTaskRepository iNjTaskRepository) : base(BaseDal)
			public PutakeServer(IPutakeRepository BaseDal, IUnitOfWorkManage uniUnitOfWorkManage, INjTaskRepository iNjTaskRepository) : base(BaseDal)
			{
			_uniUnitOfWorkManage = uniUnitOfWorkManage;//æ°æ®åºäºå¡
			_iNjTaskRepository= iNjTaskRepository;
			@@ -28,47 +29,105 @@

			private enum cond
			{
			å¾é¢ç=1,
			å¾ä½ä¸=2,
			å¾å½ç=3,
			å¾è´¨æ£=4,
			å·²å®æ=5
			å¾é¢ç=0,
			å¾ä½ä¸=1,
			å¾å½ç=2,
			å¾è´¨æ£=3,
			å·²å®æ=4
			}


			//ä¿®æ¹ä¸åä»»å¡è¡¨çä»»å¡ç¶æ
			public WebResponseContent ChangeStatus(int id)
			public WebResponseContent ChangeStatus(string id,string gruops)
			{
			try
			{
			var putake = BaseDal.QueryData(i => i.ID == id).FirstOrDefault();
			var putake = BaseDal.QueryData(i => i.Njtakeid == id&&i.Grouptype==gruops).FirstOrDefault();
			var nj = _iNjTaskRepository.QueryData(i => i.NJtaskID == id).FirstOrDefault();
			if (putake == null)
			{
			return new WebResponseContent { Status = false, Message = "æªæ¾å°è¯¥ä»»å¡" };
			}

			//putake.Pustatusæ¯åç¬¦ä¸²,éè¦åè½¬æ¢æ cond æä¸¾ï¼
			if (!Enum.TryParse(putake.Pustatus, out cond currentStatus))
			//ææ°æ®åºä¸ç int å¼è½¬æ¢ä¸º `cond` æä¸¾ï¼
			if (!Enum.IsDefined(typeof(cond), putake.Pustatus))
			{
			return new WebResponseContent { Status = false, Message = "å½åç¶æä¸åæ³ï¼æ æ³æ´æ°" };
			}

			cond currentStatus = (cond)putake.Pustatus; // int -> æä¸¾è½¬æ¢

			switch (currentStatus)
			{
			case cond.å¾é¢ç:
			putake.Pustatus = cond.å¾ä½ä¸.ToString();

			//_iNjTaskRepository

			case cond.å¾é¢ç: //
			putake.Pustatus = (int)cond.å¾ä½ä¸; // æä¸¾è½¬ int
			if (gruops=="æºæ¢°")
			{

			}
			if (gruops == "çµæ°")
			{

			}
			if (gruops == "å°æ²")
			{

			}
			break;
			case cond.å¾ä½ä¸:
			putake.Pustatus = cond.å¾å½ç.ToString();
			// _iNjTaskRepository.QueryData(x=>x.)
			case cond.å¾ä½ä¸://å¼å§ä½ä¸ï¼å¼å§æ¶é´
			putake.Pustatus = (int)cond.å¾å½ç;
			if (gruops == "æºæ¢°")
			{
			nj.startTime_LC = DateTime.Now;//å¼å§æ¶é´
			}
			if (gruops == "çµæ°")
			{
			nj!.startTime_DQ = DateTime.Now;
			}
			if (gruops == "å°æ²")
			{
			nj!.startTime_DG = DateTime.Now;
			}
			break;
			case cond.å¾å½ç:
			putake.Pustatus = cond.å¾è´¨æ£.ToString();
			case cond.å¾å½ç://ç¡®è®¤å½è¿ï¼å®ææ¶é´
			putake.Pustatus = (int)cond.å¾è´¨æ£;
			if (gruops == "æºæ¢°")
			{
			nj.endTime_LC = DateTime.Now;
			}
			if (gruops == "çµæ°")
			{
			nj.endTime_DQ = DateTime.Now;
			}
			if (gruops == "å°æ²")
			{
			nj.endTime_DG = DateTime.Now;
			}
			break;
			case cond.å¾è´¨æ£:
			putake.Pustatus=cond.å·²å®æ.ToString();
			case cond.å¾è´¨æ£: // å®æè´¨æ£æ¶é´
			putake.Pustatus = (int)cond.å·²å®æ;

			DateTime latestTime = new DateTime(1900, 1, 1, 0, 0, 0);

			if (gruops == "æºæ¢°")
			{
			nj!.confirmTime_LC = DateTime.Now;
			}
			if (gruops == "çµæ°")
			{
			nj!.confirmTime_DQ = DateTime.Now;
			}
			if (gruops == "å°æ²")
			{
			nj!.confirmTime_DG = DateTime.Now;
			}

			// è·åæåä¸æ¬¡å®æçæ¶é´
			latestTime = new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }
			.Max(); // åææ°çæ¶é´

			nj.endTime = latestTime; // èµå¼ææ°æ¶é´
			putake.Finishedtime = DateTime.Now;
			break;
			case cond.å·²å®æ:
			@@ -76,20 +135,15 @@
			default:
			return new WebResponseContent { Status = false, Message = "æªç¥ç¶æï¼æ æ³æ´æ°" };
			}
			//å¼å¯äºå¡
			_uniUnitOfWorkManage.BeginTran();

			// æ´æ°æ°æ®åº

			_iNjTaskRepository.UpdateData(nj);
			BaseDal.UpdateData(putake);

			//æäº¤äºå¡
			_uniUnitOfWorkManage.CommitTran();
			return new WebResponseContent { Status = true,Data= putake };
			return new WebResponseContent { Status = true, Data = putake };
			}
			catch (Exception ex)
			{
			//åæ»äºå¡
			_uniUnitOfWorkManage.RollbackTran();
			return new WebResponseContent { Status = false, Message = "æ´æ°å¤±è´¥ï¼" + ex.Message };
			}
			}
			@@ -99,19 +153,15 @@
			{
			try
			{
			//å¼å¯äºå¡
			_uniUnitOfWorkManage.BeginTran();


			var dg = BaseDal.QueryData(i=>i.Grouptype== group);

			//æäº¤äºå¡
			_uniUnitOfWorkManage.CommitTran();
			return new WebResponseContent { Status = true, Data = dg };
			}
			catch (Exception ex)
			{
			// åæ»äºå¡
			_uniUnitOfWorkManage.RollbackTran();

			return new WebResponseContent { Status = false, Message = $"æ¥çå¤±è´¥:{ex}" };
			}
			}
			@@ -122,15 +172,13 @@
			{
			try
			{
			//å¼å¯äºå¡
			_uniUnitOfWorkManage.BeginTran();


			var Nj = _iNjTaskRepository.QueryData(i => i.NJtaskID == njid).FirstOrDefault();

			if (Nj != null)
			{
			//æäº¤äºå¡
			_uniUnitOfWorkManage.CommitTran();

			return new WebResponseContent { Status = true, Data = Nj };
			}
			else {
			@@ -143,66 +191,44 @@
			catch (Exception ex)
			{

			//åæ»äºå¡
			_uniUnitOfWorkManage.RollbackTran();

			return new WebResponseContent { Status = false, Message = "æ´æ°å¤±è´¥ï¼" + ex.Message };
			}
			}

			//æ´å·ä»»å¡ç¶ææ¥è¯¢
			public WebResponseContent seletTaskeStatus(string status)
			{
			try
			{
			//å¼å¯äºå¡
			_uniUnitOfWorkManage.BeginTran();
			////æ´å·ä»»å¡ç¶ææ¥è¯¢
			//public WebResponseContent seletTaskeStatus(string status)
			//{
			// try
			// {


			var Nj = BaseDal.QueryData(i => i.Pustatus == status);
			// 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 = "æ²¡ææ¾å°" };
			}
			// if (Nj != null)
			// {

			// return new WebResponseContent { Status = true, Data = Nj };
			// }
			// else
			// {
			// return new WebResponseContent { Status = false, Message = "æ²¡ææ¾å°" };
			// }

			}
			catch (Exception ex)
			{
			// }
			// catch (Exception ex)
			// {

			//åæ»äºå¡
			_uniUnitOfWorkManage.RollbackTran();
			return new WebResponseContent { Status = false, Message = "æ´æ°å¤±è´¥ï¼" + ex.Message };
			}
			}

			// 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();
			var nj = _iNjTaskRepository.QueryData();


			return new WebResponseContent { Status = true, Data = nj };