ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -47,7 +47,7 @@
			return content.Error($"æªæ¾å°åºå");
			}
			//è·ååºåè´§ä½
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x =>x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && stockInfos.Select(x=>x.LocationCode).Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() \|\| x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()));
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x =>x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && stockInfos.Select(x=>x.LocationCode).Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt());
			if (locationInfos == null \|\| locationInfos.Count != stockInfos.Count)
			{
			return content.Error($"è´§ä½åºåºæ¡ä»¶ä¸æ»¡è¶³");
			@@ -100,7 +100,7 @@
			{
			return WebResponseContent.Instance.OK(data: task.TargetAddress);
			}
			Dt_AGVStationInfo? aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryData(x => x.StationArea == nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´) && x.IsOccupied == WhetherEnum.False.ObjToInt()).OrderByDescending(x => x.Depth).FirstOrDefault();
			Dt_AGVStationInfo? aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryData(x => x.StationArea == nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´) && x.IsOccupied == WhetherEnum.False.ObjToInt()).OrderByDescending(x => x.Depth).FirstOrDefault();
			if (aGVStationInfo==null)
			{
			return content.Error("æªæ¾å°å¯åéçåºåºç«ç¹");
			@@ -120,6 +120,7 @@
			/// </summary>
			public WebResponseContent OutboundTaskCompleted(Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
			@@ -128,7 +129,7 @@
			Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			if (locationInfoStart == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçèµ·ç¹è´§ä½ä¿¡æ¯");
			return content.Error($"æªæ¾å°å¯¹åºçèµ·ç¹è´§ä½ä¿¡æ¯");
			}
			Dt_ProStockInfo proStockInfo = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x=>x.proStockInfoDetails).First();
			if (proStockInfo != null && proStockInfo.StockStatus==StockStatusEmun.åºåºéå®.ObjToInt())
			@@ -147,7 +148,7 @@
			}
			else
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºåºåä¿¡æ¯");
			return content.Error($"æªæ¾å°å¯¹åºåºåä¿¡æ¯");
			}
			}
			else//åæåºå®æ
			@@ -155,12 +156,18 @@
			Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			if (locationInfoStart == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçèµ·ç¹è´§ä½ä¿¡æ¯");
			return content.Error($"æªæ¾å°å¯¹åºçèµ·ç¹è´§ä½ä¿¡æ¯");
			}
			if (locationInfoStart.LocationStatus!=LocationStatusEnum.Lock.ObjToInt())
			{
			return content.Error($"è´§ä½ç¶æä¸æ£ç¡®");
			}
			Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
			if (stockInfo != null && stockInfo.StockStatus == StockStatusEmun.åºåºéå®.ObjToInt())
			{
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			//è·åææåºåºè¯¦ææ°æ®
			List<Dt_OutStockLockInfo>? outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x=>x.TaskNum==task.TaskNum);
			_unitOfWorkManage.BeginTran();
			//å¤çåºåæ°æ®
			if (task.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt())
			@@ -175,21 +182,29 @@
			stockInfo.StockStatus = StockStatusEmun.åºåºå®æ.ObjToInt();
			_stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.äººå·¥å®æ : WIDESEA_Core.Enums.OperateTypeEnum.èªå¨å®æ);
			}
			if (outStockLockInfos!=null && outStockLockInfos.Count>0)
			{
			outStockLockInfos.ForEach(x =>
			{
			x.Status=OutLockStockStatusEnum.åºåºå®æ.ObjToInt();
			});
			_outboundRepository.OutStockLockInfoRepository.UpdateData(outStockLockInfos);
			}
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.äººå·¥å®æ : WIDESEA_Core.Enums.OperateTypeEnum.èªå¨å®æ);
			_unitOfWorkManage.CommitTran();
			}
			else
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºåºåä¿¡æ¯");
			return content.Error($"æªæ¾å°å¯¹åºåºåä¿¡æ¯");
			}
			}
			return WebResponseContent.Instance.OK();
			return content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return WebResponseContent.Instance.Error(ex.Message);
			return content.Error(ex.Message);
			}
			}
			/// <summary>
			@@ -228,6 +243,59 @@
			Quantity = stockInfo.StockLength,
			};
			if (stockInfo.MaterielWide>0)
			{
			task.TaskLength = (int)stockInfo.MaterielWide;
			}
			tasks.Add(task);
			}
			}
			}
			return tasks;
			}
			/// <summary>
			/// åºåæ°æ®è½¬åºåºä»»å¡(MESå·¥å)
			/// </summary>
			/// <param name="stockInfos"></param>
			/// <returns></returns>
			public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos,List<Dt_OutStockLockInfo> outStockLockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			for (int i = 0; i < stockInfos.Count; i++)
			{
			Dt_StockInfo stockInfo = stockInfos[i];

			if (stockInfo != null)
			{
			Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
			if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
			{
			Dt_OutStockLockInfo outStockLockInfo = outStockLockInfos.FirstOrDefault(x => x.PalletCode == stockInfo.PalletCode);
			taskType = outStockLockInfo.MachineName.ObjToInt() switch
			{
			(int)StationAreaEnum.äºæ¥¼çº¸è¢ => TaskTypeEnum.PaperYLOutZDGL,
			(int)StationAreaEnum.ä¸æ¥¼å°å· => TaskTypeEnum.PrintYLOutbound,
			_ => throw new Exception($"æªæ¾å°å å·¥ä¸å¿ä»»å¡ç±»ååé")
			};
			Dt_Task task = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = "",
			TaskStatus = TaskStatusEnum.CallPending.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,
			MaterielCode = stockInfo.MaterielCode,
			RfidCode = stockInfo.RfidCode,
			Quantity = stockInfo.StockLength,
			OrderNo= outStockLockInfo.OrderNo
			};
			if (stockInfo.MaterielWide > 0)
			{
			task.TaskLength = (int)stockInfo.MaterielWide;
			}
			@@ -286,11 +354,11 @@
			{
			List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x=>x.StationArea == targetId && x.IsOccupied==WhetherEnum.False.ObjToInt());
			int useCount=aGVStationInfos.Count;
			if (targetId == nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´))
			if (targetId == nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´))
			{

			//è·åæææå°åºåºä»»å¡
			List<Dt_Task> _TasksOut = BaseDal.QueryData(x => x.TaskType == TaskTypeEnum.OutProduct.ObjToInt() && x.TargetAddress == nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´));
			List<Dt_Task> _TasksOut = BaseDal.QueryData(x => x.TaskType == TaskTypeEnum.OutProduct.ObjToInt() && x.TargetAddress == nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´));
			if (_TasksOut.Count>0)
			{
			useCount -= _TasksOut.Count;
			@@ -301,7 +369,7 @@
			return content.Error($"å¯ç¨ç¼åæ°ä¸è¶³");
			}
			//è·åè´§ä½
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() \|\| x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
			List<Dt_ProStockInfo> stockInfos = new List<Dt_ProStockInfo>();
			if (materialCode=="1")
			{
			@@ -332,16 +400,16 @@
			}
			TaskTypeEnum typeEnum = targetId switch
			{
			nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´) => TaskTypeEnum.OutProduct,
			nameof(AGVStationAreaEnum.ä¸æ¥¼æ çººç»å¸) => TaskTypeEnum.OutWFB,
			nameof(AGVStationAreaEnum.ä¸æ¥¼æ çººæ·è) => TaskTypeEnum.OutWFBLM,
			nameof(AGVStationAreaEnum.ä¸æ¥¼çº¸å¼ æ·è) => TaskTypeEnum.OutPaperLM,
			nameof(AGVStationAreaEnum.ä¸æ¥¼åå) => TaskTypeEnum.OutFenQie,
			nameof(AGVStationAreaEnum.ä¸æ¥¼æ¨¡å) => TaskTypeEnum.OutMoQie,
			nameof(AGVStationAreaEnum.ä¸æ¥¼å²å) => TaskTypeEnum.OutChongQie,
			nameof(AGVStationAreaEnum.äºæ¥¼çº¸è¢) or
			nameof(AGVStationAreaEnum.äºæ¥¼æ çººå¸è¢) or
			nameof(AGVStationAreaEnum.äºæ¥¼çº¸æ¯) => TaskTypeEnum.OutCarton,
			nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´) => TaskTypeEnum.OutProduct,
			nameof(StationAreaEnum.ä¸æ¥¼æ çººç»å¸) => TaskTypeEnum.OutWFB,
			nameof(StationAreaEnum.ä¸æ¥¼æ çººæ·è) => TaskTypeEnum.OutWFBLM,
			nameof(StationAreaEnum.ä¸æ¥¼çº¸å¼ æ·è) => TaskTypeEnum.OutPaperLM,
			nameof(StationAreaEnum.ä¸æ¥¼åå) => TaskTypeEnum.OutFenQie,
			nameof(StationAreaEnum.ä¸æ¥¼æ¨¡å) => TaskTypeEnum.OutMoQie,
			nameof(StationAreaEnum.ä¸æ¥¼å²å) => TaskTypeEnum.OutChongQie,
			nameof(StationAreaEnum.äºæ¥¼çº¸è¢) or
			nameof(StationAreaEnum.äºæ¥¼æ çººå¸è¢) or
			nameof(StationAreaEnum.äºæ¥¼çº¸æ¯) => TaskTypeEnum.OutCarton,
			_ => throw new Exception("æªæ¾å°å¯¹åºä»»å¡")
			};
			if (materialCode == "1" && typeEnum!= TaskTypeEnum.OutCarton)
			@@ -354,7 +422,7 @@
			return content.Error($"çæä»»å¡å¤±è´¥");
			}
			//æå°ä»»å¡ä¸ç´æ¥åéç»ç¹
			if (targetId != nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´))
			if (targetId != nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´))
			{
			for (int i = 0; i < tasks.Count; i++)
			{
			@@ -366,7 +434,7 @@
			{
			for (int i = 0; i < tasks.Count; i++)
			{
			tasks[i].TargetAddress = nameof(AGVStationAreaEnum.ä¸æ¥¼æå°ç å¤´);
			tasks[i].TargetAddress = nameof(StationAreaEnum.ä¸æ¥¼æå°ç å¤´);
			}
			}
			//å¤ææ¯å¦æåºåºåä¿¡æ¯
			@@ -408,9 +476,9 @@
			return content.Error("è¯·å¡«å¥åºåºä¿¡æ¯");
			}
			//è·åè´§ä½
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() \|\| x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
			List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
			//è·åå¯¹åºåºå
			List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.MaterielCode == yLWMSTaskOutDTO.MaterialCode && x.MaterielWide == yLWMSTaskOutDTO.Wide && x.StockStatus == StockStatusEmun.å¥åºå®æ.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.æ°å.ObjToInt()).OrderBy(x => x.CreateDate).Take(yLWMSTaskOutDTO.Count).ToList();
			List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.MaterielCode == yLWMSTaskOutDTO.MaterialCode && x.MaterielWide == yLWMSTaskOutDTO.Wide && x.StockStatus == StockStatusEmun.å¥åºå®æ.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.æ°å.ObjToInt()).OrderByDescending(x => x.CreateDate).Take(yLWMSTaskOutDTO.Count).ToList();
			if (stockInfos.Count< yLWMSTaskOutDTO.Count)
			{
			return content.Error($"åºå{yLWMSTaskOutDTO.MaterialCode}æ°éä¸è¶³");
			@@ -432,10 +500,21 @@
			}
			if (!string.IsNullOrEmpty(yLWMSTaskOutDTO.Address))
			{
			tasks.ForEach(x =>
			if (yLWMSTaskOutDTO.Address=="1")
			{
			x.TargetAddress= yLWMSTaskOutDTO.Address;
			});
			tasks.ForEach(x =>
			{
			x.TargetAddress = "PNT_1_363";
			});
			}
			else
			{
			tasks.ForEach(x =>
			{
			x.TargetAddress = yLWMSTaskOutDTO.Address;
			});
			}

			}
			else
			{
			@@ -630,7 +709,8 @@
			WebResponseContent content = new WebResponseContent();
			try
			{

			//è·åææå¾é¢æçåºåºè¯¦æ
			List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x=>x.OrderType==OutOrderTypeEnum.OutSGPick.ObjToInt());
			}
			catch (Exception ex)
			{
			@@ -698,6 +778,8 @@
			foreach (var item in AddoutMESOrders)
			{
			Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
			Dt_MakeCenterInfo makeCenterInfo=makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
			item.MakeArea = makeCenterInfo.MakeArea;
			item.WarehouseId = materielInfo.WarehouseId;
			}

			@@ -705,50 +787,54 @@
			_unitOfWorkManage.BeginTran();

			_outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
			List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<Dt_StockInfo>? stockInfos = null;
			List<Dt_OutMESOrder>? Orders = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			{
			//åéåºå
			(List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders);
			if (result.Item1 != null && result.Item1.Count > 0)
			{
			//åå»ºä»»å¡
			tasks = GetTasks(result.Item1, result.Item3, TaskTypeEnum.PrintYLOutbound);
			result.Item2.ForEach(x =>
			{
			OutOrderStatusEnum.åºåºä¸.ObjToInt();
			});
			result.Item3.ForEach(x =>
			{
			x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			});

			//List<Dt_Task> tasks = new List<Dt_Task>();
			//List<Dt_StockInfo>? stockInfos = null;
			//List<Dt_OutMESOrder>? Orders = null;
			//List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			//List<Dt_LocationInfo>? locationInfos = null;
			//{
			// //åéåºå
			// (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(AddoutMESOrders);
			// if (result.Item1 != null && result.Item1.Count > 0)
			// {
			// //åå»ºä»»å¡
			// tasks = GetTasks(result.Item1, TaskTypeEnum.PrintYLOutbound);
			// result.Item2.ForEach(x =>
			// {
			// OutOrderStatusEnum.åºåºä¸.ObjToInt();
			// });
			// result.Item3.ForEach(x =>
			// {
			// x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt();
			// });
			stockInfos = result.Item1;
			Orders = result.Item2;
			outStockLockInfos = result.Item3;
			locationInfos = result.Item4;
			}
			else
			{
			throw new Exception("æ åºå");
			}
			}
			int id = BaseDal.AddData(tasks);

			// stockInfos = result.Item1;
			// Orders = result.Item2;
			// outStockLockInfos = result.Item3;
			// locationInfos = result.Item4;
			// }
			// else
			// {
			// throw new Exception("æ åºå");
			// }
			//}
			//int id = BaseDal.AddData(tasks);
			if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			{
			stockInfos.ForEach(x =>
			{
			x.StockStatus=StockStatusEmun.åºåºéå®.ObjToInt();
			});
			WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);

			//if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
			//{
			// WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);

			// if (!contentResponse.Status)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return content.Error(contentResponse.Message);
			// }
			//}
			if (!contentResponse.Status)
			{
			_unitOfWorkManage.RollbackTran();
			return content.Error(contentResponse.Message);
			}
			}

			_unitOfWorkManage.CommitTran();