From 8df624a41b03581fc06132172156a5d33b2cfcd3 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 18 十二月 2025 14:24:24 +0800
Subject: [PATCH] 取消AGV移库任务CancelMoveTask目标储位去除仓库限制
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index eb93eca..fa3acd5 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -1635,7 +1635,7 @@
task.IsFinish = 0;
task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
await Db.Updateable(task).ExecuteCommandAsync();
- if(task.OrderType != "6")//瑙嗚鐩樼偣涓嶆洿鏀圭姸鎬�
+ if (task.OrderType != "6")//瑙嗚鐩樼偣涓嶆洿鏀圭姸鎬�
{
locate.Status = "0"; // 鏇存敼褰撳墠浠诲姟涓殑鍌ㄤ綅鐘舵�侊紙鏀逛负0绌哄偍浣嶏級
await Db.Updateable(locate).ExecuteCommandAsync();
@@ -1745,7 +1745,7 @@
locate2.Status = "1";
Db.Updateable(locate2).ExecuteCommand();
//鍒ゆ柇鐩爣浣嶇疆濡傛灉涓嶆槸鏄溅闂存殏瀛樺尯 骞朵笖鏄钩搴撳偍浣� 鏇存敼搴撳瓨浣嶇疆
- if (pingKuLocate2.Count(m=>m.LocatNo == task.EndLocat)<=0 && pingKuList.Contains(task.EndLocat))
+ if (pingKuLocate2.Count(m => m.LocatNo == task.EndLocat) <= 0 && pingKuList.Contains(task.EndLocat))
{
foreach (var item in stockDetail)
{
@@ -1852,17 +1852,17 @@
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list, time1, time2);
}
- if (wcsModel.StatusCode == -1)
+ else
{
- new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
- throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.Msg}");
+ new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
+ throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.message}");
}
}
catch (Exception ex)
@@ -1973,7 +1973,8 @@
await Db.Updateable(task).ExecuteCommandAsync();
//淇敼璧峰鍌ㄤ綅淇℃伅
- var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
+ //var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
if (locat == null)
{
throw Oops.Bah("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
@@ -1982,7 +1983,8 @@
Db.Updateable(locat).ExecuteCommand();
//淇敼鐩爣鍌ㄤ綅淇℃伅
- var locatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ //var locatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ var locatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.LocatNo == task.EndLocat);
if (locatEnd != null)
{
locatEnd.Status = "0"; //绌哄偍浣�
--
Gitblit v1.8.0