WCSNet6.git - Gitblit

			@@ -1,7 +1,13 @@

			using AngleSharp.Dom;
			using COSXML.Network;
			using DocumentFormat.OpenXml.Drawing.Charts;
			using Elastic.Clients.Elasticsearch.Tasks;
			using Furion.DatabaseAccessor;
			using Furion.Logging;
			using Microsoft.AspNetCore.SignalR;
			using WCS.Application.Entity;
			using WCS.Application.Service.WcsTask.Dto;

			namespace WCS.Application;

			@@ -11,13 +17,19 @@
			[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)]
			public class WcsTaskService : IDynamicApiController, ITransient
			{
			private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);

			private readonly SqlSugarRepository<WcsTask> _wcsTaskRep;
			private readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;
			private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
			private readonly SqlSugarRepository<WcsMateialPzInfo> _wcsMateialPzInfoRep;

			public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext)
			public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext, SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsMateialPzInfo> wcsMateialPzInfoRep)
			{
			_wcsTaskRep = wcsTaskRep;
			_taskLogHubContext = taskLogHubContext;
			_wcsCheckTaskRep = wcsCheckTaskRep;
			_wcsMateialPzInfoRep = wcsMateialPzInfoRep;
			}

			/// <summary>
			@@ -38,6 +50,8 @@
			.WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
			.WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType)
			.WhereIF(input.Status.HasValue, u => u.Status == input.Status)
			.WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
			.WhereIF(!string.IsNullOrWhiteSpace(input.Origin), u => u.Origin.Contains(input.Origin.Trim()))
			.Select<WcsTaskOutput>();
			return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
			}
			@@ -52,8 +66,51 @@
			[DisplayName("增加任务表")]
			public async Task<long> Add(AddWcsTaskInput input)
			{
			if(await _wcsTaskRep.AsQueryable().AnyAsync(s => s.TaskNo == input.TaskNo))
			{
			throw Oops.Bah("任务号重复");
			}
			if (input.UnstackingMode == UnstackingModeEnum.Machine)
			{
			if (string.IsNullOrEmpty(input.SkuNo) \|\| string.IsNullOrEmpty(input.SkuName))
			{
			throw Oops.Bah("机器人拣货，物料和批次信息不能为空");
			}
			}
			var entity = input.Adapt<WcsTask>();
			entity.Origin = "WCS";
			if (string.IsNullOrEmpty(entity.TaskNo))
			{
			//生成任务号
			entity.TaskNo = GetTaskCode();
			if (string.IsNullOrEmpty(entity.TaskNo))
			{
			throw Oops.Bah("任务号生成失败");
			}
			}

			#region 机器人拆垛分配拆垛工位
			if (entity.UnstackingMode== UnstackingModeEnum.Machine)
			{
			//分拣任务信息
			List<TaskPortDto> taskPortList = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.RoboatType == PLCTypeEnum.StackingRobot).Select<TaskPortDto>().ToListAsync();
			if (taskPortList.Count <= 0)
			{
			throw Oops.Bah("拆垛工位异常");
			}
			var taskList = await _wcsTaskRep.Context.Queryable<WcsTask>().Where(w => w.Status == 0 && w.IsBind == 0 && w.TaskType == TaskTypeEnum.Out).ToListAsync();
			foreach (var item in taskPortList)
			{
			item.PortCount = taskList.Where(w => w.StationNum == item.Port).Count();
			}
			var portInfo = taskPortList.OrderBy(o => o.PortCount).ThenBy(o => o.LineNO).First();
			//拆垛工位号
			entity.StationNum = portInfo.Port;
			}
			#endregion

			await _wcsTaskRep.InsertAsync(entity);

			return entity.Id;
			}

			@@ -129,12 +186,17 @@
			if (modTask.Status > TaskStatusEnum.Doing)
			throw Oops.Oh("任务状态异常");
			if (input.Status == TaskStatusEnum.Complete)
			{
			modTask.IsSuccess = TaskSuccessEnum.Success;
			modTask.FinishDate = DateTime.Now;//完成时间
			}
			else
			{
			modTask.IsSuccess = TaskSuccessEnum.Fail;
			modTask.FinishDate = DateTime.Now;
			modTask.CancelDate = DateTime.Now;//取消时间
			}
			modTask.Status = input.Status;
			await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate, s.UpdateTime,s.UpdateUserId,s.UpdateUserName }).ExecuteCommandAsync();
			await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate, s.CancelDate, s.UpdateTime, s.UpdateUserId, s.UpdateUserName }).ExecuteCommandAsync();
			//写入任务明细表
			WcsTaskMonitor modTaskMonitor = new WcsTaskMonitor()
			{
			@@ -150,6 +212,25 @@
			await _wcsTaskRep.Context.Insertable(modTaskMonitor).ExecuteCommandAsync();
			//await _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
			//await _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());

			#region
			//分拣任务信息
			var checkTaskList = _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.TaskNo == modTask.TaskNo && w.Status == "1").ToList();
			foreach (var item in checkTaskList)
			{
			item.OrderNo = "";
			item.TaskNo = "";
			item.LotNo = "";
			item.SkuNo = "";
			item.SkuName = "";
			item.BoxType = "";
			item.Qty = 0;
			item.PZNo = "";
			item.Status = "0";//未绑定
			}
			//更新分拣任务
			await _wcsCheckTaskRep.AsUpdateable(checkTaskList).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
			#endregion
			}
			else
			{
			@@ -157,6 +238,94 @@
			}
			}

			// <summary>
			/// 手动给WMS上传任务
			/// </summary>
			/// <param name="input"></param>
			/// <returns></returns>
			[HttpPost]
			[ApiDescriptionSettings(Name = "UploadTask")]
			[DisplayName("手动给WMS上传任务")]
			public async Task UploadTask(UpdateWcsTaskInput input)
			{
			var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
			if (modTask.Status != TaskStatusEnum.Complete)
			{
			throw Oops.Oh("任务状态异常");
			}
			if (modTask.Origin != "WMS")
			{
			throw Oops.Oh("该任务来源不是WMS");
			}
			// 反馈WMS
			var requestMode = new TaskRequestWMS()
			{
			TaskNo = modTask.TaskNo,
			PalletNo = modTask.PalletNo,
			TaskType = ((int)modTask.TaskType).ToString(),
			TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
			};
			//任务详情
			var modTaskMonitor = new WcsTaskMonitor()
			{
			TaskNo = modTask.TaskNo,
			PlcId = 0,
			PlcName = "",
			PalletNo = modTask.PalletNo,
			Status = TaskStatusEnum.Complete,
			StartLocat = modTask.StartLocate,
			EndLocat = modTask.EndLocate,
			InteractiveMsg = $"手动上传给WMS任务完成"
			};
			//调用WMS上传任务接口
			HttpService httpService = new HttpService();
			var modResponseTask = httpService.RequestTask(requestMode).Result;
			if (modResponseTask.StatusCode == 0)
			{
			modTaskMonitor.InteractiveMsg = "手动上传给WMS任务完成";
			}
			else
			{
			Log.Error(string.Format("手动上传WMS任务反馈失败：StatusCode：{0};Msg：{1}", modResponseTask.StatusCode, modResponseTask.Msg));
			}
			// 插入交互日志
			_db.Insertable(modTaskMonitor).ExecuteCommand();
			//下发任务日志
			HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
			}


			/// <summary>
			/// 自动生成任务号
			/// </summary>
			/// <param name="codeFlag"></param>
			/// <returns></returns>
			public string GetTaskCode(string codeFlag="WCS")
			{
			var list = _db.Queryable<WcsTask>().Where(m => m.TaskNo.StartsWith("WCS")).ToList();
			string maxNo = list.Max(m => m.TaskNo);
			if (!string.IsNullOrEmpty(maxNo))
			{
			maxNo = maxNo.Substring(codeFlag.Length);
			}
			//获取数据库时间八位
			string date = DateTime.Now.ToString("yyyyMMdd").Trim();
			string no = "";
			if (string.IsNullOrEmpty(maxNo))
			{
			no = codeFlag + date + "0001";
			}
			else
			{
			if (maxNo.Length==12 && maxNo.Substring(0, 8) == date)
			{
			int lastNo = Convert.ToInt32(maxNo.Substring(8, 4)) + 1;
			no = codeFlag + date + (lastNo.ToString().PadLeft(4, '0'));
			}
			else
			{
			no = codeFlag + date + "0001";
			}
			}
			return no;
			}
			}