From ee8d6bd6c4077c3aeb84170bec819264b5ca29d8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:32:53 +0800
Subject: [PATCH] 任务列表增加单据查询
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 266 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 236 insertions(+), 30 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index d0e0afe..2cd928f 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,9 +1,16 @@
锘�
using AngleSharp.Dom;
+using COSXML.Network;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using DocumentFormat.OpenXml.Math;
+using Elastic.Clients.Elasticsearch.Inference;
using Elastic.Clients.Elasticsearch.Tasks;
using Furion.DatabaseAccessor;
+using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
+using NewLife;
using WCS.Application.Entity;
+using WCS.Application.Service.WcsTask.Dto;
namespace WCS.Application;
@@ -13,6 +20,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;
@@ -42,12 +51,15 @@
u.TaskNo.Contains(input.SearchKey)
)
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderNo), u => u.OrderNo.Contains(input.OrderNo.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.OrderBy(o=>o.Levels).OrderByDescending(o=>o.CreateTime)
+ .OrderByDescending(m=>m.Status).OrderBy(m=>m.TaskNo)
+ .ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -73,38 +85,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;
}
@@ -191,6 +202,7 @@
modTask.CancelDate = DateTime.Now;//鍙栨秷鏃堕棿
}
modTask.Status = input.Status;
+ modTask.Levels = 999;
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()
@@ -233,6 +245,200 @@
}
}
+ // <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)modTask.TaskType).ToString(),
+ TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
+ };
+ //鍑哄簱鏃讹紝浠诲姟鍙峰瓧娈靛鍔犲嚭搴撳彛
+ var taskno = modTask.TaskNo;
+ if (modTask.TaskType == TaskTypeEnum.Out)
+ {
+ taskno = taskno + modTask.EndLocate;
+ }
+ //浠诲姟璇︽儏
+ 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="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "TopUpTask")]
+ [DisplayName("浠诲姟缃《")]
+ public async Task TopUpTask(UpdateWcsTaskInput input)
+ {
+ var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
+ if (modTask.Status != TaskStatusEnum.Wait)
+ {
+ throw Oops.Oh("鍙湁绛夊緟鎵ц鐨勪换鍔℃墠鑳界疆椤讹紒");
+ }
+ int editNum = 1;
+ List<string> _editTaskNoList = new List<string>();
+ //鍌ㄤ綅娣卞害
+ string locatDepth = "";
+ if (modTask.TaskType == TaskTypeEnum.Out || modTask.TaskType == TaskTypeEnum.Move)//鍑哄簱浠诲姟鎴栧叆搴撲换鍔�
+ {
+ locatDepth = modTask.StartLocate.Substring(modTask.StartLocate.Length - 1, 1);//璧峰鍌ㄤ綅娣卞害
+ if (locatDepth == "2")//鍒ゆ柇褰撳墠鍌ㄤ綅鏄惁娣卞害涓�2锛屽唴渚у偍浣�
+ {
+ string locatString = modTask.StartLocate.Substring(0, modTask.StartLocate.Length - 1) + "1";//鑾峰彇澶栦晶鍌ㄤ綅鍦板潃
+ //鍒ゆ柇澶栦晶鍌ㄤ綅鏄惁鏈夌瓑寰呮墽琛岀殑浠诲姟锛屾湁灏变紭鍏堟墽琛�
+ var modTask2 = _db.Queryable<WcsTask>().First(w => w.IsDelete == false && w.Status == TaskStatusEnum.Wait && w.StartLocate == locatString);
+ if (modTask2 != null)
+ {
+ modTask2.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask2).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask2.TaskNo);
+ modTask.Levels = 2;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+ editNum = 2;
+ }
+ else
+ {
+ modTask.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+ }
+ }
+ else
+ {
+ modTask.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+ }
+ }
+ if (modTask.TaskType == TaskTypeEnum.In)//鍏ュ簱浠诲姟
+ {
+ if (string.IsNullOrEmpty(modTask.EndLocate))
+ {
+ throw Oops.Oh("璇ュ叆搴撲换鍔¤繕鏈垎閰嶅偍浣嶏紝缃《澶辫触锛�");
+ }
+ locatDepth = modTask.EndLocate.Substring(modTask.EndLocate.Length - 1, 1);//鐩爣鍌ㄤ綅娣卞害
+ if (locatDepth == "1")//鍒ゆ柇褰撳墠鍌ㄤ綅鏄惁娣卞害涓�1锛屽渚у偍浣�
+ {
+ string locatString = modTask.EndLocate.Substring(0, modTask.EndLocate.Length - 1) + "2";//鑾峰彇鍐呬晶鍌ㄤ綅鍦板潃
+ //鍒ゆ柇鍐呬晶鍌ㄤ綅鏄惁鏈夌瓑寰呮墽琛岀殑浠诲姟锛屾湁灏变紭鍏堟墽琛�
+ var modTask2 = _db.Queryable<WcsTask>().First(w => w.IsDelete == false && w.Status == TaskStatusEnum.Wait && (w.StartLocate == locatString || w.EndLocate == locatString));
+ if (modTask2 != null)
+ {
+ modTask2.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask2).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask2.TaskNo);
+
+ modTask.Levels = 2;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+
+ editNum = 2;
+ }
+ else
+ {
+ modTask.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+ }
+ }
+ else
+ {
+ modTask.Levels = 1;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ _editTaskNoList.Add(modTask.TaskNo);
+ }
+ }
+ //椤哄欢鍏朵粬缃《浠诲姟
+ var modTaskList = _db.Queryable<WcsTask>().Where(w => w.IsDelete == false && w.Status == TaskStatusEnum.Wait && w.Levels != 999 && !_editTaskNoList.Contains(w.TaskNo)).ToList();
+ foreach (var item in modTaskList)
+ {
+ item.Levels += editNum;
+ }
+ await _wcsTaskRep.Context.Updateable(modTaskList).UpdateColumns(s => new { s.Levels }).ExecuteCommandAsync();
+ }
+
+ /// <summary>
+ /// 鑷姩鐢熸垚浠诲姟鍙�
+ /// </summary>
+ /// <param name="codeFlag"></param>
+ /// <returns></returns>
+ [NonAction]
+ 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;
+ }
}
--
Gitblit v1.8.0