From 701c5766a312caccc887c42376e5115f49a6a3d3 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 23 十一月 2024 19:23:26 +0800
Subject: [PATCH] 更新
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs | 12 ++--
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs | 30 ++++++++++
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 73 +++++++++++++++++++++---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs | 8 +-
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs | 2
6 files changed, 105 insertions(+), 22 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 0b097b3..327afad 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -97,7 +97,7 @@
if (!content.Status)
{
// wms澶辫触杩斿洖鍘籒G鍙ｄ换鍔�
-
+
return content;
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
index 8ee125c..baf6ad8 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
@@ -150,6 +150,36 @@
}
/// <summary>
+ /// 杈撻�佺嚎璇锋眰绌烘
+ /// </summary>
+ /// <param name="conveyorLine"></param>
+ /// <param name="command"></param>
+ /// <param name="stationInfo"></param>
+ public void RequestEmptyOutbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
+ {
+ if (stationInfo.stationType != 7) return;
+ var taskNew = _taskRepository.QueryFirst(x => x.Roadway == stationInfo.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
+ if (taskNew == null) //涓嶅瓨鍦ㄧ┖妗嗗嚭搴撲换鍔� 鍒欒姹俉MS鍑虹┖搴�
+ {
+ if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status)
+ {
+ Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
+ if (task != null)
+ {
+ //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
+ //taskCommand.InteractiveSignal = command.InteractiveSignal;
+ //taskCommand.ResponState = 1;
+ //taskCommand.ConveyorLineTaskNum = task.TaskNum;
+ //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
+ //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode);
+ //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress);
+ //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+ }
+ }
+ }
+
+ /// <summary>
/// 杈撻�佺嚎璇锋眰鍏ュ簱
/// </summary>
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
index 88dbe2c..50760d4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
@@ -44,11 +44,8 @@
/// </summary>
ConveyorLineBarcode,
- /// <summary>
- /// 璇锋眰鍙嶉
- /// </summary>
- ResponState,
+ Reserve1,
Reserve2,
Reserve3,
@@ -66,8 +63,11 @@
/// 鎶ヨ浠ｇ爜
/// </summary>
ConveyorLineAlarm,
-
- Reserve4,
+
+ /// <summary>
+ /// 璇锋眰鍙嶉
+ /// </summary>
+ ResponState,
Reserve5,
#endregion
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
index 2116cad..7933f9a 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
@@ -47,14 +47,14 @@
[DataLength(25)]
public string ConveyorLineBarcode { get; set; }
- public short ResponState { get; set; }
+ public short Reserved1 { get; set; }
public short Reserved2 { get; set; }
public short Reserved3 { get; set; }
public byte InteractiveSignal { get; set; }
public short HasPallet { get; set; }
- //public ushort ConveyorLineAlarm { get; set; }
- //public short Reserved4 { get; set; }
- //public short Reserved5 { get; set; }
+ public short ConveyorLineAlarm { get; set; }
+ public short ResponState { get; set; }
+ public short Reserved5 { get; set; }
}
//public class ConveyorLineTaskCommandWrite : DeviceCommand
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
index 7bea047..9310c45 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
@@ -36,7 +36,7 @@
LogFactory.GetLog("鍒嗗搴撲綅鍚屾").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("鍒嗗搴撲綅鍚屾").Info(true, json);
+ LogFactory.GetLog("鍒嗗搴撲綅鍚屾").Info(true, result);
return content.OK();
}
catch (Exception ex)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 93021c6..3efaa61 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -533,9 +533,10 @@
//case 4:
case 5:
task = await CreateInToOutTaskAsync(input, stationManager); break;
-
+ case 7:
+ task = await CreateEmptyOutTaskAsync(input, stationManager); break;
default:
- throw new Exception("浣嶇疆绔欏彴绫诲瀷");
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
}
return task;
}
@@ -575,7 +576,16 @@
{
if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
- DtLocationInfo locationInfo = await RequestLocation(input);
+ DtLocationInfo locationInfo = null;
+ if (stationManager.stationType == 1 && stationManager.Roadway.Contains("FR"))
+ {
+ locationInfo = await RequestLocation(input, true);
+ }
+ else
+ {
+ locationInfo = await RequestLocation(input);
+ }
+ //DtLocationInfo locationInfo = await RequestLocation(input);
if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
@@ -659,13 +669,13 @@
/// </summary>
/// <param name="requestTask">璇锋眰鍙傛暟</param>
/// <returns></returns>
- private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask)
+ private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
{
#region 鑾峰彇璐т綅
try
{
List<DtLocationInfo> locations;
- if (requestTask.Roadways.Contains("FR"))
+ if (isCheckRequest)
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 2 && x.Remark == "1");
}
@@ -687,7 +697,7 @@
return null;
}
#endregion 鑾峰彇璐т綅
- }
+ }
#endregion
// 鑾峰彇宸ヨ壓鐢宠
@@ -706,8 +716,52 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 璇锋眰绌烘鍑哄簱
+ public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
+ {
+ try
+ {
+ if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�");
+
+ var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ //.Includes(x=>x.StockInfoDetails)
+ .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ .OrderBy(x => x.CreateDate)
+ .FirstAsync();
+
+ if (stockinfo == null) return null;
+
+ var task = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 1,
+ Roadway = input.Roadways,
+ TargetAddress = stationManager.stationLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = input.Roadways,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stockinfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+
+ return task;
+ }
+ catch (Exception ex)
+ {
+
+ throw new Exception(ex.Message);
+ }
+ }
+
+
+ #region 鐩存帴鍑哄簱浠诲姟瀹屾垚
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
@@ -723,10 +777,9 @@
}
catch (Exception ex)
{
- return content.Error (ex.Message);
+ return content.Error(ex.Message);
}
-
- return content;
}
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3