ZhongRui/ALDbanyunxiangmu.git

			@@ -2,6 +2,7 @@
			using Microsoft.Extensions.Logging;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
			using SqlSugar;
			using System;
			using System.Collections.Concurrent;
			using System.Collections.Generic;
			@@ -16,9 +17,13 @@
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.CodeConfigEnum;
			using WIDESEA_Core.DB;
			using WIDESEA_Core.Helper;
			using WIDESEA_Core.Seed;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Stock;
			using WIDESEA_IBasicService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;
			using WIDESEA_Model.Models.Check;
			@@ -83,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("ç©ºæåºåºæå!");
			}
			@@ -309,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)
			{
			@@ -385,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,
			};
			@@ -771,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)
			@@ -821,7 +830,7 @@

			}



			#region åæ¹åéåºå
			#region ååéç®¡çå¨
			private static readonly ConcurrentDictionary<string, SemaphoreSlim> _materialLocks =
			@@ -1098,6 +1107,189 @@

			#endregion

			/// <summary>
			/// éå®åºåçæçç¹ååºåº
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> TakeOutbound(List<StockViewDTO> stockViews, string outStation)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			List<int> ids = stockViews.Select(x => x.StockId).ToList();
			//è·ååºå
			List<Dt_StockInfo> stockInfos = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => ids.Contains(x.Id)).Includes(x => x.Details).ToList();
			if (stockInfos.Count != stockViews.Count)
			{
			StockViewDTO? stockViewDTO = stockViews.FirstOrDefault(x => !stockInfos.Select(x => x.PalletCode).ToList().Contains(x.PalletCode));
			return content.Error($"æªæ¾å°{stockViewDTO?.PalletCode}åºå");
			}
			//è·åè´§ä½
			List<string> locStrs = stockInfos.Select(x => x.LocationCode).ToList();
			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));
			return content.Error($"æªæ¾å°{locStr}è´§ä½æ°æ®");
			}
			Dt_TakeStockOrder takeStockOrder = new Dt_TakeStockOrder()
			{
			WarehouseId = stockInfos.FirstOrDefault().WarehouseId,
			TakeStockStatus = TakeStockStatusEnum.çç¹ä¸.ObjToInt(),
			OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.PDCodeRule)),
			AllPalletCode = string.Join(",", stockInfos.Select(item => item.PalletCode).Where(palletCode => !string.IsNullOrEmpty(palletCode))),
			Remark = outStation

			};
			foreach (var item in stockInfos)
			{
			if (item.Details.Count <= 0)
			{
			return content.Error($"æªæ¾å°{item.PalletCode}åºåæç»æ°æ®");
			}
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
			if (locationInfo == null && (locationInfo.EnableStatus == EnableStatusEnum.Disable.ObjToInt() \|\| locationInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && item.StockStatus != StockStatusEmun.å¥åºå®æ.ObjToInt())
			{
			content.Error($"{item.PalletCode}è´§ä½æåºåç¶æä¸æ»¡è¶³åºåºæ¡ä»¶");
			}
			}
			List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutInventory,outStation);
			if (tasks == null \|\| tasks.Count <= 0)
			{
			return content.Error($"çæä»»å¡å¤±è´¥");
			}
			stockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.åºåºéå®.ObjToInt();
			});
			tasks.ForEach(x =>
			{
			x.OrderNo = takeStockOrder.OrderNo;
			});
			locationInfos.ForEach(x =>
			{
			x.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
			});
			_unitOfWorkManage.BeginTran();
			//æ´æ°åºåç¶æ
			_stockRepository.UpdateData(stockInfos);
			_takeStockOrder.AddData(takeStockOrder);
			//æ°å»ºä»»å¡
			BaseDal.AddData(tasks);
			_locationInfoService.UpdateData(locationInfos);
			_unitOfWorkManage.CommitTran();
			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)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			/// <summary>
			/// åæ®çææ¹æ³
			/// </summary>
			static object lock_code = new object();
			public string CreateCodeByRule(string ruleCode)
			{
			lock (lock_code)
			{

			string code = string.Empty;
			DateTime dateTime = DateTime.Now;
			DateTime now = DateTime.Now;
			try
			{
			if (string.IsNullOrEmpty(ruleCode))
			throw new ArgumentNullException(nameof(ruleCode));
			SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
			{
			IsAutoCloseConnection = true,
			DbType = DbType.SqlServer,
			ConnectionString = DBContext.ConnectionString
			});
			Dt_CodeRuleConfig codeRuleConfig = sugarClient.Queryable<Dt_CodeRuleConfig>().Where(x => x.RuleCode == ruleCode).First();
			if (codeRuleConfig == null)
			throw new ArgumentNullException(nameof(codeRuleConfig));
			if (codeRuleConfig.ModifyDate != null)
			{
			dateTime = Convert.ToDateTime(codeRuleConfig.ModifyDate);
			}
			else
			{
			dateTime = Convert.ToDateTime(codeRuleConfig.CreateDate);
			}

			if (now.Year == dateTime.Year && now.Month == dateTime.Month && now.Day == dateTime.Day)
			{
			now = dateTime;
			codeRuleConfig.CurrentVal = Convert.ToInt32(codeRuleConfig.CurrentVal) + 1;
			}
			else
			{
			codeRuleConfig.CurrentVal = 1;
			}
			codeRuleConfig.ModifyDate = DateTime.Now;
			code = codeRuleConfig.StartStr + codeRuleConfig.Format;
			code = code.Replace($"[{CodeFormatTypeEnum.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
			code = code.Replace($"[{CodeFormatTypeEnum.MM}]", now.Month.ToString().PadLeft(2, '0'));
			code = code.Replace($"[{CodeFormatTypeEnum.DD}]", now.Day.ToString().PadLeft(2, '0'));
			code = code.Replace($"[{CodeFormatTypeEnum.ST}]", codeRuleConfig.StartStr?.ToString() ?? "");
			code = code.Replace($"[{CodeFormatTypeEnum.NUM}]", codeRuleConfig.CurrentVal.ToString().PadLeft(codeRuleConfig.Length, '0'));
			Dictionary<string, object> keyValuePairs = new Dictionary<string, object>() { { nameof(codeRuleConfig.CurrentVal), codeRuleConfig.CurrentVal }, { nameof(codeRuleConfig.Id), codeRuleConfig.Id }, { nameof(codeRuleConfig.ModifyDate), DateTime.Now } };
			sugarClient.Updateable(keyValuePairs).AS(MainDb.CodeRuleConfig).WhereColumns(nameof(codeRuleConfig.Id)).ExecuteCommand();
			sugarClient.Updateable(codeRuleConfig);

			}
			catch (Exception ex)
			{

			}
			return code;
			}
			}
			}

			}