From 627bfedc5739855b6d2e829a115c3b64134ef868 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期二, 25 十一月 2025 19:06:06 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 31 +++++++++++++++++++------------
1 files changed, 19 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 3e59d2f..943ab47 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"
@@ -65,6 +65,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;
@@ -144,7 +145,7 @@
if (item.type == 1) //鍏ュ簱
{
Dt_Task dt_Task = new Dt_Task();
- dt_Task.TaskNum = item.taskNo;
+ dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
dt_Task.PalletCode = item.containerNo; //鏆傛棤
dt_Task.Roadway = "RGV101";
dt_Task.TaskType = (int)TaskInboundTypeEnum.Inbound;
@@ -157,6 +158,7 @@
dt_Task.NextAddress = ""; //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
+ dt_Task.LJTaskNum= item.taskNo;
BaseDal.AddData(dt_Task);
content.code = 0;
@@ -185,7 +187,7 @@
AGVStation gVStation = _gvStationService.Corridorequipment(roadway);
Dt_Task dt_Task = new Dt_Task();
- dt_Task.TaskNum = item.taskNo;
+ dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
dt_Task.PalletCode = item.containerNo; //鏆傛棤
dt_Task.Roadway = roadway;
dt_Task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
@@ -198,6 +200,7 @@
dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString(); //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
+ dt_Task.LJTaskNum = item.taskNo;
BaseDal.AddData(dt_Task);
content.code = 0;
@@ -876,7 +879,7 @@
if (task.NextAddress == "1001" || task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(task.TaskNum.ToString(), task.NextAddress, 3, "");
+ TaskResultIn(task.LJTaskNum.ToString(), task.NextAddress, 3, "");
AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
BaseDal.DeleteData(task);
}
@@ -885,11 +888,11 @@
if(task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.NextAddress != "1001" && task.NextAddress != "1002")
{
- TaskResultIn(task.TaskNum.ToString(), "", 2, "");
+ TaskResultIn(task.LJTaskNum.ToString(), "", 2, "");
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- TaskResultOut(task.TaskNum.ToString(), task.NextAddress, 2, "");
+ TaskResultOut(task.LJTaskNum.ToString(), task.NextAddress, 2, "");
}
}
@@ -1389,7 +1392,7 @@
_task_HtyService.AddTaskHty(dt_Task);
BaseDal.DeleteData(dt_Task);
expoReverse.code = 0;
- WriteLog.Write_Log("浠诲姟鍙栨秷淇℃伅", "浠诲姟鍙栨秷", "淇℃伅", $"浠诲姟鍙凤細{dt_Task.TaskNum}锛屽凡鍙栨秷");
+ WriteLog.Write_Log("鍏板墤璋冨彇浠诲姟鍙栨秷淇℃伅", "浠诲姟鍙栨秷", "淇℃伅", $"浠诲姟鍙凤細{dt_Task.TaskNum}锛屽凡鍙栨秷");
}
else
{
@@ -1464,10 +1467,12 @@
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
+ WriteLog.Write_Log("鍏ュ簱浠诲姟涓婁紶鎯呭喌", "姝ｅ父涓婁紶", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}");
responseContent.OK("涓婁紶鎴愬姛");
}
else
{
+ WriteLog.Write_Log("鍏ュ簱浠诲姟涓婁紶鎯呭喌", "涓婁紶澶辫触", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}=====銆嬩笂浼犲け璐ワ紝鍘熷洜锛歿LJReturns.msg}");
responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
}
// 鍒涘缓骞惰祴鍊�
@@ -1487,10 +1492,12 @@
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
+ WriteLog.Write_Log("鍑哄簱浠诲姟涓婁紶鎯呭喌", "姝ｅ父涓婁紶", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}");
responseContent.OK("涓婁紶鎴愬姛");
}
else
{
+ WriteLog.Write_Log("鍑哄簱浠诲姟涓婁紶鎯呭喌", "涓婁紶澶辫触", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}=====銆嬩笂浼犲け璐ワ紝鍘熷洜锛歿LJReturns.msg}");
responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
}
// 鍒涘缓骞惰祴鍊�
@@ -1584,18 +1591,18 @@
if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "鎵嬪姩瀹屾垚");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "鎵嬪姩瀹屾垚");
}
else
{
if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound && dt_task.NextAddress != "1001" && dt_task.NextAddress != "1002")
{
- TaskResultIn(dt_task.TaskNum.ToString(), "", 2, "鎵嬪姩瀹屾垚");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), "", 2, "鎵嬪姩瀹屾垚");
}
else if(dt_task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 2, "鎵嬪姩瀹屾垚");
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 2, "鎵嬪姩瀹屾垚");
}
}
@@ -1673,18 +1680,18 @@
if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
}
else
{
if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
- TaskResultIn(dt_task.TaskNum.ToString(), "", 3, "浠诲姟鍙栨秷");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), "", 3, "浠诲姟鍙栨秷");
}
else
{
- TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
}
}
--
Gitblit v1.9.3