ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -33,6 +33,8 @@
			using WIDESEA_External.Model;
			using System.Text.Json;
			using System.Text.RegularExpressions;
			using WIDESEA_Common.MaterielEnum;
			using MailKit.Search;

			namespace WIDESEA_TaskInfoService
			{
			@@ -90,8 +92,8 @@
			DispatchPlanMaterialId = autoIssueDTO.OutDetailId,
			InvItemCode = task.MaterielCode,
			Quantity = outStockLockInfo.AssignQuantity,
			SendOutTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),
			ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd hh:mm:ss")
			SendOutTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd HH:mm:ss")
			};
			MESDispatchModel dispatchModel = new MESDispatchModel()
			{
			@@ -99,15 +101,15 @@
			};
			_unitOfWorkManage.BeginTran();
			task.TaskStatus = TaskStatusEnum.New.ObjToInt();
			task.TargetAddress = stationInfo.AGVStationCode;
			task.TargetAddress = autoIssueDTO.PointCode.StartsWith("YS") ? stationInfo.AGVStationCode : autoIssueDTO.PointCode;
			BaseDal.UpdateData(task);
			MESResponse mESResponse = _invokeMESService.MESDispatchUp(dispatchModel).DeserializeObject<MESResponse>() ?? throw new Exception("æªè·åå°è¿åä¿¡æ¯");
			if (!mESResponse.Result)
			{
			throw new Exception($"MESééåºåæ¥å£è°ç¨æ¥é,MESè¿åä¿¡æ¯{DecodeUnicode(mESResponse.Msg)}");
			}
			PushTasksToWCS(new List<Dt_Task> { task });
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(new List<Dt_Task> { task });
			return content.OK("å«ææå");
			}
			}
			@@ -167,8 +169,8 @@
			DispatchPlanMaterialId = manualIssueDTO.OutDetailId,
			InvItemCode = task.MaterielCode,
			Quantity = outStockLockInfo.AssignQuantity,
			SendOutTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),
			ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd hh:mm:ss")
			SendOutTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
			ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd HH:mm:ss")
			};
			MESDispatchModel dispatchModel = new MESDispatchModel()
			{
			@@ -176,15 +178,15 @@
			};
			_unitOfWorkManage.BeginTran();
			task.TaskStatus = TaskStatusEnum.New.ObjToInt();
			task.TargetAddress = stationInfo.AGVStationCode;
			task.TargetAddress = manualIssueDTO.PointCode.StartsWith("YS") ? stationInfo.AGVStationCode : manualIssueDTO.PointCode;
			BaseDal.UpdateData(task);
			MESResponse mESResponse = _invokeMESService.MESDispatchUp(dispatchModel).DeserializeObject<MESResponse>() ?? throw new Exception("æªè·åå°è¿åä¿¡æ¯");
			if (!mESResponse.Result)
			{
			throw new Exception($"MESééåºåæ¥å£è°ç¨æ¥é,MESè¿åä¿¡æ¯{DecodeUnicode(mESResponse.Msg)}");
			}
			PushTasksToWCS(new List<Dt_Task> { task });
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(new List<Dt_Task> { task });
			return content.OK("å«ææå");
			}
			}
			@@ -216,16 +218,117 @@
			{
			return content.Error($"å¨è½¬ä½{nameof(MESReturnIssueDTO.PointCode)}{returnIssueDTO.PointCode}ä¸åå¨");
			}
			//è·åææåºå
			List<Dt_StockInfo> stockInfosOld = _stockRepository.StockInfoRepository.QueryData();
			////ç©ºæ
			//foreach (var item in returnIssueDTOs.Where(x=>x.ReturnMaterial==null))
			//{

			//}
			//éæ
			List<Dt_StockInfo> stockInfos=new List<Dt_StockInfo>();
			List<Dt_Task> tasksNew = new List<Dt_Task>();
			foreach (var item in returnIssueDTOs.Where(x => x.ReturnMaterial != null))
			{
			MESReturnMaterial? returnMaterial = item.ReturnMaterial;
			if (returnMaterial.BarCode.IsNullOrEmpty())
			{
			return content.Error($"éæä¼ å¥æ¡ç ä¸è½ä¸ºç©º");
			}

			Dt_AGVStationInfo aGVStationInfo = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item.PointCode);
			Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == returnMaterial.MaterialCode);
			if (materielInfo == null)
			{
			return content.Error($"æªæ¾å°æ¡ç {returnMaterial.BarCode}ç©æä¿¡æ¯");
			}
			//å¤æ
			if (returnMaterial.Thickness <= 0 && materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
			{
			return content.Error($"ç©æ{returnMaterial.MaterialCode}æ¡ç {returnMaterial.BarCode}ç´å¾ä¸è½å°äº0");
			}
			if (returnMaterial.Wide <= 0 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
			{
			return content.Error($"ç©æ{returnMaterial.MaterialCode}æ¡ç {returnMaterial.BarCode}ç´å¾ä¸è½å°äº0");
			}
			Dt_StockInfo? stockInfoOld = stockInfosOld.FirstOrDefault(x => x.PalletCode == returnMaterial.BarCode);
			if (stockInfoOld != null)
			{
			return content.Error($"æ¡ç {returnMaterial.BarCode}ä¿¡æ¯å·²åå¨");
			}
			//çæåºåç»çä¿¡æ¯
			Dt_StockInfo stockInfo = new Dt_StockInfo()
			{
			MaterielInvOrgId = materielInfo.MaterielInvOrgId,
			PalletCode = returnMaterial.BarCode,
			LocationCode = "",
			PalletType = 1,
			WarehouseId = materielInfo.WarehouseId,
			StockAttribute = materielInfo.MaterielSourceType,
			StockStatus = StockStatusEmun.MESä½æéåº.ObjToInt(),
			MaterielSpec = materielInfo.MaterielSpec,
			BatchNo = returnMaterial.MaterialLot,
			Unit = materielInfo.MaterielUnit,
			MaterielThickness = returnMaterial.Thickness,
			CheckThickness= returnMaterial.Thickness,
			MaterielWide = returnMaterial.Wide,
			MaterielWeight = returnMaterial.Weight,
			MaterielCode = materielInfo.MaterielCode,
			StockLength = returnMaterial.ReturnQuantity,
			OrderNo = returnMaterial.ReturnOrderNo,
			MaterielName = materielInfo.MaterielName,
			IsFull = WhetherEnum.True.ObjToInt(),
			IsPick = returnMaterial.Whether == 0 ? WhetherEnum.True.ObjToInt() : WhetherEnum.False.ObjToInt(),
			Remark = StockStatusEmun.MESä½æéåº.ToString()
			};
			if (stockInfo.MaterielWide > 1200)
			{
			stockInfo.PalletType = 2;
			}
			stockInfos.Add(stockInfo);
			//çæä½æéæä»»å¡
			Dt_Task newTask = new Dt_Task()
			{
			CurrentAddress = item.PointCode.StartsWith("YS") ? aGVStationInfo.AGVStationCode : item.PointCode,
			Grade = 0,
			NextAddress = "",
			PalletCode = stockInfo.PalletCode,
			Roadway = "",
			SourceAddress = item.PointCode.StartsWith("YS") ? aGVStationInfo.AGVStationCode : item.PointCode,
			TargetAddress = "",
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			WarehouseId = materielInfo.WarehouseId,
			PalletType = stockInfo.PalletType,
			MaterielCode=stockInfo.MaterielCode,
			Quantity=stockInfo.StockLength,
			OrderNo=stockInfo.OrderNo,
			TaskLength = (int)stockInfo.MaterielWide,
			GroupId= item.IssueId,
			WorkCentreCode=item.MakeCode
			};
			TaskTypeEnum taskTypeEnum = aGVStationInfo.StationArea switch
			{
			nameof(StationAreaEnum.ä¸æ¥¼å°å·) => TaskTypeEnum.PrintYLBackInbound,
			_ => throw new Exception("æªæ¾å°å¯¹åºä»»å¡")
			};
			newTask.TaskType = taskTypeEnum.ObjToInt();
			tasksNew.Add(newTask);
			}
			_unitOfWorkManage.BeginTran();
			BaseDal.AddData(tasksNew);
			_stockRepository.StockInfoRepository.AddData(stockInfos);
			_unitOfWorkManage.CommitTran();
			//æ¨éä»»å¡
			PushTasksToWCS(tasksNew);
			content.OK("å¼å«æå");
			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}

			}
			}