From 4bdc37291d784008cea7fb9d105077b65a12beb9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 24 三月 2026 09:31:52 +0800
Subject: [PATCH] job优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 386 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 286 insertions(+), 100 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 57bffd8..f7b5dbf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -18,7 +18,9 @@
using AutoMapper;
using SixLabors.ImageSharp.ColorSpaces;
using SqlSugar;
+using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
@@ -36,6 +38,7 @@
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
@@ -52,6 +55,7 @@
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
private readonly IApiInfoService _apiInfoService;
private readonly IStationMangerService _stationMangerService;
+ private readonly IStationInfoService _stationInfo;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -71,7 +75,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService, IStationInfoService stationInfo) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -83,58 +87,128 @@
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
_stationMangerService = stationMangerService;
+ _stationInfo = stationInfo;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
WebResponseContent content = new WebResponseContent();
try
{
+ List<object> objects = new List<object>();
foreach (var item in taskDTOs)
{
foreach (var task in item.tasks)
{
- content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status) throw new Exception(content.Message);
- if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
+ #region 鍒ゆ柇
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ if (!contentStatus.Status)
{
- throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆�/鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
- //continue;
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"浠诲姟鍙枫�恵task.taskCode}銆憑content.Message}"
+ });
+ continue;
}
+ if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode && x.TaskType == item.taskType) != null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode /*&& x.TaskType == item.taskType*/) != null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType&&x.TaskState<TaskStatusEnum.TakeFinish.ObjToInt())!=null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"璧风偣浣嶇疆銆恵task.fromLocationCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"璧风偣浣嶇疆銆恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ #endregion
switch (item.taskType)
{
+ #region 鍑箰澹獳GV闈㈡枡搴�
case (int)TaskTypeEnum.MLInbound:
- CreateKLSNewInTask(task, item.taskType);
+ content = CreateKLSNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.MLOutbound:
- CreateKLSNewOutTask(task, item.taskType);
+ content = CreateKLSNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
+ #endregion
+ #region 鏃疯鍥涘悜杞︽垚鍝佸簱
case (int)TaskTypeEnum.CPInbound:
- CreateRGVNewInTask(task, item.taskType);
+ content = CreateRGVNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CPOutbound:
- CreateRGVNewOutTask(task, item.taskType);
+ content = CreateRGVNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJInbound:
- CreateHKNewInTask(task, item.taskType);
+ case (int)TaskTypeEnum.CPMoveInventory:
+ content = CreateRGVNewMoveTask(task, item.taskType);
+ objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJOutbound:
- CreateHKNewOutTask(task, item.taskType);
+ #endregion
+ #region 娴峰悍AGV
+ case (int)TaskTypeEnum.Q1TSJ4:
+ content = CreateHKNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.Carry:
- CarryTask(task, item.taskType);
+ case (int)TaskTypeEnum.STU0003:
+ case (int)TaskTypeEnum.CHUKU1:
+ content = CreateHKNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJCarry:
- CJCarryTaske(task, item.taskType);
+ case (int)TaskTypeEnum.F01:
+ case (int)TaskTypeEnum.Q3RK:
+ case (int)TaskTypeEnum.Q3CK:
+ content = CarryTask(task, item.taskType);
+ objects.Add(content.Data);
break;
+ case (int)TaskTypeEnum.F02:
+ case (int)TaskTypeEnum.RK3F:
+ case (int)TaskTypeEnum.CK3F:
+ content = CJCarryTaske(task, item.taskType);
+ objects.Add(content.Data);
+ break;
+ #endregion
default:
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"鏈畾涔夌殑浠诲姟绫诲瀷"
+ });
break;
}
}
}
+ content.Data = objects;
}
catch (Exception ex)
{
content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(taskDTOs, content, $"WMS涓嬪彂浠诲姟,", "", "");
}
return content;
}
@@ -151,9 +225,10 @@
var KLS = new CancelGALAXISTask();
CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
CancelSXCTake cancelSXCTake = new CancelSXCTake();
+ var deviceName = "";
try
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode && x.TaskType != TaskTypeEnum.CPMoveInventory.ObjToInt());
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
@@ -162,13 +237,14 @@
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK;
//杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
#region 鍑箰澹�
if (isGALAXISTask)
{
- KLS = new CancelGALAXISTask
+ deviceName = "鍑箰澹獳GV";
+ KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString()
@@ -177,11 +253,12 @@
if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, KLS.Serialize());
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ content.OK(data: agvContent);
if (agvContent.success == true && agvContent.code == 0)
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
@@ -194,31 +271,49 @@
#region 鍥涘悜杞�
if (isAGV)
{
- cancelSXCTake = new CancelSXCTake
+ deviceName = "鍥涘悜杞�";
+ if (dt_Task.RGVTaskId == 0)
{
- taskID = dt_Task.RGVTaskId,
- withoutRunning = 1
- };
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
- if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
- FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
- {
- //鐩存帴绉诲叆鍘嗗彶
- BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ if (dt_Task.TaskType == TaskTypeEnum.CPOutbound.ObjToInt() && dt_Task.TaskState == TaskStatusEnum.RGV_WaitSend.ObjToInt())
+ {
+ //淇敼搴撲綅鐘舵��
+ var rgvlocaiion = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == dt_Task.SourceAddress);
+ rgvlocaiion.LocationStatus = LocationStatusEnum.InStock.ObjToInt(); //灏嗗簱浣嶇姸鎬佹敼涓烘湁璐�
+ }
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ cancelSXCTake = new CancelSXCTake
+ {
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.OK(data: fOURBOTReturn);
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ }
}
}
#endregion
+
#region 娴峰悍
if (isHK)
{
- cancelHIKROBOTTask = new CancelHIKROBOTTask
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
@@ -227,15 +322,16 @@
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, cancelHIKROBOTTask.Serialize());
HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+ content.OK(data: hIKROBOTReturn);
if (hIKROBOTReturn.code == "SUCCESS" && hIKROBOTReturn.message == "鎴愬姛")
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{hIKROBOTReturn.data}");
}
}
@@ -248,30 +344,7 @@
}
finally
{
- // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
- object logObject = null;
- string deviceName = "";
-
- if (KLS != null )
- {
- logObject = KLS;
- deviceName = "鍑箰澹獳GV";
- }
- else if (cancelHIKROBOTTask != null )
- {
- logObject = cancelHIKROBOTTask;
- deviceName = "娴峰悍鏈哄櫒浜�";
- }
- else if (cancelSXCTake != null )
- {
- logObject = cancelSXCTake;
- deviceName = "鍥涘悜杞�";
- }
-
- if (logObject != null)
- {
- _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
- }
+ _trackloginfoService.AddTrackLog(wMSCancelTask, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
}
return content;
}
@@ -301,7 +374,7 @@
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK;
//淇敼鍘熸湰浠诲姟浼樺厛绾�
dt_Task.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
@@ -317,15 +390,16 @@
if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, updateGALAXISTaskGrade.Serialize());
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ content.OK(data: agvContent);
if (agvContent.success == true && agvContent.code == 0)
{
BaseDal.UpdateData(dt_Task);
- content.OK($"淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK($"淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"{dt_Task.WMSTaskNum}浠诲姟澶辫触,閿欒淇℃伅锛歿agvContent.data.returnInfo}");
+ content.Error($"{dt_Task.WMSTaskNum}浠诲姟澶辫触,閿欒淇℃伅锛歿agvContent.data.returnInfo}");
}
}
#endregion
@@ -333,7 +407,7 @@
#region 鍥涘悜杞�
if (isAGV)
{
- request = new UpdateAgvSXCTake
+ request = new UpdateAgvSXCTake
{
taskID = dt_Task.RGVTaskId,
priority = updateTaskPriority.taskPriority
@@ -342,14 +416,15 @@
if (apiInfo == null) throw new Exception("鏈壘鍒版洿鏂板洓鍚戣溅浠诲姟浼樺厛绾ф帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{fOURBOTReturn.data}");
}
}
@@ -357,7 +432,7 @@
#region 娴峰悍
if (isHK)
{
- Hkrequest = new HIKROBOTTaskGrade
+ Hkrequest = new HIKROBOTTaskGrade
{
robotTaskCode = dt_Task.WMSTaskNum,//浠诲姟鍙�
initPriority = updateTaskPriority.taskPriority//浼樺厛绾�
@@ -366,14 +441,15 @@
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, Hkrequest.Serialize());
HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+ content.OK(data: hIKROBOTReturn);
if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭瘂hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭瘂hIKROBOTReturn.data}");
}
}
#endregion
@@ -388,7 +464,7 @@
object logObject = null;
string deviceName = "";
- if (updateGALAXISTaskGrade != null )
+ if (updateGALAXISTaskGrade != null)
{
logObject = updateGALAXISTaskGrade;
deviceName = "鍑箰澹獳GV";
@@ -398,7 +474,7 @@
logObject = Hkrequest;
deviceName = "娴峰悍鏈哄櫒浜�";
}
- else if (request != null )
+ else if (request != null)
{
logObject = request;
deviceName = "鍥涘悜杞�";
@@ -1016,14 +1092,94 @@
/// <param name="AreaCode"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException">鍖哄煙鍙�</exception>
- public WebResponseContent LocationInquiry(string AreaCode)
+ public WebResponseContent LocationInquiry(WMSGetLocationInfo getLocationInfo)
{
- if (AreaCode == null)
+ WebResponseContent content = new WebResponseContent();
+ List<object> list = new List<object>();
+ try
{
- //鏌ヨ杈撻�佺嚎绌烘墭缂撳瓨淇℃伅鏃惰繑鍥炵┖浣嶆暟閲�
- }
- return WebResponseContent.Instance.OK();
+ if (getLocationInfo == null) throw new Exception("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�");
+ //if (getLocationInfo.AreaCode == null) throw new Exception("搴撳尯缂栧彿涓嶈兘涓虹┖锛�");
+ if (getLocationInfo.WarehouseId == 0) throw new Exception("浠撳簱ID涓嶈兘涓虹┖锛�");
+ if (getLocationInfo.WarehouseId == 1)
+ {
+ List<Dt_RGVLocationInfo> rGVLocationInfos = new List<Dt_RGVLocationInfo>();
+ if (!string.IsNullOrEmpty(getLocationInfo.AreaCode))
+ rGVLocationInfos = _rGVLocationInfoService.Repository.QueryData(x => x.WarehouseId == getLocationInfo.AreaCode.ObjToInt());
+ else
+ rGVLocationInfos = _rGVLocationInfoService.Repository.QueryData();
+ foreach (var item in rGVLocationInfos)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.LocationCode,
+ LocationStatus = item.LocationStatus,
+ EnableStatus = item.EnableStatus
+ });
+ }
+ content.OK(data: list);
+ }
+ else if (getLocationInfo.WarehouseId == 2)
+ {
+ List<Dt_KLSLocationInfo> rGVLocationInfos = new List<Dt_KLSLocationInfo>();
+ if (!string.IsNullOrEmpty(getLocationInfo.AreaCode))
+ rGVLocationInfos = _kLSLocationInfoService.Repository.QueryData(x => x.WarehouseId == getLocationInfo.AreaCode.ObjToInt());
+ else
+ rGVLocationInfos = _kLSLocationInfoService.Repository.QueryData();
+ foreach (var item in rGVLocationInfos)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.LocationCode,
+ LocationStatus = item.LocationStatus,
+ EnableStatus = item.EnableStatus
+ });
+ }
+ content.OK(data: list);
+ }
+ else if (getLocationInfo.WarehouseId == 3)
+ {
+ //杩欓噷鏄彁鍗囨満鐨�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) throw new Exception("鏈壘鍒版彁鍗囨満璁惧淇℃伅");
+ if (!device.IsConnected) throw new Exception("PLC1鎻愬崌鏈鸿澶囪繛鎺ュけ璐�");
+ var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ");
+ list.Add(new
+ {
+ LoctionCode = value,
+ LocationStatus = value!=0? 100 : 0,
+ EnableStatus = 0,
+ });
+ }
+ else if (getLocationInfo.WarehouseId == 4)
+ {
+ }
+ else if (getLocationInfo.WarehouseId == 5)
+ {
+ //璇诲彇鍏夌數淇″彿
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
+ if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
+ var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
+ foreach (var item in sta)
+ {
+ bool value = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = value ? 100 : 0,
+ EnableStatus = 0,
+ });
+ }
+ content.OK(data: list);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
}
@@ -1119,33 +1275,34 @@
};
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})")
+ content.OK(data: fOURBOTReturn);
+ if (fOURBOTReturn.returnCode != 0 /*&& fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})"*/)
throw new Exception(fOURBOTReturn.returnUserMsg);
#endregion
#region 鍒涘缓鍥涘悜杞︿换鍔�
- var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
+ //var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
#endregion
#region 鍛煎彨鍥涘悜杞�
- apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
- {
- priority = task.Grade,
- podID = task.PalletCode,
- //desNodeID = task.SourceAddress,
- desExt = new
- {
- unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
- },
- desStationCodes = task.SourceAddress,
- desType = 5
- };
- response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
- fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
- if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
- task.TaskState = (int)TaskStatusEnum.Execut;
- BaseDal.UpdateData(task);
+ //apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ //FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
+ //{
+ // priority = task.Grade,
+ // podID = task.PalletCode,
+ // //desNodeID = task.SourceAddress,
+ // desExt = new
+ // {
+ // unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ // },
+ // desStationCodes = task.SourceAddress,
+ // desType = 5
+ //};
+ //response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+ //fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ //content.Data = fOURBOTReturn;
+ //if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ //task.TaskState = (int)TaskStatusEnum.Execut;
+ //BaseDal.UpdateData(task);
#endregion
return WebResponseContent.Instance.OK();
}
@@ -1179,5 +1336,34 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ try
+ {
+ // 鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
+ var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));
+
+ // 鎵ц绉诲叆鍘嗗彶鎿嶄綔锛屽苟妫�鏌ョ粨鏋�
+ bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.浜哄伐鍒犻櫎);
+
+ if (!moveResult)
+ {
+ // 绉诲叆鍘嗗彶澶辫触锛岃繑鍥為敊璇俊鎭�
+ return WebResponseContent.Instance.Error("绉诲叆鍘嗗彶璁板綍澶辫触");
+ }
+ return WebResponseContent.Instance.OK("鍒犻櫎鎴愬姛锛屾暟鎹凡绉诲叆鍘嗗彶");
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ // Logger.Error(ex.Message);
+ return WebResponseContent.Instance.Error("鍒犻櫎澶辫触锛�" + ex.Message);
+ }
+ }
+
+
+
}
}
--
Gitblit v1.9.3