MeiRuiAn/JiAnLiKu.git

			@@ -23,6 +23,9 @@
			using WIDESEA_Core.Utilities;
			using System.Transactions;
			using Microsoft.Data.SqlClient;
			using WIDESEA_Model.Models.Outbound;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Core.CodeConfigEnum;

			namespace WIDESEA_TaskInfoService
			{
			@@ -34,7 +37,7 @@
			/// </summary>
			/// <param name="stockInfos"></param>
			/// <returns></returns>
			public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos)
			public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			for (int i = 0; i < stockInfos.Count; i++)
			@@ -60,7 +63,7 @@
			{
			Dt_Task task = new()
			{
			PalletType=stockInfo.PalletType,
			PalletType = stockInfo.PalletType,
			OrderNo = stockInfoDetail.OrderNo,
			CurrentAddress = locationInfo.LocationCode,
			Grade = 0,
			@@ -71,13 +74,17 @@
			SourceAddress = locationInfo.LocationCode,
			TargetAddress = "",
			TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
			TaskType = TaskTypeEnum.Outbound.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			Depth = locationInfo.Depth,
			WarehouseId = stockInfo.WarehouseId,
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
			};
			if (taskType != TaskTypeEnum.OutEmpty)
			{
			task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			}
			tasks.Add(task);
			//var responses = HttpHelper.Post<WebResponseContent>(ReceiveTask, tasks, "立库出库数量回传WMS");
			}
			}

			@@ -119,15 +126,15 @@
			Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			TaskTypeEnum typeEnum = outboundOrder.OrderType switch
			{
			(int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
			(int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
			(int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
			(int)OrderTypeEnum.生产出库单 => TaskTypeEnum.Outbound,
			(int)OrderTypeEnum.调拨出库单 => TaskTypeEnum.OutAllocate,
			(int)OrderTypeEnum.反拣出库单 => TaskTypeEnum.ReverseOut,
			_ => new TaskTypeEnum()
			};
			tasks = GetTasks(result.Item1);
			tasks = GetTasks(result.Item1,typeEnum);
			tasks.ForEach(x =>
			{
			x.OrderNo = outboundOrder.UpperOrderNo;
			x.OrderNo = outboundOrder.OrderNo;
			});
			result.Item2.ForEach(x =>
			{
			@@ -162,6 +169,7 @@
			return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
			}


			/// <summary>
			/// 出库任务数据处理
			/// </summary>
			@@ -192,12 +200,15 @@
			(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			tasks = GetTasks(result.Item1);
			int task = tasks[0].TaskNum;
			result.Item3.ForEach(x =>
			Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
			TaskTypeEnum typeEnum = outboundOrder.OrderType switch
			{
			x.TaskNum = task;
			});
			(int)OrderTypeEnum.生产出库单 => TaskTypeEnum.Outbound,
			(int)OrderTypeEnum.调拨出库单 => TaskTypeEnum.OutAllocate,
			(int)OrderTypeEnum.反拣回库单 => TaskTypeEnum.ReverseIn,
			_ => new TaskTypeEnum()
			};
			tasks = GetTasks(result.Item1, typeEnum);
			result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
			result.Item3.ForEach(x =>
			{
			@@ -219,12 +230,14 @@
			if (stockLockInfos != null && stockLockInfos.Count > 0)
			{
			List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			tasks = GetTasks(stocks);
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
			}
			}

			return (tasks, stockInfos, orderDetail == null ? null : new List<Dt_OutboundOrderDetail> { orderDetail }, outStockLockInfos, locationInfos);
			}


			/// <summary>
			/// 立库出库指令上传，出库任务下发
			/// </summary>
			@@ -242,12 +255,9 @@
			return WebResponseContent.Instance.Error($"未找到该仓库信息");
			}
			Dt_OutboundOrder oldOuboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();
			Dt_Production production = new Dt_Production();
			if (oldOuboundOrder != null)
			{
			//if (oldOuboundOrder.Details.FirstOrDefault(x => x.LinId == Convert.ToInt32(orderAddDTO.LinId)) != null)
			//{
			// return WebResponseContent.Instance.Error($"该明细行号已存在");
			//}
			if (oldOuboundOrder.OutWareHouse != warehouse.WarehouseCode)
			{
			return WebResponseContent.Instance.Error($"仓库不一致");
			@@ -266,12 +276,72 @@
			MaterieSpec = details.MaterieSpec,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			OrderQuantity = details.OrderQuantity,
			LinId = details.LinId,
			OrderId = oldOuboundOrder.Id,
			Creater = "WMS",
			CreateDate = DateTime.Now,
			Remark = details.Remark,
			SupplierBatch = details.SupplierBatch
			};
			_outboundOrderDetailRepository.AddData(outboundOrderDetail);
			//_outboundOrderDetailRepository.AddData(outboundOrderDetail);
			foreach (var item in orderAddDTO1.Details)
			{
			if (string.IsNullOrWhiteSpace(item.Remark))
			{
			continue;
			}
			string[] remarkEntries = item.Remark.Split(
			new[] { ';' },
			StringSplitOptions.RemoveEmptyEntries
			);

			foreach (var entry in remarkEntries)
			{
			string[] keyValuePairs = entry.Split(
			new[] { ',' },
			StringSplitOptions.RemoveEmptyEntries
			);

			foreach (var kvp in keyValuePairs)
			{
			int colonIndex = kvp.IndexOf(':');
			if (colonIndex <= 0 \|\| colonIndex >= kvp.Length - 1)
			{
			continue;
			}

			string key = kvp.Substring(0, colonIndex).Trim();
			string value = kvp.Substring(colonIndex + 1).Trim();

			switch (key)
			{
			case "制造单号":
			production.ProductionNo = value;
			break;
			case "制造部件":
			production.ManufacturingCo = value;
			break;
			case "出库数量":
			if (decimal.TryParse(value, out decimal outQuantity))
			{
			production.OutQuantity = outQuantity;
			}
			else
			{
			Console.WriteLine($"出库数量格式错误：{value}（应为数值，如14.0000）");
			}
			break;
			default:
			Console.WriteLine($"未知键名：{key}（对应值：{value}，跳过该键值对）");
			break;
			}

			}
			production.Creater = "WMS";
			production.OrderId = outboundOrderDetail.Id;
			_productionRepository.AddData(production);
			}
			}
			}
			}
			else
			@@ -280,41 +350,82 @@
			orderAddDTO1.OrderNo = orderAddDTO.No;
			orderAddDTO1.UpperOrderNo = orderAddDTO.No;
			orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
			orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
			orderAddDTO1.InoutType = orderAddDTO.OrderType;
			orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
			orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode?? "工单发料";
			orderAddDTO1.InoutType = orderAddDTO.OrderType ?? InoutTypeEnum.WorkFeed.ToString();
			orderAddDTO1.OrderType = orderAddDTO.InoutType;
			orderAddDTO1.System = orderAddDTO.System;
			IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
			//orderAddDTO1.OrderType = orderAddDTO.OrderType.ObjToInt();
			orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
			#region 验证数据
			(bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
			if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
			#endregion

			Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
			inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
			inboundOrder.Creater = "WMS";
			inboundOrder.CreateDate = DateTime.Now;
			inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
			_unitOfWorkManage.BeginTran();
			bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
			//Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
			//Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
			//List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
			//StockSelectViewDTO stockSelectViewDTO = new()
			//{
			// OrderNo = orderAddDTO1.OrderNo,
			// MaterielCode = outboundOrderDetail.MaterielCode,
			// MaterielName = outboundOrderDetail.MaterielName,
			// UseableQuantity = outboundOrderDetail.OrderQuantity,
			// BatchNo = outboundOrderDetail.BatchNo,
			// LinId = outboundOrderDetail.LinId,
			// PalletCode = outboundOrderDetail.LPNNo,
			//};

			foreach (var item in orderAddDTO1.Details)
			{
			if (string.IsNullOrWhiteSpace(item.Remark))
			{
			continue;
			}
			string[] remarkEntries = item.Remark.Split(
			new[] { ';' },
			StringSplitOptions.RemoveEmptyEntries
			);

			foreach (var entry in remarkEntries)
			{
			string[] keyValuePairs = entry.Split(
			new[] { ',' },
			StringSplitOptions.RemoveEmptyEntries
			);

			//stockSelectViews.Add(stockSelectViewDTO);
			//GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);
			foreach (var kvp in keyValuePairs)
			{
			int colonIndex = kvp.IndexOf(':');
			if (colonIndex <= 0 \|\| colonIndex >= kvp.Length - 1)
			{
			continue;
			}

			string key = kvp.Substring(0, colonIndex).Trim();
			string value = kvp.Substring(colonIndex + 1).Trim();

			switch (key)
			{
			case "制造单号":
			production.ProductionNo = value;
			break;
			case "制造部件":
			production.ManufacturingCo = value;
			break;
			case "出库数量":
			if (decimal.TryParse(value, out decimal outQuantity))
			{
			production.OutQuantity = outQuantity;
			}
			else
			{
			Console.WriteLine($"出库数量格式错误：{value}（应为数值，如14.0000）");
			}
			break;
			default:
			Console.WriteLine($"未知键名：{key}（对应值：{value}，跳过该键值对）");
			break;
			}

			}
			production.Creater = "WMS";
			production.OrderId = inboundOrder.Details.FirstOrDefault().Id;
			_productionRepository.AddData(production);
			}
			}
			_unitOfWorkManage.CommitTran();
			}

			@@ -478,6 +589,9 @@

			if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
			{
			Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
			outboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
			_outboundService.OutboundOrderService.Repository.UpdateData(outboundOrder);
			content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

			if (!content.Status)
			@@ -775,5 +889,104 @@
			return content = WebResponseContent.Instance.Error($"未找到任务号");
			}
			}

			/// <summary>
			/// 选定库存生成盘点单出库
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public WebResponseContent TakeOutbound(List<StockViewDTO> stockViews)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (stockViews.Select(x => x.WarehouseId).Distinct().Count() >= 2)
			{
			return content.Error($"请选择同一仓库库存进行盘点");
			}
			List<int> ids = stockViews.Select(x => x.StockId).ToList();
			//获取库存
			List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.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 = _basicRepository.LocationInfoRepository.QueryData(x => locStrs.Contains(x.LocationCode));
			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 = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCode.PDCodeRule)),
			Details = new List<Dt_TakeStockOrderDetail>()
			};
			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.OnlyOut.ObjToInt() \|\| locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && item.StockStatus == StockStatusEmun.入库完成.ObjToInt())
			{
			//创建明细
			Dt_TakeStockOrderDetail takeStockOrderDetail = new Dt_TakeStockOrderDetail()
			{
			MaterielCode = item.Details.FirstOrDefault().MaterielCode,
			MaterielName = item.Details.FirstOrDefault().MaterielName ?? "无物料名称",
			BatchNo = item.Details.FirstOrDefault().BatchNo,
			MaterielSpec = item.Details.FirstOrDefault().MaterieSpec ?? "无物料规格",
			LocationCode = item.LocationCode,
			TakePalletCode = item.PalletCode,
			TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库中.ObjToInt(),
			SysQty = item.Details.Sum(x => x.StockQuantity),
			Qty = 0
			};
			takeStockOrder.Details.Add(takeStockOrderDetail);
			}
			else
			{
			content.Error($"货位或库存状态不满足出库条件");
			}
			}
			List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutInventory);
			if (tasks == null \|\| tasks.Count <= 0)
			{
			return content.Error($"生成任务失败");
			}
			stockInfos.ForEach(x =>
			{
			x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
			});
			tasks.ForEach(x =>
			{
			x.OrderNo = takeStockOrder.OrderNo;
			});
			LocationStatusEnum locationStatus = LocationStatusEnum.Lock;
			_unitOfWorkManage.BeginTran();
			//更新库存状态
			_stockRepository.StockInfoRepository.UpdateData(stockInfos);
			BaseDal.Db.InsertNav(takeStockOrder).Include(x => x.Details).ExecuteCommand();
			//新建任务
			BaseDal.AddData(tasks);
			_basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			}
			}