ZhongRui/ALDbanyunxiangmu.git

			@@ -88,31 +88,33 @@

			_unitOfWorkManage.CommitTran();

			TaskModel esstask = new TaskModel()
			{
			taskType = "carry",
			taskGroupCode = "",
			groupPriority = 0,
			tasks = new List<TasksType>
			{
			new()
			{
			taskCode=task.TaskNum.ToString(),
			taskPriority=0,
			taskDescribe=new TaskDescribeType{
			containerCode=stockInfo.PalletCode,
			containerType= "CT_KUBOT_STANDARD",
			fromLocationCode=stockInfo.LocationCode??"",
			toStationCode="",
			toLocationCode="1-2",
			deadline=0,storageTag=""
			}
			}
			}
			};
			var result = await _eSSApiService.CreateTaskAsync(esstask);
			//TaskModel esstask = new TaskModel()
			//{
			// taskType = "carry",
			// taskGroupCode = "",
			// groupPriority = 0,
			// tasks = new List<TasksType>
			// {
			// new()
			// {
			// taskCode=task.TaskNum.ToString(),
			// taskPriority=0,
			// taskDescribe=new TaskDescribeType
			// {
			// containerCode=stockInfo.PalletCode,
			// containerType= "CT_KUBOT_STANDARD",
			// fromLocationCode=stockInfo.LocationCode??"",
			// toStationCode="",
			// toLocationCode="1-2",
			// deadline=0,
			// storageTag=""
			// }
			// }
			// }
			//};
			//var result = await _eSSApiService.CreateTaskAsync(esstask);

			_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			//_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			}
			return content.OK("ç©ºæåºåºæå!");
			}
			@@ -314,45 +316,46 @@
			_outboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			TaskModel esstask = new TaskModel()
			{
			taskType = "carry",
			taskGroupCode = "",
			groupPriority = 0,
			tasks = new List<TasksType>()
			};
			return WebResponseContent.Instance.OK();
			//TaskModel esstask = new TaskModel()
			//{
			// taskType = "carry",
			// taskGroupCode = "",
			// groupPriority = 0,
			// tasks = new List<TasksType>()
			//};

			foreach (var task in tasks)
			{
			esstask.
			tasks.Add(new TasksType
			{
			taskCode = task.TaskNum.ToString(),
			taskPriority = 0,
			taskDescribe = new TaskDescribeType
			{
			containerCode = task.PalletCode,
			containerType = "CT_KUBOT_STANDARD",
			fromLocationCode = task.SourceAddress ?? "",
			toStationCode = "",
			toLocationCode = task.TargetAddress,
			deadline = 0,
			storageTag = ""
			}
			}
			);
			}
			var result = await _eSSApiService.CreateTaskAsync(esstask);
			//foreach (var task in tasks)
			//{
			// esstask.
			// tasks.Add(new TasksType
			// {
			// taskCode = task.TaskNum.ToString(),
			// taskPriority = 0,
			// taskDescribe = new TaskDescribeType
			// {
			// containerCode = task.PalletCode,
			// containerType = "CT_KUBOT_STANDARD",
			// fromLocationCode = task.SourceAddress ?? "",
			// toStationCode = "",
			// toLocationCode = task.TargetAddress,
			// deadline = 0,
			// storageTag = ""
			// }
			// }
			// );
			//}
			//var result = await _eSSApiService.CreateTaskAsync(esstask);

			_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			if (result)
			{
			return WebResponseContent.Instance.OK();
			}
			else
			{
			return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			}
			//_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			//if (result)
			//{
			// return WebResponseContent.Instance.OK();
			//}
			//else
			//{
			// return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			//}
			}
			catch (Exception ex)
			{
			@@ -390,7 +393,7 @@
			TargetAddress = outStation,
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			// TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			//TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			};
			@@ -776,46 +779,47 @@
			_outboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			//PushTasksToWCS(tasks);
			TaskModel esstask = new TaskModel()
			{
			taskType = "carry",
			taskGroupCode = "",
			groupPriority = 0,
			tasks = new List<TasksType>()
			};
			//TaskModel esstask = new TaskModel()
			//{
			// taskType = "carry",
			// taskGroupCode = "",
			// groupPriority = 0,
			// tasks = new List<TasksType>()
			//};

			foreach (var task in tasks)
			{
			esstask.
			tasks.Add(new TasksType
			{
			taskCode = task.TaskNum.ToString(),
			taskPriority = 0,
			taskDescribe = new TaskDescribeType
			{
			containerCode = task.PalletCode,
			containerType = "CT_KUBOT_STANDARD",
			fromLocationCode = task.SourceAddress ?? "",
			toStationCode = "",
			toLocationCode = task.TargetAddress,
			deadline = 0,
			storageTag = ""
			}
			}
			);
			}
			var result = await _eSSApiService.CreateTaskAsync(esstask);
			//foreach (var task in tasks)
			//{
			// esstask.
			// tasks.Add(new TasksType
			// {
			// taskCode = task.TaskNum.ToString(),
			// taskPriority = 0,
			// taskDescribe = new TaskDescribeType
			// {
			// containerCode = task.PalletCode,
			// containerType = "CT_KUBOT_STANDARD",
			// fromLocationCode = task.SourceAddress ?? "",
			// toStationCode = "",
			// toLocationCode = task.TargetAddress,
			// deadline = 0,
			// storageTag = ""
			// }
			// }
			// );
			//}
			//var result = await _eSSApiService.CreateTaskAsync(esstask);

			_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			if (result)
			{
			return WebResponseContent.Instance.OK();
			}
			else
			{
			return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			}
			//_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			//if (result)
			//{
			// return WebResponseContent.Instance.OK();
			//}
			//else
			//{
			// return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			//}

			}
			catch (Exception ex)
			@@ -826,7 +830,7 @@

			}



			#region åæ¹åéåºå
			#region ååéç®¡çå¨
			private static readonly ConcurrentDictionary<string, SemaphoreSlim> _materialLocks =
			@@ -1123,7 +1127,7 @@
			}
			//è·åè´§ä½
			List<string> locStrs = stockInfos.Select(x => x.LocationCode).ToList();
			List<Dt_LocationInfo> locationInfos = (List<Dt_LocationInfo>)_locationInfoService.Db.Queryable<Dt_LocationInfo>().Where(x => locStrs.Contains(x.LocationCode));
			List<Dt_LocationInfo> locationInfos =_locationInfoService.Db.Queryable<Dt_LocationInfo>().Where(x => locStrs.Contains(x.LocationCode)).ToList();
			if (stockInfos.Count != locationInfos.Count)
			{
			string? locStr = locStrs.FirstOrDefault(x => !locationInfos.Select(x => x.LocationCode).ToList().Contains(x));
			@@ -1134,7 +1138,9 @@
			WarehouseId = stockInfos.FirstOrDefault().WarehouseId,
			TakeStockStatus = TakeStockStatusEnum.çç¹ä¸.ObjToInt(),
			OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.PDCodeRule)),
			Details = new List<Dt_TakeStockOrderDetail>()
			AllPalletCode = string.Join(",", stockInfos.Select(item => item.PalletCode).Where(palletCode => !string.IsNullOrEmpty(palletCode))),
			Remark = outStation

			};
			foreach (var item in stockInfos)
			{
			@@ -1168,51 +1174,52 @@
			_unitOfWorkManage.BeginTran();
			//æ´æ°åºåç¶æ
			_stockRepository.UpdateData(stockInfos);
			BaseDal.Db.InsertNav(takeStockOrder);
			_takeStockOrder.AddData(takeStockOrder);
			//æ°å»ºä»»å¡
			BaseDal.AddData(tasks);
			_locationInfoService.UpdateData(locationInfos);
			_unitOfWorkManage.CommitTran();
			TaskModel esstask = new TaskModel()
			{
			taskType = "carry",
			taskGroupCode = "",
			groupPriority = 0,
			tasks = new List<TasksType>()
			};

			foreach (var task in tasks)
			{
			esstask.
			tasks.Add(new TasksType
			{
			taskCode = task.TaskNum.ToString(),
			taskPriority = 0,
			taskDescribe = new TaskDescribeType
			{
			containerCode = task.PalletCode,
			containerType = "CT_KUBOT_STANDARD",
			fromLocationCode = task.SourceAddress ?? "",
			toStationCode = "",
			toLocationCode = task.TargetAddress,
			deadline = 0,
			storageTag = ""
			}
			}
			);
			}
			var result = await _eSSApiService.CreateTaskAsync(esstask);

			_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			if (result)
			{
			return WebResponseContent.Instance.OK();
			}
			else
			{
			return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			}
			content.OK();
			//TaskModel esstask = new TaskModel()
			//{
			// taskType = "carry",
			// taskGroupCode = "",
			// groupPriority = 0,
			// tasks = new List<TasksType>()
			//};

			//foreach (var task in tasks)
			//{
			// esstask.
			// tasks.Add(new TasksType
			// {
			// taskCode = task.TaskNum.ToString(),
			// taskPriority = 0,
			// taskDescribe = new TaskDescribeType
			// {
			// containerCode = task.PalletCode,
			// containerType = "CT_KUBOT_STANDARD",
			// fromLocationCode = task.SourceAddress ?? "",
			// toStationCode = "",
			// toLocationCode = task.TargetAddress,
			// deadline = 0,
			// storageTag = ""
			// }
			// }
			// );
			//}
			//var result = await _eSSApiService.CreateTaskAsync(esstask);

			//_logger.LogInformation("åå»ºä»»å¡PalletOutboundTask è¿å: " + result);
			//if (result)
			//{
			// return WebResponseContent.Instance.OK();
			//}
			//else
			//{
			// return WebResponseContent.Instance.Error("ä¸åæºå¨äººä»»å¡å¤±è´¥ï¼");
			//}
			//content.OK();
			}
			catch (Exception ex)
			{