From d0712fcf60aa1ef5ddfb8d18b583a742893a7aea Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期二, 03 六月 2025 11:04:52 +0800
Subject: [PATCH] 代码提交
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index 80dade5..601c5b7 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -100,11 +100,11 @@
private ConveyorLineTaskCommand MapTaskCommand(Dt_Task task, ConveyorLineTaskCommand command)
{
// 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶇被浼� -鏁板瓧 鐨勬ā寮忥紝骞舵浛鎹负绌哄瓧绗︿覆
- task.NextAddress = Regex.Replace(task.NextAddress, @"-(\d+)", "");
- if (Convert.ToInt32(task.NextAddress) > 1999)
- {
- task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
- }
+ //task.NextAddress = Regex.Replace(task.NextAddress, @"-(\d+)", "");
+ //if (Convert.ToInt32(task.NextAddress) > 1999)
+ //{
+ // task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
+ //}
var comm = _mapper.Map<ConveyorLineTaskCommand>(task);
comm.InteractiveSignal = command.InteractiveSignal;
return comm;
@@ -400,7 +400,7 @@
try
{
StaticVariable.isLineRun = false;
-
+
if (StaticVariable.isStackerRun)
{
ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
@@ -427,6 +427,22 @@
LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, conveyorLineTaskCommand.TargetAddress.ToString());
return;
}
+ var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsbase = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
+ var address = configz.Where(x => x.ConfigKey == SysConfigKeyConst.QueryLocationFreeJZ).FirstOrDefault()?.ConfigValue;
+ if (wmsbase == null || address == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = wmsbase + address;
+ var x = await HttpHelper.PostAsync(wmsIpAddrss, new { RoadwayNo = "JZSC" }.ToJsonString());
+ var LocationFree = JsonConvert.DeserializeObject<WebResponseContent>(x);
+ if (!LocationFree.Status)
+ {
+ ConsoleHelper.WriteErrorLine(LocationFree.Message);
+ return;
+ }
+
if (resultTrayCellsStatus.SerialNos.Count == 0)
{
var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
@@ -442,14 +458,13 @@
}
else
{
- var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsbase = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
- var address = configz.Where(x => x.ConfigKey == SysConfigKeyConst.QueryStockInfoForRealTrayJZAsync).FirstOrDefault()?.ConfigValue;
- if (wmsbase == null || address == null)
+
+ var QueryStockInfoForRealTrayJZ = configz.Where(x => x.ConfigKey == SysConfigKeyConst.QueryStockInfoForRealTrayJZAsync).FirstOrDefault()?.ConfigValue;
+ if (wmsbase == null || QueryStockInfoForRealTrayJZ == null)
{
throw new InvalidOperationException("WMS IP 鏈厤缃�");
}
- var wmsIpAddrss = wmsbase + address;
+ wmsIpAddrss = wmsbase + QueryStockInfoForRealTrayJZ;
var result = await HttpHelper.PostAsync(wmsIpAddrss, new { ProductLine = resultTrayCellsStatus.ProductionLine, PalletCode = command.Barcode }.ToJsonString());
var StockInfocontent = JsonConvert.DeserializeObject<WebResponseContent>(result);
if (StockInfocontent.Status)
@@ -537,7 +552,7 @@
finally
{
StaticVariable.isLineRun = true;
- }
+ }
}
/// <summary>
@@ -573,7 +588,7 @@
else if (task.Roadway.Contains("JZ"))
{
// 鏌ヨ鏄惁瀛樺湪闈欑疆鍑哄簱浠诲姟
- var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&
(x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||
x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutNew));
--
Gitblit v1.9.3