From ce70974f99cd377579e9b07873c8ce79df6e05c3 Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期二, 14 四月 2026 20:47:26 +0800
Subject: [PATCH] '完善二楼出库放货中屏蔽光栅'
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 60543c3..bc2ae13 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -123,14 +123,17 @@
{
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
BaseDal.UpdateData(task);
-
string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
if (task.Creater.Equals("WMS"))
{
//鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
@@ -147,7 +150,11 @@
{
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -165,7 +172,11 @@
{
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -503,7 +514,6 @@
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屼换鍔″彇娑堝け璐ワ紝鏉＄爜锛歿task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
}
-
BaseDal.DeleteData(task);
task.ModifyDate = DateTime.Now;
task.Modifier = App.User?.UserName;
@@ -514,12 +524,12 @@
}
else
{
- WebResponseContent.Instance.Error($"鍙栨秷澶辫触,鍙兘鍙栨秷鍏ュ簱浠诲姟");
+ return WebResponseContent.Instance.Error($"鍙栨秷澶辫触,鍙兘鍙栨秷鍏ュ簱浠诲姟");
}
}
else
{
- WebResponseContent.Instance.Error($"鍙栨秷澶辫触,璇ヤ换鍔°�恵taskNum}銆戜笉瀛樺湪");
+ return WebResponseContent.Instance.Error($"鍙栨秷澶辫触,璇ヤ换鍔°�恵taskNum}銆戜笉瀛樺湪");
}
return content;
}
@@ -615,9 +625,6 @@
try
{
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceName.Contains("鍫嗗灈鏈�"));
-
-
-
// 鍒ゆ柇璁惧鏄惁瀛樺湪
if (device == null)
{
@@ -670,7 +677,7 @@
{
// 姝ｅ父鍒涘缓浠诲姟
transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
- transfer.TaskState = 200;
+ transfer.TaskState = 100;
transfer.CurrentAddress = transfer.SourceAddress;
transfer.NextAddress = transfer.TargetAddress;
transfer.Roadway = device.DeviceCode;
@@ -701,5 +708,51 @@
}
return content;
}
+ /// <summary>
+ /// 鎵嬪姩鍒犻櫎浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+
+ public WebResponseContent CreateDelete(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = App.User?.UserName;
+ task.Remark = "浜哄伐鎵嬪姩鍒犻櫎";
+ content.Status = BaseDal.DeleteData(task);
+ _task_HtyService.AddTaskHty(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鎵嬪姩鍒犻櫎浠诲姟");
+ }
+ catch(Exception e)
+ {
+ WebResponseContent.Instance.Error(e.Message);
+ }
+ return content;
+ }
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string json = JsonConvert.SerializeObject(saveModel.MainData);
+ Dt_Task task = JsonConvert.DeserializeObject<Dt_Task>(json);
+ content.Status = BaseDal.UpdateData(task);
+ }catch(Exception e)
+ {
+ WebResponseContent.Instance.Error(e.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3