From e47120b1aec14296f84fd246af76675f4c2765a0 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 29 一月 2026 09:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
index d7526bf..6b91064 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
@@ -15,8 +15,9 @@
{
public partial class TaskService
{
+ #region 鍑箰澹换鍔″垱寤�
/// <summary>
- /// 鍒涘缓鍏ュ簱浠诲姟
+ /// 鍒涘缓鍑箰澹獳GV鍏ュ簱浠诲姟
/// </summary>
/// <param name="taskDTO"></param>
/// <returns></returns>
@@ -24,7 +25,7 @@
{
try
{
- int containerType = taskDTO.containerCode.Contains("") ? LocationTypeEnum.LargePallet.ObjToInt() : LocationTypeEnum.SmallPallet.ObjToInt();
+ int containerType = taskDTO.containerCode.Contains("LLM") ? LocationTypeEnum.LargePallet.ObjToInt() : LocationTypeEnum.SmallPallet.ObjToInt();
//鑾峰彇璐т綅淇℃伅
Dt_KLSLocationInfo? kLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.WarehouseId.ToString() == taskDTO.toAreaCode && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == containerType);
if (kLSLocationInfo == null) throw new Exception($"鏈壘鍒扮粓鐐瑰簱鍖恒�恵taskDTO.toAreaCode}銆戝彲鐢ㄧ┖璐т綅锛�");
@@ -32,14 +33,17 @@
{
TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
WMSTaskNum = taskDTO.taskCode,
+ WMSId = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
Grade = taskDTO.taskPriority,
PalletCode = taskDTO.containerCode,
- TaskState = TaskInStatusEnum.InNew.ObjToInt(),
+ Roadway = kLSLocationInfo.RoadwayNo,
+ TaskState = TaskStatusEnum.New.ObjToInt(),
TaskType = taskType,
SourceAddress = taskDTO.fromLocationCode,
CurrentAddress = taskDTO.fromLocationCode,
NextAddress = kLSLocationInfo.LocationCode,
TargetAddress = kLSLocationInfo.LocationCode,
+ Creater = "WMS",
};
kLSLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
Db.Ado.BeginTran();
@@ -51,10 +55,15 @@
catch (Exception ex)
{
Db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
-
+ /// <summary>
+ /// 鍒涘缓鍑箰澹獳GV鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
public WebResponseContent CreateKLSNewOutTask(TaskDTO taskDTO, int taskType)
{
try
@@ -66,14 +75,17 @@
{
TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
WMSTaskNum = taskDTO.taskCode,
+ WMSId = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
Grade = taskDTO.taskPriority,
PalletCode = taskDTO.containerCode,
- TaskState = TaskOutStatusEnum.OutNew.ObjToInt(),
+ Roadway = kLSLocationInfo.RoadwayNo,
+ TaskState = TaskStatusEnum.New.ObjToInt(),
TaskType = taskType,
SourceAddress = taskDTO.fromLocationCode,
CurrentAddress = taskDTO.fromLocationCode,
NextAddress = taskDTO.toLocationCode,
TargetAddress = taskDTO.toLocationCode,
+ Creater = "WMS",
};
kLSLocationInfo.LocationStatus = LocationStatusEnum.OutLock.ObjToInt();
Db.Ado.BeginTran();
@@ -85,8 +97,99 @@
catch (Exception ex)
{
Db.Ado.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ }
+ #endregion
+
+ #region RGV浠诲姟鍒涘缓
+ /// <summary>
+ /// 鍒涘缓鍥涘悜杞﹀叆搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateRGVNewInTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ /// <summary>
+ /// 鍒涘缓鍥涘悜杞﹀嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateRGVNewOutTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
+
+ #region 娴峰悍AGV浠诲姟鍒涘缓
+ /// <summary>
+ /// 鍒涘缓娴峰悍AGV鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateHKNewInTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍒涘缓娴峰悍AGV鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateHKNewOutTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.3