From 4fc1be40676b5f9928da3a83bdb1c215d0584ae9 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 06 四月 2026 11:15:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 3
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 26 +++
Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs | 12 +
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs | 11
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 4
Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 24 ++-
Code/WMS/WIDESEA_WMSClient/src/views/system/Sys_Log.vue | 11
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs | 48 +++++-
Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 4
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 17 -
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs | 142 ++++++++++++++-----
Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 11 -
项目资料/极卷库AGV接口/~$极卷库出入库.docx | 0
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 5
Code/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 67 +++++++++
Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 2
16 files changed, 286 insertions(+), 101 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index 1c1154f..336c440 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -52,7 +52,7 @@
},
{
title: "浠诲姟鐘舵��",
- field: "taskState",
+ field: "taskStatus",
type: "selectList",
dataKey: "taskState",
data: [],
@@ -111,7 +111,7 @@
bind: { key: "taskType", data: [] },
},
{
- field: "taskState",
+ field: "taskStatus",
title: "浠诲姟鐘舵��",
type: "int",
width: 150,
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs
index fbd91e7..de3829d 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs
@@ -1,4 +1,6 @@
-锘縰sing System;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -11,17 +13,17 @@
/// <summary>
/// WMS浠诲姟涓婚敭
/// </summary>
- public int Id { get; set; }
+ public int Id { get; set; }
/// <summary>
/// 浠诲姟鍙�
/// </summary>
- public int TaskNum { get; set; }
+ public int TaskNum { get; set; }
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
- public string PalletCode { get; set; }
+ public string PalletCode { get; set; }
/// <summary>
/// 宸烽亾鍙�
@@ -31,7 +33,7 @@
/// <summary>
/// 浠诲姟绫诲瀷
/// </summary>
- public int TaskType { get; set; }
+ public int TaskType { get; set; }
/// <summary>
/// 浠诲姟鐘舵��
@@ -41,16 +43,44 @@
/// <summary>
/// 璧风偣
/// </summary>
- public string SourceAddress { get; set; }
+ public string SourceAddress { get; set; }
/// <summary>
/// 缁堢偣
/// </summary>
- public string TargetAddress { get; set; }
+ public string TargetAddress { get; set; }
+
+ /// <summary>
+ /// 褰撳墠浣嶇疆
+ /// </summary>
+ public string CurrentAddress { get; set; }
+
+ /// <summary>
+ /// 涓嬩竴鍦板潃
+ /// </summary>
+ public string NextAddress { get; set; }
/// <summary>
/// 浼樺厛绾�
/// </summary>
- public int Grade { get; set; }
+ public int Grade { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string AGVArea { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public int PalletType { get; set; }
+
+
+
}
-}
+}
\ No newline at end of file
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
index 3ac5a02..cb7c013 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
@@ -318,6 +318,28 @@
}
#endregion
+ #region TaskRobotStatusEnum
+
+ {
+ Type type = typeof(TaskRobotStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskRobotStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskRobotStatusEnum).GetField(((TaskRobotStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
@@ -369,7 +391,7 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
- case "dispatchId":
+ case "dispatchId":
{
Type type = typeof(IJob);
var basePath = AppContext.BaseDirectory;
@@ -403,4 +425,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
index c19a76e..e5b3030 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -32,7 +32,8 @@
//5.PostgreSQL
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_ShanMei;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_ShanMei;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_ShanMei;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
@@ -128,4 +129,4 @@
"MaxMemoryPolicy": "allkeys-lru" //鍐呭瓨娣樻卑绛栫暐锛歛llkeys-lru, volatile-lru, noeviction绛�
}
}
-}
+}
\ No newline at end of file
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 3dd7db2..199ab7b 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -112,6 +112,7 @@
InitializeTaskOnReceive(task, item);
tasks.Add(task);
}
+ // TOOD: 杩欓噷娉ㄦ剰娣诲姞閿欒瑕佽繑鍥為敊璇�
BaseDal.AddData(tasks);
_taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
@@ -726,4 +727,4 @@
[DataLength(22)]
public string Barcode { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/system/Sys_Log.vue b/Code/WMS/WIDESEA_WMSClient/src/views/system/Sys_Log.vue
index 67e913d..8ff9d21 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/system/Sys_Log.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/system/Sys_Log.vue
@@ -62,7 +62,7 @@
field: "beginDate",
title: "寮�濮嬫椂闂�",
type: "datetime",
- width: 140,
+ width: 70,
align: "left",
sortable: true,
},
@@ -70,7 +70,7 @@
field: "elapsedTime",
title: "鏃堕暱",
type: "int",
- width: 60,
+ width: 40,
align: "left",
},
{
@@ -86,14 +86,14 @@
field: "requestParam",
title: "璇锋眰鍙傛暟",
type: "string",
- width: 70,
+ width: 100,
align: "left",
},
{
field: "responseParam",
title: "鍝嶅簲鍙傛暟",
type: "string",
- width: 70,
+ width: 100,
align: "left",
},
{
@@ -153,5 +153,4 @@
};
},
});
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
index 4f2b25b..380f32f 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
@@ -96,7 +96,7 @@
type: "int",
width: 120,
align: "left",
- bind: { key: "taskType", data: [] },
+ bind: { key: "taskTypeEnum", data: [] },
},
{
field: "taskStatus",
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
index aff926c..d4b8ccf 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
@@ -25,6 +25,7 @@
private readonly IRepository<Dt_Task> _taskRepository;
private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
private readonly IRecordService _recordService;
+ private readonly IRepository<Dt_Warehouse> _warehouseRepository;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -36,6 +37,7 @@
IRepository<Dt_LocationInfo> baseDal,
IRepository<Dt_Task> taskRepository,
IRepository<Dt_StockInfo> stockInfoRepository,
+ IRepository<Dt_Warehouse> warehouseRepository,
IMapper mapper,
IRecordService recordService) : base(baseDal)
{
@@ -43,6 +45,7 @@
_stockInfoRepository = stockInfoRepository;
_mapper = mapper;
_recordService = recordService;
+ _warehouseRepository = warehouseRepository;
}
/// <summary>
@@ -141,10 +144,10 @@
x.LocationStatus == LocationStatusEnum.Free.GetHashCode());
return locations?
- .OrderBy(x => x.Layer)
- .ThenByDescending(x => x.Depth)
- .ThenBy(x => x.Column)
- .ThenBy(x => x.Row)
+ .OrderByDescending(x => x.Depth) // 1. 娣卞害浼樺厛锛堜粠澶у埌灏忥級
+ .ThenBy(x => x.Layer) // 2. 灞傛暟
+ .ThenBy(x => x.Column) // 3. 鍒�
+ .ThenBy(x => x.Row) // 4. 琛�
.FirstOrDefault();
}
@@ -494,11 +497,18 @@
/// <param name="layer">灞傛暟</param>
/// <param name="depth">娣卞害</param>
/// <returns>璐т綅淇℃伅瀵硅薄</returns>
- private static Dt_LocationInfo CreateLocationInfo(string roadwayNo, int row, int col, int layer, int depth)
+ private Dt_LocationInfo CreateLocationInfo(string roadwayNo, int row, int col, int layer, int depth)
{
+ var warehouse = _warehouseRepository.QueryData(x => x.WarehouseCode == roadwayNo).FirstOrDefault();
+
+ if (warehouse == null)
+ {
+ throw new InvalidOperationException($"鏈壘鍒板贩閬撶紪鍙蜂负 {roadwayNo} 鐨勪粨搴撲俊鎭�");
+ }
+
return new Dt_LocationInfo
{
- WarehouseId = 0,
+ WarehouseId = warehouse.WarehouseId,
Row = row,
Column = col,
Layer = layer,
@@ -507,7 +517,7 @@
EnableStatus = EnableStatusEnum.Normal.GetHashCode(),
LocationStatus = LocationStatusEnum.Free.GetHashCode(),
LocationType = LocationTypeEnum.Undefined.GetHashCode(),
- LocationCode = $"{row:D3}-{col:D3}-{layer:D3}",
+ LocationCode = $"{roadwayNo}-{row:D3}-{col:D3}-{layer:D3}",
LocationName = $"{roadwayNo}宸烽亾{row:D3}琛寋col:D3}鍒梴layer:D3}灞倇depth:D2}娣�"
};
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs
index 5f1b3f9..3313000 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs
@@ -52,6 +52,16 @@
public string TargetAddress { get; set; }
/// <summary>
+ /// 褰撳墠浣嶇疆
+ /// </summary>
+ public string CurrentAddress { get; set; }
+
+ /// <summary>
+ /// 涓嬩竴鍦板潃
+ /// </summary>
+ public string NextAddress { get; set; }
+
+ /// <summary>
/// 浼樺厛绾�
/// </summary>
public int Grade { get; set; }
@@ -72,4 +82,4 @@
public int PalletType { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
index f78aafe..3279b66 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
@@ -172,24 +172,19 @@
public Task<WebResponseContent> OutTaskComplete(OutTaskCompleteDto outTaskCompleteDto);
/// <summary>
- /// 浠诲姟瀹屾垚鎺ュ彛
- /// </summary>
- /// <param name="wCSTask"></param>
- /// <returns></returns>
- //public Task<WebResponseContent> TaskCompleted(WCSTaskDTO wCSTask);
-
- /// <summary>
/// 浠诲姟鍙栨秷
/// </summary>
/// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
/// <returns></returns>
public Task<AGVResponse> TaskCancelAsync(TaskCancelDto taskCancelDto);
+
/// <summary>
/// 鍙栨斁璐у畬鎴�
/// </summary>
/// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
/// <returns></returns>
public Task<AGVResponse> TaskCompleteAsync(TaskCompleteDto taskCompleteDto);
+
/// <summary>
/// 杈撻�佺嚎鐢宠杩涘叆
/// </summary>
@@ -199,4 +194,4 @@
#endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs
index f6ade60..7424711 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs
@@ -204,12 +204,12 @@
List<object> data = new List<object>();
{
- Type type = typeof(TaskTypeEnum);
- List<int> enums = Enum.GetValues(typeof(TaskTypeEnum)).Cast<int>().ToList();
+ Type type = typeof(TaskInboundTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(TaskTypeEnum).GetField(((TaskTypeEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(TaskInboundTypeEnum).GetField(((TaskInboundTypeEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -223,6 +223,65 @@
}
}
+ {
+ Type type = typeof(TaskOutboundTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskOutboundTypeEnum).GetField(((TaskOutboundTypeEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+
+ {
+ Type type = typeof(TaskRelocationTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskRelocationTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskRelocationTypeEnum).GetField(((TaskRelocationTypeEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+
+ {
+ Type type = typeof(RobotTaskTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(RobotTaskTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(RobotTaskTypeEnum).GetField(((RobotTaskTypeEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
@@ -491,4 +550,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
index 3e77721..6425d1b 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
@@ -14,13 +14,12 @@
{
public partial class TaskService
{
- #region 鏋佸嵎搴撲换鍔℃ā鍧�
public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"];
public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"];
/// <summary>
- /// 鍑哄叆搴撶敵璇枫��
+ /// 鏋佸嵎搴撳嚭鍏ュ簱鐢宠
/// </summary>
public async Task<AGVResponse> ApplyInOutAsync(ApplyInOutDto applyInOutDto)
{
@@ -32,7 +31,7 @@
if (validationMessage != null)
return response.Error(validationMessage);
- var existingTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == applyInOutDto.TrayNumber);
+ var existingTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == applyInOutDto.TrayNumber || x.OrderNo == applyInOutDto.TaskId);
if (existingTask != null)
return response.Error($"WMS宸叉湁褰撳墠浠诲姟锛屼笉鍙噸澶嶄笅鍙戯紝浠诲姟鍙凤細{applyInOutDto.TaskId}");
@@ -61,7 +60,7 @@
}
/// <summary>
- /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV銆�
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
/// </summary>
public async Task<WebResponseContent> OutTaskComplete(OutTaskCompleteDto outTaskCompleteDto)
{
@@ -83,7 +82,7 @@
return response.Error(httpResponse?.Msg ?? "AGV鎺ュ彛璋冪敤寮傚父");
if (!httpResponse.Code)
- return response.Error(string.IsNullOrWhiteSpace(httpResponse.Msg) ? "AGV鎺ュ彛璋冪敤澶辫触" : httpResponse.Msg);
+ return response.Error(string.IsNullOrWhiteSpace(httpResponse.Msg) ? "AGV鎺ュ彛璋冪敤澶辫触" : httpResponse.Msg);
var syncResult = await CompleteLocalOutboundAfterAgvAckAsync(task);
return syncResult.Status ? response.OK(httpResponse.Msg) : syncResult;
@@ -96,7 +95,7 @@
}
/// <summary>
- /// 杈撻�佺嚎鐢宠杩涘叆銆�
+ /// 杈撻�佺嚎鐢宠杩涘叆
/// </summary>
public async Task<AGVResponse> ApplyEnterAsync(ApplyEnterDto applyEnterDto)
{
@@ -124,7 +123,7 @@
}
/// <summary>
- /// 鍙栨斁璐у畬鎴愩��
+ /// 鍙栨斁璐у畬鎴�
/// </summary>
public async Task<AGVResponse> TaskCompleteAsync(TaskCompleteDto taskCompleteDto)
{
@@ -152,7 +151,7 @@
}
/// <summary>
- /// 浠诲姟鍙栨秷銆�
+ /// 浠诲姟鍙栨秷
/// </summary>
public async Task<AGVResponse> TaskCancelAsync(TaskCancelDto taskCancelDto)
{
@@ -183,6 +182,7 @@
}
}
+ #region 鍙傛暟楠岃瘉
private static string? ValidateApplyInOutRequest(ApplyInOutDto dto)
{
if (dto == null) return "璇锋眰鍙傛暟涓嶈兘涓虹┖";
@@ -231,7 +231,10 @@
if (string.IsNullOrWhiteSpace(dto.TaskId)) return "浠诲姟鍙蜂笉鑳戒负绌�";
return null;
}
+ #endregion 鍙傛暟楠岃瘉
+ #region 鍏蜂綋瀹炵幇
+ // 鍑哄叆搴撳叡鐢ㄥ垱寤轰换鍔�
private Dt_Task BuildAgvTask(ApplyInOutDto dto)
{
var task = new Dt_Task
@@ -265,6 +268,7 @@
return task;
}
+ // 鏋勫缓杩斿洖AGV鍑哄叆搴撹姹備綋
private AGVDataDto BuildAgvDataDto(Dt_Task task, ApplyInOutDto dto)
{
return new AGVDataDto
@@ -287,6 +291,7 @@
};
}
+ // 鍏ュ簱鍒涘缓
private async Task<AGVResponse?> CreateAgvInboundTaskAsync(Dt_Task task, ApplyInOutDto dto)
{
AGVResponse response = new AGVResponse();
@@ -302,6 +307,7 @@
return addResult ? null : response.Error("鍏ュ簱浠诲姟鍒涘缓澶辫触");
}
+ // 鍑哄簱鍒涘缓
private async Task<AGVResponse?> CreateAgvOutboundTaskAsync(Dt_Task task, ApplyInOutDto dto)
{
AGVResponse response = new AGVResponse();
@@ -309,13 +315,13 @@
if (stockInfo == null)
return response.Error($"鏈壘鍒版墭鐩榹dto.TrayNumber}鐨勫簱瀛樹俊鎭�");
- if (stockInfo.WarehouseId != dto.YinYang)
- return response.Error($"鎵樼洏{dto.TrayNumber}涓嶅睘浜庡綋鍓峽(dto.YinYang == 1 ? "闃存瀬" : "闃虫瀬")}");
+ //if (stockInfo.WarehouseId != dto.YinYang)
+ // return response.Error($"鎵樼洏{dto.TrayNumber}涓嶅睘浜庡綋鍓峽(dto.YinYang == 1 ? "闃存瀬" : "闃虫瀬")}");
if (stockInfo.StockStatus != (int)StockStatusEmun.鍏ュ簱瀹屾垚)
return response.Error($"鎵樼洏{dto.TrayNumber}姝ｅ湪绉诲姩涓紝璇风◢鍚庯紒");
- var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ var locationInfo = await _locationInfoService.GetLocationInfo(stockInfo.LocationCode);
if (locationInfo == null)
return response.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
@@ -327,6 +333,14 @@
task.SourceAddress = stockInfo.LocationCode;
task.CurrentAddress = stockInfo.LocationCode;
task.TargetAddress = dto.YinYang == 1 ? "D10020" : "D10090";
+
+ var wmsTaskDto = _mapper.Map<WMSTaskDTO>(task);
+ var taskList = new List<WMSTaskDTO> { wmsTaskDto };
+ var requestBody = JsonSerializer.Serialize(taskList);
+
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, requestBody);
+ if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)
+ return response.Error(httpResponse?.Data?.Message ?? "涓嬪彂WCS澶辫触");
stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
locationInfo.LocationStatus = (int)LocationStatusEnum.InStockLock;
@@ -340,34 +354,22 @@
_unitOfWorkManage.RollbackTran();
return response.Error("鍑哄簱浠诲姟鍒涘缓澶辫触");
}
-
_unitOfWorkManage.CommitTran();
+
+
return null;
}
private async Task<WebResponseContent> CompleteLocalOutboundAfterAgvAckAsync(Dt_Task task)
{
- var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
- if (stockInfo == null)
- return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
-
- var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
- if (locationInfo == null)
- return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
-
- if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
- return WebResponseContent.Instance.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
-
- locationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+ task.TaskStatus = (int)TaskOutStatusEnum.Line_OutFinish;
_unitOfWorkManage.BeginTran();
- var deleteTaskResult = BaseDal.DeleteData(task);
- var updateLocationResult = _locationInfoService.UpdateData(locationInfo);
- var deleteStockResult = _stockInfoService.DeleteData(stockInfo);
- if (!deleteTaskResult || !updateLocationResult.Status || !deleteStockResult.Status)
+ var updateResult = BaseDal.UpdateData(task);
+ if (!updateResult)
{
_unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error("AGV瀹屾垚鍥炰紶鍚庯紝鏈湴浠诲姟/搴撳瓨/璐т綅鏇存柊澶辫触");
+ return WebResponseContent.Instance.Error("AGV瀹屾垚鍥炰紶鍚庯紝浠诲姟鏇存柊澶辫触");
}
_unitOfWorkManage.CommitTran();
@@ -376,11 +378,62 @@
private bool CanApplyEnter(Dt_Task task, ApplyEnterDto dto)
{
- return dto.InOut == 1
- ? task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskStatus == (int)TaskInStatusEnum.InNew
- : task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskStatus == (int)TaskStatusEnum.Line_Finish;
+ if (dto.InOut == 1)
+ {
+ var hasExecutingOutTask = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound
+ && x.TargetAddress == task.SourceAddress
+ && (x.TaskStatus == (int)TaskOutStatusEnum.SC_OutExecuting
+ || x.TaskStatus == (int)TaskOutStatusEnum.Line_OutExecuting));
+
+ // 濡傛灉娌℃湁姝ｅ湪鎵ц鐨勫嚭搴撲换鍔★紝鍒欏厑璁稿叆搴�
+ return hasExecutingOutTask == null;
+ }
+ else
+ {
+ return task.TaskType == (int)TaskOutboundTypeEnum.Outbound
+ && task.TaskStatus == (int)TaskStatusEnum.Line_Finish;
+ }
}
+ // WCS鍏ュ簱瀹屾垚
+ private async Task<WebResponseContent> CompleteAgvInboundTaskAsync(CreateTaskDto taskDto)
+ {
+ WebResponseContent response = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletType == taskDto.PalletType);
+ if (task == null)
+ return response.Error($"娌℃湁褰撳墠鎵樼洏{taskDto.PalletType}鍏ュ簱浠诲姟");
+
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null)
+ return response.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(task.TargetAddress);
+ if (locationInfo == null)
+ return response.Error($"鏈壘鍒拌揣浣峽task.TargetAddress}鐨勪俊鎭�");
+
+ if (locationInfo.LocationStatus == (int)LocationStatusEnum.InStock)
+ return response.Error($"褰撳墠璐т綅{locationInfo.LocationStatus}鐘舵�佷笉鏄┖闂茬姸鎬侊紝鏃犳硶鍏ュ簱");
+
+ // 鏇存柊璐т綅鐘舵�佷负鍗犵敤
+ locationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
+ task.TaskStatus = (int)TaskInStatusEnum.InFinish;
+ stockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ _unitOfWorkManage.BeginTran();
+ var addStockResult = _stockInfoService.UpdateData(stockInfo);
+ var updateLocationResult = _locationInfoService.UpdateData(locationInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+
+ if (!addStockResult.Status || !updateLocationResult.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return response.Error("鍏ュ簱瀹屾垚鍚庯紝娣诲姞搴撳瓨鎴栬揣浣嶆洿鏂板け璐�");
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return response.OK();
+ }
+
+ // AGV鍑哄簱瀹屾垚
private async Task<AGVResponse> CompleteAgvOutboundTaskAsync(Dt_Task task)
{
AGVResponse response = new AGVResponse();
@@ -400,9 +453,9 @@
_unitOfWorkManage.BeginTran();
var deleteStockResult = _stockInfoService.DeleteData(stockInfo);
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ var updateLocationResult = _locationInfoService.UpdateData(locationInfo);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- if (!deleteStockResult.Status || !updateLocationResult)
+ if (!deleteStockResult.Status || !updateLocationResult.Status)
{
_unitOfWorkManage.RollbackTran();
return response.Error("鍑哄簱瀹屾垚鍚庯紝鏈湴搴撳瓨鎴栬揣浣嶆洿鏂板け璐�");
@@ -412,6 +465,7 @@
return response.OK();
}
+ // AGV宸叉斁璐э紝鍑嗗杈撻�佺嚎鍏ュ簱
private async Task<AGVResponse> CompleteAgvInboundTaskAsync(Dt_Task task)
{
AGVResponse response = new AGVResponse();
@@ -421,12 +475,15 @@
task.TargetAddress = availableLocation.LocationCode;
- var wcsTaskDto = _mapper.Map<WCSTaskDTO>(task);
- var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, JsonSerializer.Serialize(wcsTaskDto));
+ var wmsTaskDto = _mapper.Map<WMSTaskDTO>(task);
+ var taskList = new List<WMSTaskDTO> { wmsTaskDto };
+ var requestBody = JsonSerializer.Serialize(taskList);
+
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, requestBody);
if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)
return response.Error(httpResponse?.Data?.Message ?? "涓嬪彂WCS澶辫触");
- task.TaskStatus = (int)TaskStatusEnum.Line_Executing;
+ task.TaskStatus = (int)TaskInStatusEnum.Line_InExecuting;
task.Dispatchertime = DateTime.Now;
var locationInfo = await _locationInfoService.GetLocationInfoAsync(task.TargetAddress);
@@ -435,6 +492,10 @@
if (locationInfo.LocationStatus != (int)LocationStatusEnum.Free)
return response.Error($"褰撳墠璐т綅{locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+
+ var existingStock = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (existingStock != null)
+ return response.Error($"鎵樼洏{task.PalletCode}鐨勫簱瀛樹俊鎭凡瀛樺湪锛岃鍕块噸澶嶅叆搴�");
Dt_StockInfo stockInfo = new Dt_StockInfo
{
@@ -462,6 +523,7 @@
return response.OK();
}
+ // AGV鍏ュ簱鍙栨秷
private AGVResponse CancelAgvInboundTask(Dt_Task task)
{
AGVResponse response = new AGVResponse();
@@ -473,6 +535,8 @@
return response.OK();
}
+
+ // AGV鍑哄簱鍙栨秷
private async Task<AGVResponse> CancelAgvOutboundTaskAsync(Dt_Task task)
{
AGVResponse response = new AGVResponse();
@@ -505,6 +569,6 @@
return response.OK();
}
- #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
+ #endregion 鍏蜂綋瀹炵幇
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
index 4ee2d5b..71a7821 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
@@ -182,10 +182,11 @@
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
// 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
- //if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
- //{
- // return WebResponseContent.Instance.OK();
- //}
+ if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ {
+
+ return await CompleteAgvInboundTaskAsync(taskDto);
+ }
return await ExecuteWithinTransactionAsync(async () =>
{
@@ -809,4 +810,4 @@
#endregion WCS閫昏緫澶勭悊
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 17d2a3f..f7ed8ac 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -29,7 +29,7 @@
/// </summary>
/// <param name="taskDto"></param>
/// <returns></returns>
- [HttpGet, HttpPost, Route("CreateTaskInbound"),AllowAnonymous]
+ [HttpGet, HttpPost, Route("CreateTaskInbound"), AllowAnonymous]
public async Task<WebResponseContent?> CreateTaskInboundAsync([FromBody] CreateTaskDto taskDto)
{
return await Service.CreateTaskInboundAsync(taskDto);
@@ -212,6 +212,7 @@
{
return await Service.ApplyInOutAsync(applyInOutDto);
}
+
/// <summary>
/// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
/// </summary>
@@ -222,16 +223,7 @@
{
return await Service.OutTaskComplete(outTaskCompleteDto);
}
- ///// <summary>
- ///// 浠诲姟瀹屾垚
- ///// </summary>
- ///// <param name="wCSTask">璇锋眰鍙傛暟</param>
- ///// <returns></returns>
- //[HttpPost, Route("TaskCompleted"), AllowAnonymous]
- //public async Task<WebResponseContent?> TaskCompleted([FromBody] WCSTaskDTO wCSTask)
- //{
- // return await Service.TaskCompleted(wCSTask);
- //}
+
/// <summary>
/// 杈撻�佺嚎鐢宠杩涘叆
/// </summary>
@@ -264,6 +256,7 @@
{
return await Service.TaskCancelAsync(taskCancelDto);
}
+
#endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
-}
+}
\ No newline at end of file
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
index 49d1eae..80a7108 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -34,8 +34,8 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_ShanMei;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
//"TeConnectionString": "Data Source=10.30.4.92;Initial Catalog=TeChuang;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\236\201\345\215\267\345\272\223AGV\346\216\245\345\217\243/~$\346\236\201\345\215\267\345\272\223\345\207\272\345\205\245\345\272\223.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\236\201\345\215\267\345\272\223AGV\346\216\245\345\217\243/~$\346\236\201\345\215\267\345\272\223\345\207\272\345\205\245\345\272\223.docx"
new file mode 100644
index 0000000..59f5e8e
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\236\201\345\215\267\345\272\223AGV\346\216\245\345\217\243/~$\346\236\201\345\215\267\345\272\223\345\207\272\345\205\245\345\272\223.docx"
Binary files differ
--
Gitblit v1.9.3