From 1b118e5148c0568d7bb64bf59b9a06712c9a6842 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期六, 28 九月 2024 08:12:11 +0800
Subject: [PATCH] 问题修改
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 223 insertions(+), 11 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 5023d85..db73aa9 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,11 +1,14 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
+锘�
+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;
-using Admin.NET.Core.Service;
-using Microsoft.AspNetCore.Http;
namespace WCS.Application;
/// <summary>
@@ -14,10 +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;
- 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>
@@ -30,7 +42,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)
@@ -38,8 +50,10 @@
.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);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -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;
}
@@ -112,8 +169,163 @@
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;
+ modTask.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+ }
+ else
+ {
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.CancelDate = DateTime.Now;//鍙栨秷鏃堕棿
+ }
+ modTask.Status = input.Status;
+ 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()
+ {
+ 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("浠诲姟鐘舵�佸紓甯�");
+ }
+ }
+ // <summary>
+ /// 鎵嬪姩缁橶MS涓婁紶浠诲姟
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "UploadTask")]
+ [DisplayName("鎵嬪姩缁橶MS涓婁紶浠诲姟")]
+ 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("璇ヤ换鍔℃潵婧愪笉鏄疻MS");
+ }
+ // 鍙嶉WMS
+ var requestMode = new TaskRequestWMS()
+ {
+ TaskNo = modTask.TaskNo,
+ PalletNo = modTask.PalletNo,
+ TaskType = ((int)TaskTypeEnum.In).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 = $"鎵嬪姩涓婁紶缁橶MS浠诲姟瀹屾垚"
+ };
+ //璋冪敤WMS涓婁紶浠诲姟鎺ュ彛
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestTask(requestMode).Result;
+ if (modResponseTask.StatusCode == 0)
+ {
+ modTaskMonitor.InteractiveMsg = "鎵嬪姩涓婁紶缁橶MS浠诲姟瀹屾垚";
+ }
+ else
+ {
+ Log.Error(string.Format("鎵嬪姩涓婁紶WMS浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿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==15 && maxNo.Substring(0, 8) == date)
+ {
+ int lastNo = Convert.ToInt32(maxNo.Substring(8, 5)) + 1;
+ no = codeFlag + date + (lastNo.ToString().PadLeft(5, '0'));
+ }
+ else
+ {
+ no = codeFlag + date + "0001";
+ }
+ }
+ return no;
+ }
}
--
Gitblit v1.8.0