From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 125 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 18318cc..3f2e706 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,4 +1,10 @@
锘�
+using AngleSharp.Dom;
+using Elastic.Clients.Elasticsearch.Tasks;
+using Furion.DatabaseAccessor;
+using Microsoft.AspNetCore.SignalR;
+using WCS.Application.Entity;
+
namespace WCS.Application;
/// <summary>
@@ -8,9 +14,16 @@
public class WcsTaskService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsTask> _wcsTaskRep;
- public WcsTaskService(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, SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsMateialPzInfo> wcsMateialPzInfoRep)
{
_wcsTaskRep = wcsTaskRep;
+ _taskLogHubContext = taskLogHubContext;
+ _wcsCheckTaskRep = wcsCheckTaskRep;
+ _wcsMateialPzInfoRep = wcsMateialPzInfoRep;
}
/// <summary>
@@ -23,7 +36,7 @@
[DisplayName("鍒嗛〉鏌ヨ浠诲姟琛�")]
public async Task<SqlSugarPagedList<WcsTaskOutput>> Page(PageWcsTaskInput input)
{
- input.SearchKey = input.SearchKey?.Trim();
+ input.SearchKey = input.SearchKey?.Trim();
var query = _wcsTaskRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.TaskNo.Contains(input.SearchKey)
@@ -32,7 +45,7 @@
.WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType)
.WhereIF(input.Status.HasValue, u => u.Status == input.Status)
.Select<WcsTaskOutput>();
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -45,8 +58,52 @@
[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";
await _wcsTaskRep.InsertAsync(entity);
+
+ #region 缁戝畾鍨涙満
+
+ //鐗╂枡鍝佺淇℃伅
+ var skuInfo = await _wcsMateialPzInfoRep.Context.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == input.SkuNo).FirstAsync();
+ if (skuInfo == null)
+ {
+ throw Oops.Oh("鐗╂枡鍝佺淇℃伅涓嶅瓨鍦�");
+ }
+ //鍒嗘嫞浠诲姟淇℃伅
+ var checkTaskInfo = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "0" && w.RoboatType == "0").OrderBy(o => o.LineNo).FirstAsync();
+ if (checkTaskInfo == null)
+ {
+ throw Oops.Oh("鍒嗘嫞浠诲姟淇℃伅涓嶅瓨鍦�");
+ }
+ if (checkTaskInfo.Status != "0")
+ {
+ throw Oops.Oh("璇ュ伐浣嶅凡缁戝畾浠诲姟锛岃鍕垮啀娆＄粦瀹�");
+ }
+ checkTaskInfo.OrderNo = "";
+ checkTaskInfo.TaskNo = entity.TaskNo;
+ checkTaskInfo.LotNo = entity.LotNo;
+ checkTaskInfo.SkuNo = entity.SkuNo;
+ checkTaskInfo.SkuName = entity.SkuName;
+ checkTaskInfo.BoxType = "";
+ checkTaskInfo.Qty = entity.Qty;
+ checkTaskInfo.Status = "1";//宸茬粦瀹�
+ checkTaskInfo.PZNo = skuInfo.PZNo;
+ //鏇存柊鍒嗘嫞浠诲姟
+ await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ #endregion
+
return entity.Id;
}
@@ -105,7 +162,69 @@
return await _wcsTaskRep.AsQueryable().Select<WcsTaskOutput>().ToListAsync();
}
+ /// <summary>
+ /// 瀹屾垚/鍙栨秷浠诲姟琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Finsh")]
+ [DisplayName("瀹屾垚/鍙栨秷浠诲姟琛�")]
+ [UnitOfWork]
+ public async Task Finsh(UpdateWcsTaskInput input)
+ {
+ if (input.Status == TaskStatusEnum.Complete || input.Status == TaskStatusEnum.Cancell)
+ {
+ var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
+ if (modTask.Status > TaskStatusEnum.Doing)
+ throw Oops.Oh("浠诲姟鐘舵�佸紓甯�");
+ if (input.Status == TaskStatusEnum.Complete)
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ else
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.FinishDate = 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();
+ //鍐欏叆浠诲姟鏄庣粏琛�
+ WcsTaskMonitor modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = 0,
+ PlcName = "",
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ InteractiveMsg = input.Status == TaskStatusEnum.Complete ? "浠诲姟宸叉墜鍔ㄥ畬鎴�" : "浠诲姟宸叉墜鍔ㄥ彇娑�",
+ PalletNo = modTask.PalletNo
+ };
+ 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
+ {
+ throw Oops.Oh("浠诲姟鐘舵�佸紓甯�");
+ }
+ }
--
Gitblit v1.8.0