From 99d55d437cc924429bb9589d5afe24f386cf8342 Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 18 九月 2025 15:52:17 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 148 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9d4b054..ac8d38e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -117,7 +117,7 @@
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
public ExpoReverse TaskInstruction(ExpoTaskDTO expoTask)
{
-
+
ExpoReverse content = new ExpoReverse();
try
@@ -125,8 +125,8 @@
foreach (var item in expoTask.data)
{
//鏌ヨ鏁版嵁搴擄紝鏌ョ湅鏄惁鏈夊綋鍓嶄换鍔�
- Dt_Task dt_Tasks =BaseDal.QueryFirst(x=>x.TaskNum== item.taskNo);
- if(dt_Tasks != null)
+ Dt_Task dt_Tasks = BaseDal.QueryFirst(x => x.TaskNum == item.taskNo);
+ if (dt_Tasks != null)
{
content.code = 1;
content.msg = $"鏄庡拰WCS宸叉湁褰撳墠浠诲姟ID锛岃鍕块噸鏂颁笅鍙戯紝浠诲姟鍙凤細{dt_Tasks.TaskNum}";
@@ -202,14 +202,12 @@
content.msg = $"浠诲姟绫诲瀷閿欒锛寃cs鎺ユ敹鍒扮殑绫诲瀷涓猴細{item.type}";
}
}
-
WriteLog.Write_Log("浠诲姟鎺ユ敹", "鎺ユ敹鍏板墤涓嬪彂浠诲姟", "鎴愬姛", $"鎺ユ敹鍒扮殑鏁版嵁涓猴細{expoTask.ToJson()}");
}
catch (Exception ex)
{
content.code = 1;
content.msg = $"鏁版嵁閿欒锛屽師鍥狅細{ex.Message}";
-
WriteLog.Write_Log("浠诲姟鎺ユ敹", "鎺ユ敹鍏板墤涓嬪彂浠诲姟寮傚父", "寮傚父", ex.Message);
}
return content;
@@ -291,7 +289,6 @@
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
-
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -975,10 +972,10 @@
/// <returns></returns>
public WebResponseContent StkRunStatus()
{
- WebResponseContent responseContent=new WebResponseContent();
+ WebResponseContent responseContent = new WebResponseContent();
// 鍒涘缓骞惰祴鍊�
- StkRunStatusReception reception = new StkRunStatusReception{data = new List<StkRunStatusData>{new StkRunStatusData{stackerName = "ALL"}}};
- StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJianStkRunStatus, reception, "鏌ヨ鍫嗗灈鏈鸿繍琛岀姸鎬�");
+ StkRunStatusReception reception = new StkRunStatusReception { data = new List<StkRunStatusData> { new StkRunStatusData { stackerName = "ALL" } } };
+ StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJianStkRunStatus, reception, "鏌ヨ鍫嗗灈鏈鸿繍琛岀姸鎬�");
if (LJReturns.code == 0)
{
if (LJReturns.data[0].runStatus == 0) //鍏ㄩ儴鍫嗗灈鏈轰笉鍦ㄨ繍琛岀姸鎬�
@@ -1004,10 +1001,10 @@
/// </summary>
/// <param name="sCErrorStatus"></param>
/// <returns></returns>
- public WebResponseContent TaskResultIn(string taskNo,string finalAddress,int status,string remark)
+ public WebResponseContent TaskResultIn(string taskNo, string finalAddress, int status, string remark)
{
WebResponseContent responseContent = new WebResponseContent();
- TaskfeedbackResponse reception = new TaskfeedbackResponse { data = new List<TaskfeedbackData> { new TaskfeedbackData { taskNo = taskNo, type=1, finalAddress= finalAddress, status= status, remark= remark } } };
+ TaskfeedbackResponse reception = new TaskfeedbackResponse { data = new List<TaskfeedbackData> { new TaskfeedbackData { taskNo = taskNo, type = 1, finalAddress = finalAddress, status = status, remark = remark } } };
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
@@ -1015,7 +1012,7 @@
}
else
{
- responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細"+LJReturns.msg);
+ responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
}
// 鍒涘缓骞惰祴鍊�
return responseContent;
@@ -1042,5 +1039,144 @@
// 鍒涘缓骞惰祴鍊�
return responseContent;
}
+
+
+ /// <summary>
+ /// 浜哄伐鎵嬪姩瀹屾垚
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent CompletedManually(int id)
+ {
+
+ var db = BaseDal.Db as SqlSugarClient;
+
+ try
+ {
+ db.Ado.BeginTran();
+
+
+ Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
+ if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+
+ var res = _task_HtyService.AddData(new Dt_Task_hty
+ {
+ TaskNum = dt_task.TaskNum,
+ PalletCode = dt_task.PalletCode,
+ Roadway = dt_task.Roadway,
+ TaskType = dt_task.TaskType,
+ TaskState = dt_task.TaskState,
+ SourceAddress = dt_task.SourceAddress,
+ TargetAddress = dt_task.TargetAddress,
+ CurrentAddress = dt_task.CurrentAddress,
+ NextAddress = dt_task.NextAddress,
+ WMSId = dt_task.WMSId,
+ Dispatchertime = dt_task.Dispatchertime,
+ Remark = "浜哄伐鎵嬪姩瀹屾垚",
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ RGVTaskType = dt_task.RGVTaskType,
+ RGVCurrentexecution = dt_task.RGVCurrentexecution
+ });
+
+ int oldState = dt_task.TaskState;
+ _taskExecuteDetailService.AddTaskExecuteDetail(
+ dt_task.TaskId,
+ $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_task.TaskState}銆�"
+);
+
+ if (res.Status == false)
+ {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ }
+
+ var deletetask = BaseDal.DeleteData(dt_task);
+ if (deletetask == false) {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
+ }
+ db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK("鎵嬪姩瀹屾垚鎴愬姛锛�");
+
+ }
+ catch (Exception ex)
+ {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ }
+ }
+
+ /// <summary>
+ /// 浜哄伐鎵嬪姩鍙栨秷浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent MHWCSTaskCancel(int id)
+ {
+ var db = BaseDal.Db as SqlSugarClient;
+
+ try
+ {
+ db.Ado.BeginTran();
+ Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
+ if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+ //if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew || dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
+ if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
+ {
+ if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
+ }
+ else
+ {
+ if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
+
+ }
+
+ Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
+ {
+ TaskNum = dt_task.TaskNum,
+ PalletCode = dt_task.PalletCode,
+ Roadway = dt_task.Roadway,
+ TaskType = dt_task.TaskType,
+ TaskState = dt_task.TaskType >= (int)TaskInboundTypeEnum.Inbound ? (int)TaskInStatusEnum.InCancel : (int)TaskOutStatusEnum.OutCancel,
+ SourceAddress = dt_task.SourceAddress,
+ TargetAddress = dt_task.TargetAddress,
+ CurrentAddress = dt_task.CurrentAddress,
+ NextAddress = dt_task.NextAddress,
+ WMSId = dt_task.WMSId,
+ Dispatchertime = dt_task.Dispatchertime,
+ Remark = "浜哄伐鎵嬪姩鍙栨秷浠诲姟",
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ RGVTaskType = dt_task.RGVTaskType,
+ RGVCurrentexecution = dt_task.RGVCurrentexecution
+ };
+ var res = _task_HtyService.AddData(dt_Task_Hty);
+ if (res.Status == false) {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
+ }
+ int oldState = dt_task.TaskState;
+ _taskExecuteDetailService.AddTaskExecuteDetail(
+ dt_task.TaskId,
+ $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_Task_Hty.TaskState}銆�"
+);
+
+ var deletetask = BaseDal.DeleteData(dt_task);
+ if (deletetask == false) {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
+ }
+ db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK("鍙栨秷浠诲姟鎴愬姛锛�");
+ }
+ catch (Exception ex)
+ {
+ db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
+ }
+ }
}
}
--
Gitblit v1.9.3