ZhiHuiQiCe/JianShanLiKu.git

			@@ -12,6 +12,7 @@
			using MailKit.Search;
			using System.Reflection.Metadata;
			using static WIDESEA_ITaskInfoService.ITaskService;
			using WIDESEA_Common.Log;

			namespace WIDESEA_TaskInfoService
			{
			@@ -239,11 +240,12 @@
			MaterialType = (int)InventoryMaterialType.ç©ºæ,
			Materialweight = 0,
			Wlstatus = (int)InventoryMaterialStatus.ç©ºæ,
			Mgeneratetime = DateTime.Now,
			};
			_stockService.StockInfoService.Repository.AddData(dt_Stock);
			}
			}
			Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
			Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode && x.StockStatus== (int)StockStatusEmun.ç»çæå);
			if (dt_StockInfo != null)
			{
			Dt_LocationInfo newLocation;
			@@ -253,11 +255,81 @@
			if(dt_StockInfo.MaterialType== (int)InventoryMaterialType.æå \|\| (generate.SourceAddress == "R01-003-041-001-01" && dt_StockInfo.MaterialType == (int)InventoryMaterialType.åææ))
			{
			Locationtype = 11;

			}else if(dt_StockInfo.MaterialType == (int)InventoryMaterialType.åææ)
			{
			Locationtype = 10;
			}
			newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);




			int maxRetries = 20;
			int retryCount = 0;
			bool needRetry;

			do
			{
			needRetry = false; // é»è®¤ä¸éè¦éè¯
			retryCount++;


			if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.æå)
			{
			string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
			Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
			if (dt_Inbound.Startingcolumn != 0 \|\| dt_Inbound.Terminationcolumn != 0)
			{
			newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
			}
			else
			{
			newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
			}

			}
			else
			{
			newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
			}


			if (newLocation == null)
			{
			return WebResponseContent.Instance.Error("æ æ³è·ååºä½");
			}

			// 2. æ£æ¥åºå
			if (_stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode) !=null)
			{
			needRetry = true;
			continue; // ç´æ¥è¿å¥ä¸ä¸æ¬¡å¾ªç¯ï¼éè¯ï¼
			}

			// 3. æ£æ¥ä»»å¡
			if (BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode) != null)
			{
			needRetry = true;
			continue;
			}

			// 4. æ£æ¥åå²ä»»å¡
			if (_taskHtyService.CrueeTaskHty(newLocation.LocationCode))
			{
			needRetry = true;
			continue;
			}

			} while (needRetry && retryCount < maxRetries);

			// æ£æ¥æ¯å¦è¶è¿æå¤§éè¯æ¬¡æ°
			if (retryCount >= maxRetries)
			{
			return WebResponseContent.Instance.Error($"æ æ³æ¾å°å¯ç¨åºä½ï¼å·²å°è¯ {retryCount} æ¬¡ï¼");
			}



			//string[] Pallet = PalletCode.Split("-");
			if (newLocation != null && newSourceAddress != null)
			{
			@@ -284,8 +356,13 @@
			{
			newLocation.LocationStatus = newSourceAddress.LocationType == (int)LocationTypeEnum.EmptyOut ? LocationStatusEnum.PalletLock.ObjToInt() : LocationStatusEnum.Lock.ObjToInt();
			}
			BaseDal.AddData(dt_Task);
			else
			{
			return content = WebResponseContent.Instance.Error($"è¯¥åºä½{newSourceAddress.LocationCode}çè´§ä½ç¶æå¼å¸¸ï¼ä¸å¯é");
			}
			_basicService.LocationInfoService.UpdateData(newLocation);
			BaseDal.AddData(dt_Task);


			_unitOfWorkManage.CommitTran();

			@@ -308,6 +385,7 @@
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return content = WebResponseContent.Instance.Error($"çæå¥åºä»»å¡åºéï¼åºéä¿¡æ¯:{ex.Message}");
			throw;
			}
			@@ -384,6 +462,8 @@
			}
			}


			public static List<int> InventoryCode = new List<int>() { 0,1,2,4,5,6}; //0:å¾æ£ 1ï¼åæ ¼ 2ï¼ä¸åæ ¼ 4ï¼éè´§ 5ï¼è¿å·¥ 6ï¼ç¹é
			/// <summary>
			/// è§£æåºå
			/// </summary>
			@@ -395,13 +475,20 @@
			{

			string[] targetCodes = generate.PalletCode.Split("*");
			if (targetCodes.Length == 4)
			if (targetCodes.Length == 5)
			{
			Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);

			if(dt_Inbound != null)
			bool isContained = InventoryCode.Contains(int.Parse(targetCodes[4]));
			if(!isContained)
			{
			Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == generate.PalletCode);
			return content = WebResponseContent.Instance.Error($"ç¬¬äºä½ç©æç¶æç¼ç è§£æéè¯¯ï¼{generate.PalletCode}");
			}

			if (dt_Inbound != null)
			{
			string PalletCodetarget = string.Join("*", targetCodes.Take(3));
			Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode.Contains(PalletCodetarget));
			if (dt_Inbound.OrderType == (int)InventoryMaterialType.åææ) //0ä¸ºåææç¼ç
			{
			List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo == "2" && x.LocationStatus == (int)LocationStatusEnum.Free && x.Depth == 1 && x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationType == (int)LocationTypeEnum.MaterialsCube);
			@@ -417,7 +504,8 @@
			CreateDate = DateTime.Now,
			MaterialType = (int)InventoryMaterialType.åææ,
			Materialweight = decimal.Parse(targetCodes[3]),
			Wlstatus = (int)InventoryMaterialStatus.å¾æ£,
			Wlstatus = int.Parse(targetCodes[4]),
			Mgeneratetime=DateTime.Now,
			};
			_unitOfWorkManage.BeginTran();
			_stockService.StockInfoService.Repository.AddData(dt_Stock);
			@@ -485,7 +573,8 @@
			CreateDate = DateTime.Now,
			MaterialType = (int)InventoryMaterialType.æå,
			Materialweight = decimal.Parse(targetCodes[3]),
			Wlstatus = (int)InventoryMaterialStatus.å¾æ£,
			Wlstatus = int.Parse(targetCodes[4]),
			Mgeneratetime = DateTime.Now,
			};
			_unitOfWorkManage.BeginTran();
			_stockService.StockInfoService.Repository.AddData(dt_Stock);
			@@ -539,7 +628,7 @@
			}
			catch (Exception ex)
			{
			return content=WebResponseContent.Instance.Error($"ç³»ç»å··éå¥åºæ¥å£è§£æéè¯¯ï¼éè¯¯ï¼{ex.Message}");
			return content=WebResponseContent.Instance.Error($"æçæ¡ç éè¯¯ï¼å¯¼è´ç³»ç»éè¯¯ï¼{ex.Message}");
			throw;
			}
			}
			@@ -697,7 +786,7 @@
			{
			WebResponseContent content = new WebResponseContent();
			List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.RoadwayNo=="2" && x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
			&& x.LocationType == (int)LocationTypeEnum.MaterialsCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
			&& x.LocationType == (int)LocationTypeEnum.EmptyCube && x.EnableStatus == (int)EnableStatusEnum.Normal);
			if (locationinfoData.Count < 20)
			{
			return content = WebResponseContent.Instance.OK(data: 1);