From 4c216caadeb29a797aba3fc1548b7c8c68ed27ec Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 21 十二月 2024 09:36:59 +0800
Subject: [PATCH] 合并
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
index a4a31d7..5923b5e 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -93,21 +93,72 @@
var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
content = JsonConvert.DeserializeObject<WebResponseContent>(result);
-
if (!content.Status)
{
// wms澶辫触杩斿洖鍘籒G鍙ｄ换鍔�
-
-
+ //if (stationManager.stationChildCode != stationManager.stationNGChildCode)
+ //{
+ // WMSTaskDTO taskDTO = new WMSTaskDTO()
+ // {
+ // Grade = 8,
+ // PalletCode = palletCode,
+ // SourceAddress = stationManager.stationLocation,
+ // TargetAddress = stationManager.stationNGLocation,
+ // RoadWay = stationManager.Roadway,
+ // TaskNum = 1000,
+ // TaskState = (int)TaskOutStatusEnum.OutNew,
+ // TaskType = (int)TaskOutboundTypeEnum.InToOut
+ // };
+ //}
return content;
}
var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+ ConsoleHelper.WriteSuccessLine(content.Data.ToString());
return ReceiveByWMSTask(task);
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public async Task<WebResponseContent> RequestOutTaskToBZAsync(Dt_StationManager stationManager)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestOutTaskToBZ)?.ConfigValue;
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = wmsBase + requestTask;
+
+ var result = await HttpHelper.PostAsync(wmsIpAddrss, new { }.ToJsonString());
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (!content.Status)
+ {
+ //鏃犳弧瓒虫潯浠跺彲鍑哄簱鑷冲寘瑁呯殑搴撳瓨
+ return content;
+ }
+
+ var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+ ConsoleHelper.WriteSuccessLine(content.Data.ToString());
+ content = ReceiveByWMSTask(task);
+ //if (content.Status)
+ //{
+ // //鐩稿簲鐨勫湪閫旀暟鎹�+1
+ // // _taskNeedBarcodeRepository.UpdateData();
+ //}
+ return content;
+ }
+ catch (Exception ex)
+ {
+
+ return content.Error(ex.Message);
}
}
@@ -146,6 +197,15 @@
task.NextAddress = stationinfo.stationChildCode;
task.TargetAddress = taskDTO.TargetAddress;
}
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+ {
+ task.TaskState = (int)TaskStatus.Created;
+ task.SourceAddress = taskDTO.SourceAddress;
+ task.CurrentAddress = taskDTO.SourceAddress;
+ task.NextAddress = taskDTO.TargetAddress;
+ task.TargetAddress = taskDTO.TargetAddress;
+ }
+
BaseDal.AddData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.WMSId, "鎺ユ敹WMS浠诲姟");
--
Gitblit v1.9.3