From 32885e1fc103b0c660027301219e0887cb77a847 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 27 九月 2024 19:50:03 +0800
Subject: [PATCH] 任务日志增加手动上传WMS功能；完善任务日志手动添加功能
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 130 +++++++++++++++++++++++++++++++++---------
Admin.NET/WCS.Application/Configuration/Database.json | 3
Web/src/views/wcs/wcsTask/component/editDialog.vue | 16 +++++
3 files changed, 118 insertions(+), 31 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index 669e5a7..5e15309 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/Admin.NET/WCS.Application/Configuration/Database.json
@@ -11,7 +11,8 @@
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 搴撹繛鎺ュ瓧绗︿覆
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 搴撹繛鎺ュ瓧绗︿覆",
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 搴撹繛鎺ュ瓧绗︿覆
- "ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+ //"ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+ "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WCSnet6;User Id=sa;Password=admin2023@;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
//"SlaveConnectionConfigs": [ // 璇诲啓鍒嗙/涓讳粠
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 281e7c0..db73aa9 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,8 +1,10 @@
锘�
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;
@@ -15,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;
@@ -75,22 +79,34 @@
}
var entity = input.Adapt<WcsTask>();
entity.Origin = "WCS";
-
- #region 鍒嗛厤鎷嗗灈宸ヤ綅
- //鍒嗘嫞浠诲姟淇℃伅
- List<TaskPortDto> taskPortList = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.RoboatType == PLCTypeEnum.StackingRobot).Select<TaskPortDto>().ToListAsync();
- if (taskPortList.Count<=0)
+ if (string.IsNullOrEmpty(entity.TaskNo))
{
- throw Oops.Bah("鎷嗗灈宸ヤ綅寮傚父");
+ //鐢熸垚浠诲姟鍙�
+ entity.TaskNo = GetTaskCode();
+ if (string.IsNullOrEmpty(entity.TaskNo))
+ {
+ 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;
+
+ #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);
@@ -223,13 +239,13 @@
}
// <summary>
- /// 涓婁紶浠诲姟
+ /// 鎵嬪姩缁橶MS涓婁紶浠诲姟
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "UploadTask")]
- [DisplayName("涓婁紶浠诲姟")]
+ [DisplayName("鎵嬪姩缁橶MS涓婁紶浠诲姟")]
public async Task UploadTask(UpdateWcsTaskInput input)
{
var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
@@ -242,18 +258,74 @@
throw Oops.Oh("璇ヤ换鍔℃潵婧愪笉鏄疻MS");
}
// 鍙嶉WMS
- //var requestMode = new TaskRequest()
- //{
- // TaskNo = modTask.TaskNo,
- // PalletNo = modTask.PalletNo,
- // TaskType = (TaskTypeEnum)modTask.TaskType,//TaskTypeEnum.In,
- // TaskStatus = TaskStatusEnum.Complete
- //};
- //HttpService httpService = new HttpService();
- //var modResponseTask = httpService.RequestTask(requestMode).Result;
- //if (modResponseTask.StatusCode == "0")
- //{
- // modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰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;
}
}
diff --git a/Web/src/views/wcs/wcsTask/component/editDialog.vue b/Web/src/views/wcs/wcsTask/component/editDialog.vue
index 99a5dfb..cbfe135 100644
--- a/Web/src/views/wcs/wcsTask/component/editDialog.vue
+++ b/Web/src/views/wcs/wcsTask/component/editDialog.vue
@@ -14,7 +14,7 @@
</el-form-item>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="浠诲姟鍙�" prop="taskNo">
- <el-input v-model="ruleForm.taskNo" placeholder="璇疯緭鍏ヤ换鍔″彿" maxlength="20" show-word-limit clearable />
+ <el-input v-model="ruleForm.taskNo" placeholder="浠诲姟鍙疯嚜鍔ㄧ敓鎴�" maxlength="20" show-word-limit clearable readonly/>
</el-form-item>
@@ -178,6 +178,20 @@
ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
if (isValid) {
let values = ruleForm.value;
+ //鍏ュ簱浠诲姟
+ if(ruleForm.value.taskType==0){
+ if(ruleForm.value.startLocate==undefined || ruleForm.value.startLocate.length!=3){
+ ElMessage.error("鍏ュ簱浠诲姟鐨勮捣濮嬩綅缃瓧绗﹂暱搴﹀簲鏄�3浣�");
+ return;
+ }
+ }
+ //鍑哄簱浠诲姟
+ if(ruleForm.value.taskType==1){
+ if(ruleForm.value.endLocate==undefined || ruleForm.value.endLocate.length!=3){
+ ElMessage.error("鍑哄簱浠诲姟鐨勭粨鏉熶綅缃瓧绗﹂暱搴﹀簲鏄�3浣�");
+ return;
+ }
+ }
if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
await addWcsTask(values);
} else {
--
Gitblit v1.8.0