From a87eee72770da479f043462787c17c534062a318 Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 01 四月 2026 09:25:06 +0800
Subject: [PATCH] 添加手动创建出入任务功能
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 135 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 120 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index f2a75ac..3be2cec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -33,11 +33,13 @@
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
+using System.Security.Cryptography.Xml;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Comm.Http;
using WIDESEA_Common.Log;
+using WIDESEA_Core.Enums;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -46,10 +48,13 @@
using WIDESEAWCS_Core.Utilities;
using WIDESEAWCS_DTO.Enum;
using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_ISystemRepository;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Model.Models.System;
+using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_TaskInfoRepository;
@@ -67,6 +72,7 @@
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IDt_roadwayinfoService _Dt_roadwayinfoService;
+ private readonly IDt_PlatformStationRepository _dt_PlatformStation;
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
@@ -80,7 +86,7 @@
public string urlWMSdeverror = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSdeverror"];
public string urlWMSliftinposition = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSliftinposition"];
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository, IUnitOfWorkManage unitOfWork, IDt_roadwayinfoService dt_RoadwayinfoService) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IDt_PlatformStationRepository dt_PlatformStation, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository, IUnitOfWorkManage unitOfWork, IDt_roadwayinfoService dt_RoadwayinfoService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -90,6 +96,7 @@
_mapper = mapper;
_unitOfWorkManage = unitOfWork;
_Dt_roadwayinfoService = dt_RoadwayinfoService;
+ _dt_PlatformStation = dt_PlatformStation;
}
//鏍规嵁浠诲姟鍙凤紝鏌ヨ浠诲姟
@@ -118,8 +125,8 @@
string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
//鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
@@ -132,9 +139,9 @@
task.TaskState = (int)TaskInStatusEnum.InFinish;
BaseDal.UpdateData(task);
string Result = WMSTaskStatusEnum.insuccess.GetDescription();
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -147,9 +154,9 @@
task.TaskState = (int)TaskinventoryStatusEnum.inventoryFinish;
BaseDal.UpdateData(task);
string Result = WMSTaskStatusEnum.insuccess.GetDescription();
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -426,13 +433,13 @@
{
_task_HtyService.AddTaskHty(tasks);
BaseDal.DeleteData(tasks);
- WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟", "鍒犻櫎鎴愬姛", $"鐢宠鍒犻櫎鐨勬潯鐮侊細{tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = "鍒犻櫎鎴愬姛" });
+ WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟", "鍒犻櫎鎴愬姛", $"鐢宠鍒犻櫎鐨勪换鍔″彿锛歿tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = "鍒犻櫎鎴愬姛" });
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
- WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟", "鍒犻櫎澶辫触", $"鐢宠鍒犻櫎鐨勬潯鐮侊細{tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = ex.Message });
+ WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟", "鍒犻櫎澶辫触", $"鐢宠鍒犻櫎鐨勪换鍔″彿锛歿tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = ex.Message });
return WebResponseContent.Instance.Error();
}
}
@@ -513,8 +520,8 @@
{
string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
//鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
task.Modifier = App.User?.UserName;
@@ -526,9 +533,9 @@
else if (task.TaskType == (int)TaskTypeEnum.Inbound)
{
string Result = WMSTaskStatusEnum.insuccess.GetDescription();
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
task.Modifier = App.User?.UserName;
@@ -540,9 +547,9 @@
else if (task.TaskType == (int)TaskTypeEnum.Inventorybound)
{;
string Result = WMSTaskStatusEnum.insuccess.GetDescription();
- //CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
- //if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
task.ModifyDate = DateTime.Now;
task.Modifier = App.User?.UserName;
@@ -564,5 +571,103 @@
return content;
}
+ /// <summary>
+ /// 鎵嬪姩鍒涘缓浠诲姟
+ /// </summary>
+ /// <param name="transfer"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateManualTask(Dt_Task transfer)
+ {
+
+
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceName.Contains("鍫嗗灈鏈�"));
+
+
+
+ // 鍒ゆ柇璁惧鏄惁瀛樺湪
+ if (device == null)
+ {
+ content.Error("鎵嬪姩鍒涘缓浠诲姟澶辫触锛屽師鍥狅細鏈壘鍒板爢鍨涙満璁惧");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟鍒涘缓澶辫触", "鍒涘缓澶辫触", $"鍘熷洜锛氭湭鎵惧埌鍫嗗灈鏈鸿澶�,鎵樼洏缂栧彿锛歿transfer.PalletCode}锛屼换鍔＄被鍨嬶細{transfer.TaskType},璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ return content;
+ }
+
+ // 鍒ゆ柇鍦板潃鏄惁灞炰簬褰撳墠璁惧搴�
+ if (transfer.SourceAddress.Contains(device.DeviceCode) && transfer.TargetAddress.Contains(device.DeviceCode))
+ {
+ // 鍏ュ簱
+ if (transfer.TaskType == 200)
+ {
+ Dt_PlatformStation _PlatformStation = _dt_PlatformStation.QueryFirst(x => x.Station_code == transfer.SourceAddress);
+ if (_PlatformStation == null)
+ {
+ content.Error($"鎵嬪姩鍒涘缓浠诲姟澶辫触,鍘熷洜:{device.DeviceCode}搴撲笉瀛樺湪杩欎釜搴撳彛锛歿transfer.SourceAddress}");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟鍒涘缓澶辫触", "鍒涘缓澶辫触", $"鎵樼洏缂栧彿锛歿transfer.PalletCode}锛屼换鍔＄被鍨嬶細{transfer.TaskType},璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ }
+ else {
+ // 姝ｅ父鍒涘缓浠诲姟
+ transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
+ transfer.TaskState = 200;
+ transfer.CurrentAddress = transfer.SourceAddress;
+ transfer.NextAddress = transfer.TargetAddress;
+ transfer.Roadway = device.DeviceCode;
+ transfer.Creater = "WCS";
+ transfer.Grade = 1;
+ transfer.CreateDate = DateTime.Now;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(transfer);
+ _unitOfWorkManage.CommitTran();
+ content.OK("鎵嬪姩浠诲姟鍒涘缓鎴愬姛锛�");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟鍒涘缓鎴愬姛", "鍒涘缓鎴愬姛", $"鎵樼洏缂栧彿锛歿transfer.PalletCode}锛屼换鍔＄被鍨嬶細{transfer.TaskType},璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ }
+ return content;
+
+ }
+ // 鍑哄簱
+ else if (transfer.TaskType == 100)
+ {
+ Dt_PlatformStation _PlatformStation = _dt_PlatformStation.QueryFirst(x => x.Station_code == transfer.TargetAddress);
+ if (_PlatformStation == null)
+ {
+ content.Error($"鎵嬪姩鍒涘缓浠诲姟澶辫触,鍘熷洜:{device.DeviceCode}搴撲笉瀛樺湪杩欎釜搴撳彛锛歿transfer.TargetAddress}");
+ }
+ else
+ {
+ // 姝ｅ父鍒涘缓浠诲姟
+ transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
+ transfer.TaskState = 200;
+ transfer.CurrentAddress = transfer.SourceAddress;
+ transfer.NextAddress = transfer.TargetAddress;
+ transfer.Roadway = device.DeviceCode;
+ transfer.Creater = "WCS";
+ transfer.Grade = 1;
+ transfer.CreateDate = DateTime.Now;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(transfer);
+ _unitOfWorkManage.CommitTran();
+ content.OK("鎵嬪姩浠诲姟鍒涘缓鎴愬姛锛�");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟鍒涘缓鎴愬姛", "鍒涘缓鎴愬姛", $"鎵樼洏缂栧彿锛歿transfer.PalletCode}锛屼换鍔＄被鍨嬶細{transfer.TaskType},璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ }
+ return content;
+ }
+
+
+ }
+ else
+ {
+ content.Error($"鎵嬪姩鍒涘缓浠诲姟澶辫触,鍘熷洜:{device.DeviceCode}搴撳湴鍧�涓嶅尮閰�,璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟鍒涘缓澶辫触", "鍒涘缓澶辫触", $"鎵樼洏缂栧彿锛歿transfer.PalletCode}锛屼换鍔＄被鍨嬶細{transfer.TaskType},璧峰鍦板潃锛歿transfer.SourceAddress}锛岀洰鏍囧湴鍧�锛歿transfer.TargetAddress}");
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error($"鎵嬪姩鍒涘缓浠诲姟澶辫触锛岀郴缁熷紓甯革細{ex.Message}");
+ WriteLog.Write_Log("鎵嬪姩浠诲姟寮傚父", "寮傚父", ex.ToString());
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3