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 | 164 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 132 insertions(+), 32 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 3f2e706..db73aa9 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,9 +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;
@@ -13,6 +17,8 @@
[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;
@@ -44,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);
}
@@ -71,38 +79,37 @@
}
var entity = input.Adapt<WcsTask>();
entity.Origin = "WCS";
- await _wcsTaskRep.InsertAsync(entity);
+ if (string.IsNullOrEmpty(entity.TaskNo))
+ {
+ //鐢熸垚浠诲姟鍙�
+ entity.TaskNo = GetTaskCode();
+ if (string.IsNullOrEmpty(entity.TaskNo))
+ {
+ throw Oops.Bah("浠诲姟鍙风敓鎴愬け璐�");
+ }
+ }
- #region 缁戝畾鍨涙満
-
- //鐗╂枡鍝佺淇℃伅
- var skuInfo = await _wcsMateialPzInfoRep.Context.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == input.SkuNo).FirstAsync();
- if (skuInfo == null)
+ #region 鏈哄櫒浜烘媶鍨涘垎閰嶆媶鍨涘伐浣�
+ if (entity.UnstackingMode== UnstackingModeEnum.Machine)
{
- 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();
+ //鍒嗘嫞浠诲姟淇℃伅
+ 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;
}
@@ -179,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()
{
@@ -226,6 +238,94 @@
}
}
+ // <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