ShiDaKe/ShenYangLiku.git

			@@ -1,4 +1,4 @@
			ï»¿#region << ç æ¬ æ³¨ é >>
			#region << ç æ¬ æ³¨ é >>
			/*----------------------------------------------------------------
			* å½åç©ºé´ï¼WIDESEA_TaskInfoService
			* åå»ºèï¼è¡ç«¥åº
			@@ -21,6 +21,7 @@
			using Microsoft.AspNetCore.Mvc;
			using Newtonsoft.Json;
			using SqlSugar;
			using System.Diagnostics;
			using System.DirectoryServices.Protocols;
			using System.Net;
			using System.Reflection.Emit;
			@@ -167,9 +168,6 @@
			Dt_StockInfo dt_Stock = _stockRepository.QueryFirst(x => x.LocationCode == ShallowLocation.LocationCode);
			if (dt_Stock == null) return content.Error($"è´§ä½ç¼å·:{Locatask}çæµè´§ä½åºåå¼å¸¸ï¼è¯·æ£æ¥ï¼ï¼ï¼");

			Dt_Task _Task = BaseDal.QueryFirst(x => x.SourceAddress == ShallowLocation.LocationCode \|\| x.TargetAddress == ShallowLocation.LocationCode);
			if (_Task != null) return content.Error($"è´§ä½ç¼å·:{Locatask}çæµè´§ä½åºå·²æä»»å¡ï¼ä¸å¯è¿è¡ç§»åº");

			//è¿è¡è·åæ°çåºä½
			Dt_LocationInfo? Nextlocation = _basicService.LocationInfoService.GetLocation(DeepLocation.RoadwayNo);//è·åå°æ°åºä½
			if (Nextlocation == null)
			@@ -196,11 +194,11 @@
			NextAddress = Nextlocation.LocationCode,
			Grade = 1,
			Creater = "WMS",
			Depth = ShallowLocation.Depth,
			Depth = Nextlocation.Depth,
			CreateDate = DateTime.Now,
			};

			_locationInfoRepository.AddData(loca);
			_locationInfoRepository.UpdateData(loca);
			BaseDal.AddData(dt_Task); //æ°å¢ä»»å¡
			_unitOfWorkManage.CommitTran();

			@@ -269,13 +267,15 @@
			BaseDal.DeleteData(task);
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);

			WebResponseContent content=MES_TransferCompletionFeedback(task);
			WebResponseContent content = MES_TransferCompletionFeedback(task);
			//content.Status = true;

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content;
			}


			_unitOfWorkManage.CommitTran();
			return webResponse.OK();
			}
			@@ -320,16 +320,20 @@
			_locationInfoRepository.UpdateData(dt_LocationInfo);
			//ä¿®æ¹åºåç¶æ
			_stockRepository.UpdateData(stockInfo);
			task.TaskStatus = (int)TaskInStatusEnum.InFinish;
			//å é¤ä»»å¡æ·»å åå²
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.äººå·¥å®æ : OperateTypeEnum.èªå¨å®æ);


			/*WebResponseContent content = TaskCompletionFeedback(task);
			WebResponseContent content = TaskCompletionFeedback(task);
			//content.Status = true;
			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content;
			}*/
			}

			//Thread.Sleep(5000);

			_unitOfWorkManage.CommitTran();
			}
			@@ -370,13 +374,15 @@

			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockStatusEmun.åºåºå®æ.ObjToInt(), "1", task.TaskNum);
			/*WebResponseContent content = TaskCompletionFeedback(task);
			WebResponseContent content = TaskCompletionFeedback(task);
			//content.Status = true;

			if (!content.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content;
			}*/

			}
			//Thread.Sleep(5000);
			_unitOfWorkManage.CommitTran();
			return webResponse.OK();
			}
			@@ -407,17 +413,26 @@

			try
			{
			string locationCode = null;
			if (dt_Task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			locationCode = dt_Task.SourceAddress;
			}
			else
			{
			locationCode = dt_Task.TargetAddress;
			}
			TransferRequest transferRequest = new TransferRequest()
			{
			//ä¸å¡idï¼ä»»å¡idåç»è¿è¡æ´æ¹
			businessId = "1",
			TaskId = "1",
			SourceLocationCode = dt_Task.SourceAddress,
			LocationCode = dt_Task.TargetAddress,
			PalletCode = dt_Task.PalletCode,
			Status = "FINISH",
			ErrorStatus = "NORMAL",
			ErrorInfo = "",
			taskId = dt_Task.MEStaskId, //ä»»å¡id
			businessId = dt_Task.MESbusinessId, //ä¸å¡id
			sourceLocationCode = dt_Task.SourceAddress,
			locationCode = locationCode,
			palletCode = dt_Task.PalletCode,
			status = "FINISH",
			errorStatus = "NORMAL",
			errorInfo = "",
			};

			//è·åæ¥å£è¿è¡è°å
			@@ -425,25 +440,27 @@
			string WCSReceiveTaskAPI = ConfigsAPIInfo.ApiAddress + ConfigsAPIInfo.ApiName;
			if (WCSReceiveTaskAPI == null)
			{
			return webResponse.Error($"åºåºå¤±è´¥ï¼æªéç½®MESç§»åºå®æåé¦æ¥å£");
			return webResponse.Error($"åºåºå¤±è´¥ï¼æªéç½®MESç§»åºå®æåé¦æ¥å£");
			}
			var respon = HttpHelper.Post(WCSReceiveTaskAPI, JsonConvert.SerializeObject(transferRequest));
			if (respon != null)
			{
			var response = JsonConvert.DeserializeObject<ApiResponse<object>>(respon);
			if (response.Success)
			{
			return webResponse.OK();
			}
			else
			{
			return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°åå ï¼{response.Message}");
			}
			var response = JsonConvert.DeserializeObject<ApiResponse<object>>(respon);
			if (response.Success)
			{
			return webResponse.OK();
			}
			else
			{
			return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°åå ï¼{response.Message}");
			}
			}
			else
			{
			return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°ä¸ºç©º");
			return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°ä¸ºç©º");
			}

			return webResponse.OK();
			}
			catch (Exception ex)
			{
			@@ -464,17 +481,26 @@

			try
			{
			TaskNotification transferRequest = new TaskNotification()
			string locationCode = null;
			if (dt_Task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			//ä¸å¡idï¼ä»»å¡idåç»è¿è¡æ´æ¹
			TaskId = "1", //ä»»å¡id
			BusinessId = "1", //ä¸å¡id
			PalletCode = dt_Task.PalletCode,
			SubPalletCode = "",//åæçç¼ç
			LocationCode = dt_Task.SourceAddress,
			ErrorStatus = "NORMAL",
			ErrorInfo = "",
			};
			locationCode = dt_Task.SourceAddress;
			}
			else
			{
			locationCode = dt_Task.TargetAddress;
			}
			TaskNotification transferRequest = new TaskNotification()
			{
			//ä¸å¡idï¼ä»»å¡idåç»è¿è¡æ´æ¹
			taskId = dt_Task.MEStaskId, //ä»»å¡id
			businessId = dt_Task.MESbusinessId, //ä¸å¡id
			palletCode = dt_Task.PalletCode,
			subPalletCode = dt_Task.MESsubPalletCode,//åæçç¼ç
			locationCode = locationCode,
			errorStatus = "NORMAL",
			errorInfo = "",
			};

			//è·åæ¥å£è¿è¡è°å
			var ConfigsAPIInfo = _dt_ApiInfoService.GetConfigsByAPIInfo(CateGoryConst.CONFIG_MES_IPAddress, SysConfigConst.MESTaskFeedback); //è·åå°wcså¨é¨ç±»åçæ¥å£
			@@ -483,7 +509,14 @@
			{
			return webResponse.Error($"ä»»å¡åé¦MESå¤±è´¥ï¼æªéç½®MESä»»å¡å®æåé¦æ¥å£");
			}
			var respon = HttpHelper.Post(WCSReceiveTaskAPI, JsonConvert.SerializeObject(transferRequest));

			// æ·»å è°è¯ä¿¡æ¯
			string requestJson = JsonConvert.SerializeObject(transferRequest);
			//Console.WriteLine($"MESåé¦æ¥å£URL: {WCSReceiveTaskAPI}");
			//Console.WriteLine($"MESåé¦è¯·æ±æ°æ®: {requestJson}");

			// ä½¿ç¨ä¿®å¤åçPostSyncæ¹æ³ï¼å·²å¨PostSyncä¸è®¾ç½®é»è®¤è¯·æ±å¤´ï¼
			var respon = HttpHelper.Post(WCSReceiveTaskAPI, requestJson);
			if (respon != null)
			{
			var response = JsonConvert.DeserializeObject<ApiResponse<object>>(respon);
			@@ -508,7 +541,7 @@
			}
			}

			public ApiResponse<object> MESresponse(string Message, bool Success)
			public ApiResponse<object> MESresponse(string Message, bool Success,int Code)
			{
			ApiResponse<object> apiResponse = new ApiResponse<object>();
			apiResponse.Message = Message;
			@@ -517,8 +550,111 @@
			return apiResponse;
			}

			/// <summary>
			/// åæ¶ä»»å¡æ¥å£
			/// </summary>
			/// <param name="taskNum">ä»»å¡å·</param>
			/// <returns></returns>
			public WebResponseContent Cancelinventory(int taskNum)
			{
			WebResponseContent webResponse = new WebResponseContent();
			try
			{
			// æ¥æ¾ä»»å¡
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.TaskStatus == TaskOutStatusEnum.OutFinish.ObjToInt());
			if (task == null)
			{
			return webResponse.Error($"æªæ¾å°ä»»å¡å·ä¸ºã{taskNum}ãçä»»å¡ä¿¡æ¯");
			}

			bool res;
			switch (task.TaskType)
			{
			case (int)TaskInboundTypeEnum.Inbound:
			res = task.TaskStatus == TaskInStatusEnum.Line_InExecuting.ObjToInt();
			break;
			case (int)TaskOutboundTypeEnum.Outbound:
			res = task.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt();
			break;
			case (int)TaskRelocationTypeEnum.Relocation:
			res = task.TaskStatus == TaskRelocationStatusEnum.RelocationNew.ObjToInt();
			break;
			default:
			res = false;
			break;
			}
			if (!res) return WebResponseContent.Instance.Error("ä»»å¡ç¶æå¼å¸¸");

			Dt_StockInfo stockInfo = _stockRepository.QueryFirst(x => x.PalletCode == task.PalletCode);

			_unitOfWorkManage.BeginTran();

			int stockmsseg;
			int locationmsseg;
			bool taskmsseg;
			if (task.TaskType == TaskOutboundTypeEnum.Outbound.ObjToInt() \|\| task.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt())
			{
			stockmsseg = _stockRepository.Db.Updateable<Dt_StockInfo>()
			.SetColumns(x => x.StockStatus == StockStatusEmun.å¥åºå®æ.ObjToInt())
			.Where(x => x.PalletCode == task.PalletCode)
			.ExecuteCommand();
			locationmsseg = _locationInfoRepository.Db.Updateable<Dt_LocationInfo>()
			.SetColumns(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			.Where(x => x.LocationCode == stockInfo.LocationCode)
			.ExecuteCommand();
			taskmsseg = BaseDal.DeleteData(task);
			}
			else
			{
			locationmsseg = _locationInfoRepository.Db.Updateable<Dt_LocationInfo>()
			.SetColumns(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt())
			.Where(x => x.LocationCode == stockInfo.LocationCode)
			.ExecuteCommand();
			stockmsseg = _stockRepository.DeleteData(stockInfo).ObjToInt();
			taskmsseg = BaseDal.DeleteData(task);
			}
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.äººå·¥å®æ : OperateTypeEnum.èªå¨å®æ);
			//è·åæ¥å£è¿è¡è°å
			var ConfigsAPIInfo = _dt_ApiInfoService.GetConfigsByAPIInfo(CateGoryConst.CONFIG_MES_IPAddress, SysConfigConst.WCSCancelinventory); //è·åå°wcså¨é¨ç±»åçæ¥å£
			string WCSReceiveTaskAPI = ConfigsAPIInfo.ApiAddress + ConfigsAPIInfo.ApiName;
			if (WCSReceiveTaskAPI == null)
			{
			return webResponse.Error($"ä»»å¡åé¦MESå¤±è´¥ï¼æªéç½®MESä»»å¡å®æåé¦æ¥å£");
			}
			var respon = HttpHelper.Get(WCSReceiveTaskAPI, JsonConvert.SerializeObject(task.TaskNum));
			if (respon != null)
			{
			var response = JsonConvert.DeserializeObject<ApiResponse<object>>(respon);
			// if (response.Success)
			// {
			// return webResponse.OK();
			// }
			// else
			// {
			// return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°åå ï¼{response.Message}");
			// }
			//}
			//else
			//{
			// return webResponse.Error($"è°åæ¥å£å¤±è´¥ï¼åé¦åæ°ä¸ºç©º");
			//}
			if (stockmsseg > 0 && locationmsseg > 0 && taskmsseg)
			{
			_unitOfWorkManage.CommitTran();
			return webResponse.OK("ä»»å¡åæ¶æå");

			}

			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return webResponse.Error($"åæ¶ä»»å¡å¤±è´¥ï¼åå ï¼{ex.Message}");
			}
			_unitOfWorkManage.RollbackTran();
			return webResponse.Error("ä»»å¡åæ¶å¤±è´¥");
			}

			/// <summary>
			/// åå»ºè´§ä½
			@@ -606,5 +742,95 @@
			}
			return MESresponse($"", true);
			}


			public static string GetLastPart(string locationCode)
			{
			string[] parts = locationCode.Split('-');
			return parts[parts.Length - 1];
			}


			/// <summary>
			/// åºåº
			/// </summary>
			/// <param name="locationCode"></param>
			/// <returns></returns>
			/// <exception cref="NotImplementedException"></exception>
			public WebResponseContent chuku(string locationCode)
			{

			try
			{
			Dt_StockInfo dt_StockInfo = _stockRepository.QueryFirst(x => x.LocationCode.StartsWith("SC01") && x.StockStatus == 6);
			int result = GetLastPart(dt_StockInfo.LocationCode).ObjToInt(); // è¿å "C03"

			List<Dt_Task> dt_s = new List<Dt_Task>();
			//çæç§»å¨ä»»å¡
			Dt_Task dt_Task = new()
			{
			PalletCode = dt_StockInfo.PalletCode,
			TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			Roadway = "SC01",
			TaskType = TaskOutboundTypeEnum.Outbound.ObjToInt(),
			TaskStatus = TaskOutStatusEnum.OutNew.ObjToInt(),
			SourceAddress = dt_StockInfo.LocationCode,
			TargetAddress = "1006",
			CurrentAddress = dt_StockInfo.LocationCode,
			NextAddress = "1006",
			Grade = 1,
			Creater = "MES",
			Depth = result,
			CreateDate = DateTime.Now,
			MEStaskId = "EXTASK20251020002",
			MESbusinessId = "EXBUS20251020002",
			MESsubPalletCode = dt_StockInfo.MESsubPalletCode,
			OutboundPlatform = "1005"
			};

			////åå»ºç»çä¿¡æ¯
			//var dt_Stock = new Dt_StockInfo
			//{
			// PalletCode = dt_Task.PalletCode,
			// PalletType = 1,
			// LocationCode = locationCode,
			// StockStatus = 6,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// MESsubPalletCode = dt_Task.MESsubPalletCode,
			//};

			Dt_LocationInfo dt_LocationInfo = _locationInfoRepository.QueryFirst(x => x.LocationCode == dt_StockInfo.LocationCode);
			dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.InStockLock;
			dt_StockInfo.StockStatus = 7;

			bool l = _locationInfoRepository.UpdateData(dt_LocationInfo);
			bool s = _stockRepository.UpdateData(dt_StockInfo);
			int t = BaseDal.AddData(dt_Task);
			bool ss = s.ObjToBool();
			bool tt = t.ObjToBool();


			if (!l && !ss && tt)
			{
			_unitOfWorkManage.RollbackTran();
			}

			dt_s.Add(dt_Task);
			var respon = PushTasksToWCS(dt_s, "");
			if (respon.Status)
			{
			_unitOfWorkManage.CommitTran(); //æäº¤äºå¡
			return WebResponseContent.Instance.OK();
			}
			return WebResponseContent.Instance.Error();
			}
			catch
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error();

			}
			}
			}
			}