From 0005d58f6888dd3e4524784d1b6f103f9b1c588e Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 18:33:22 +0800
Subject: [PATCH] 合并
---
Code/WMS/WIDESEA_WMSServer/.claude/settings.local.json | 5 ++++-
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 21 ++++++++++++---------
Code/WMS/WIDESEA_WMSClient/pnpm-lock.yaml | 8 ++++++++
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/pnpm-lock.yaml b/Code/WMS/WIDESEA_WMSClient/pnpm-lock.yaml
index 02e6c79..cea0b3b 100644
--- a/Code/WMS/WIDESEA_WMSClient/pnpm-lock.yaml
+++ b/Code/WMS/WIDESEA_WMSClient/pnpm-lock.yaml
@@ -38,6 +38,9 @@
qrcode:
specifier: ^1.5.4
version: 1.5.4
+ three:
+ specifier: ^0.160.0
+ version: 0.160.1
vue:
specifier: ^3.2.37
version: 3.5.30
@@ -1811,6 +1814,9 @@
thenify@3.3.1:
resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
+
+ three@0.160.1:
+ resolution: {integrity: sha512-Bgl2wPJypDOZ1stAxwfWAcJ0WQf7QzlptsxkjYiURPz+n5k4RBDLsq+6f9Y75TYxn6aHLcWz+JNmwTOXWrQTBQ==}
through@2.3.8:
resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
@@ -3681,6 +3687,8 @@
dependencies:
any-promise: 1.3.0
+ three@0.160.1: {}
+
through@2.3.8: {}
to-arraybuffer@1.0.1: {}
diff --git a/Code/WMS/WIDESEA_WMSServer/.claude/settings.local.json b/Code/WMS/WIDESEA_WMSServer/.claude/settings.local.json
index 37a9ff7..6a55688 100644
--- a/Code/WMS/WIDESEA_WMSServer/.claude/settings.local.json
+++ b/Code/WMS/WIDESEA_WMSServer/.claude/settings.local.json
@@ -38,7 +38,10 @@
"Bash(cd \"E:/杩呴浄涓嬭浇/WIDESEA_WMSServer\" && dotnet build --configuration Debug 2>&1 | tail -20)",
"Bash(cd \"E:/杩呴浄涓嬭浇/WIDESEA_WMSServer\" && dotnet build --configuration Debug 2>&1 | tail -25)",
"Bash(cd \"E:/杩呴浄涓嬭浇/WIDESEA_WMSServer\" && dotnet build --configuration Debug 2>&1 | grep -A 2 -B 2 \"error CS0\")",
- "Bash(cd \"E:/杩呴浄涓嬭浇/WIDESEA_WMSServer\" && dotnet build --configuration Debug 2>&1 | tail -10)"
+ "Bash(cd \"E:/杩呴浄涓嬭浇/WIDESEA_WMSServer\" && dotnet build --configuration Debug 2>&1 | tail -10)",
+ "Bash(dotnet build:*)",
+ "Bash(git add:*)",
+ "Bash(git commit:*)"
]
}
}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 4ac879d..933b1e7 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -478,7 +478,6 @@
{
try
{
-
var stockInfo = await _stockInfoService.Repository.QueryDataNavFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
if (stockInfo == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -587,11 +586,10 @@
return WebResponseContent.Instance.OK("淇敼鎴愬姛", tasks);
}
catch (Exception ex)
- {
+ {
return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
}
}
-
/// <summary>
/// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
@@ -1121,10 +1119,11 @@
#endregion 鍒嗗鏌滄帴鍙�
-
#region 鏋佸嵎搴撲换鍔℃ā鍧�
+
public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"]; // 涓婃姤AGV鍑哄簱杈撻�佺嚎瀹屾垚
public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"]; // WMS杈撻�佺嚎浠诲姟涓嬪彂
+
/// <summary>
/// 鍑哄叆搴撶敵璇�
/// </summary>
@@ -1244,6 +1243,7 @@
return aGVResponse.Error($"WMS浠诲姟鍒涘缓鎺ュ彛閿欒: {ex.Message}");
}
}
+
/// <summary>
/// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
/// </summary>
@@ -1260,7 +1260,7 @@
var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == outTaskCompleteDto.TaskId);
if (task == null) return webResponse.Error("鏈壘鍒颁换鍔′俊鎭�");
outTaskCompleteDto.ReqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var httpResponse = _httpClientHelper.Post<AGVResponse>(AGV_OutTaskComplete, JsonSerializer.Serialize(outTaskCompleteDto)).Data;
+ var httpResponse = _httpClientHelper.Post<AGVResponse>(AGV_OutTaskComplete, outTaskCompleteDto.ToJson()).Data;
// 鍒ゆ柇杩滅▼鎺ュ彛杩斿洖鏄惁鎴愬姛
if (httpResponse != null && httpResponse.Data != null)
{
@@ -1304,6 +1304,7 @@
return webResponse.Error($"WMS浠诲姟瀹屾垚鎺ュ彛閿欒锛歿ex.Message}");
}
}
+
///// <summary>
///// 浠诲姟瀹屾垚鎺ュ彛
///// </summary>
@@ -1353,7 +1354,7 @@
{
aGVResponse.OK();
}
- else if(applyEnterDto.InOut == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskStatus == (int)TaskStatusEnum.Line_Finish)
+ else if (applyEnterDto.InOut == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskStatus == (int)TaskStatusEnum.Line_Finish)
{
aGVResponse.OK();
}
@@ -1380,6 +1381,7 @@
return aGVResponse.Error($"WMS杈撻�佺嚎鐢宠鎺ュ彛閿欒锛歿ex.Message}");
}
}
+
/// <summary>
/// 鍙栨斁璐у畬鎴�
/// </summary>
@@ -1459,6 +1461,7 @@
return aGVResponse.Error($"WMS鍙栨斁璐у畬鎴愭帴鍙ｉ敊璇細{ex.Message}");
}
}
+
/// <summary>
/// 浠诲姟鍙栨秷
/// </summary>
@@ -1475,7 +1478,7 @@
var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == taskCancelDto.TaskId);
// 娌℃湁浠诲姟寮哄埗鍙栨秷
if (task == null) return aGVResponse.OK();
-
+
if (task.TaskStatus == (int)TaskInStatusEnum.InNew)
{
task.TaskStatus = (int)TaskInStatusEnum.InCancel;
@@ -1485,7 +1488,7 @@
_unitOfWorkManage.CommitTran();
return aGVResponse.OK();
}
- else if(task.TaskStatus == (int)TaskOutStatusEnum.OutNew)
+ else if (task.TaskStatus == (int)TaskOutStatusEnum.OutNew)
{
// 鍑哄簱浠诲姟鎭㈠搴撳瓨
var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
@@ -1517,4 +1520,4 @@
#endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3