From 81f3d2205ff6ee8d173f6d30f57ad510ad86e0bf Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期三, 20 十一月 2024 16:04:07 +0800
Subject: [PATCH] 1
---
/dev/null | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 21 ++++--
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs | 32 ++++++----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ServiceLog/ServiceLogger.cs | 21 +++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 79 ++++++++++++++++++++++---
7 files changed, 124 insertions(+), 35 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/85efd134-b668-40f8-8629-2948e9750cf5.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/85efd134-b668-40f8-8629-2948e9750cf5.vsidx"
deleted file mode 100644
index 9acfc54..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/85efd134-b668-40f8-8629-2948e9750cf5.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a44a257d-7aae-4206-85b3-985b8945f499.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a44a257d-7aae-4206-85b3-985b8945f499.vsidx"
deleted file mode 100644
index 9852da3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a44a257d-7aae-4206-85b3-985b8945f499.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af78ea87-ca7f-4649-b0ba-baafef3697a0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af78ea87-ca7f-4649-b0ba-baafef3697a0.vsidx"
deleted file mode 100644
index 8be78d5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af78ea87-ca7f-4649-b0ba-baafef3697a0.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b34914de-7277-4b00-bb40-84b39fb331bd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b34914de-7277-4b00-bb40-84b39fb331bd.vsidx"
deleted file mode 100644
index 801616e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b34914de-7277-4b00-bb40-84b39fb331bd.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ServiceLog/ServiceLogger.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ServiceLog/ServiceLogger.cs"
index a96a858..73109da 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ServiceLog/ServiceLogger.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ServiceLog/ServiceLogger.cs"
@@ -74,5 +74,26 @@
{
return Directory.GetFiles(folderPath, fileName + "*.log");
}
+
+
+ public static void WriteDebug(string fileName, string msg)
+ {
+
+ StringBuilder stringBuilder = new StringBuilder(msg);
+ stringBuilder.Append(Environment.NewLine);
+ stringBuilder.Append(Environment.NewLine);
+ WriteLogToFile("APIDebug_" + fileName, stringBuilder.ToString());
+
+ }
+
+ public static void WriteInfo(string fileName, string msg)
+ {
+ StringBuilder stringBuilder = new StringBuilder(msg);
+ stringBuilder.Append(Environment.NewLine);
+ stringBuilder.Append(Environment.NewLine);
+ WriteLogToFile("APIInfo_" + fileName, stringBuilder.ToString());
+ }
+
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index c542729..737a288 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -12,7 +12,7 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GuoDian;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
@@ -25,6 +25,6 @@
"ExpMinutes": 120,
"QuartzJobAutoStart": true,
"MESApi": "http://10.0.250.12:8888/agv/v1/CMD",
- "ConveyorLineApi": "http://10.0.250.12:8888/wcs/goBack"//绌鸿溅鍑哄簱浠诲姟淇℃伅鑾峰彇鍦板潃
+ "ConveyorLineApi": "http://10.0.250.12:8888/wcs/goBack" //绌鸿溅鍑哄簱浠诲姟淇℃伅鑾峰彇鍦板潃
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 423a9af..a9fbbb3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using SqlSugar.Extensions;
@@ -147,7 +148,9 @@
WebResponseContent content = new WebResponseContent();
try
{
- // ServiceLogger.WriteLogToFile("");
+ string inparam = JsonConvert.SerializeObject(taskDTO);
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"ReceiveMESTask鏂规硶鍏ュ弬{inparam}");
Dt_Task task = new Dt_Task();
Dt_Task taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id);
if(taskDTO.cmd==101)//濡傛灉鏄�101鎸夋棫鐨勪换鍔″彿鍘绘煡
@@ -157,6 +160,7 @@
if (taskDTO.cmd!=3001&& taskDTO.cmd != 101 && taskinfo != null)
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"浠诲姟鍙烽噸澶嶏紝浠诲姟鍙凤細{taskDTO.task_id}");
return content = WebResponseContent.Instance.Error($"浠诲姟鍙烽噸澶嶏紝浠诲姟鍙凤細{taskDTO.task_id}");
}
Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.src_station.ToString());
@@ -175,6 +179,7 @@
}
else
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"WCS鏈煡璇㈠埌婧愮珯鐐瑰搴旂殑搴撲綅锛屾簮绔欑偣锛歿taskDTO.dest_station.ToString()}");
return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌婧愮珯鐐瑰搴旂殑搴撲綅锛屾簮绔欑偣锛歿taskDTO.dest_station.ToString()}");
}
break;
@@ -193,6 +198,7 @@
}
else
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"WCS鏈煡璇㈠埌婧愮珯鐐瑰搴旂殑搴撲綅锛屾簮绔欑偣锛歿taskDTO.dest_station.ToString()}");
return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌婧愮珯鐐瑰搴旂殑搴撲綅锛屾簮绔欑偣锛歿taskDTO.dest_station.ToString()}");
}
}
@@ -202,6 +208,7 @@
{
UpdateTaskStatus(taskinfo.TaskId, (int)TaskInStatusEnum.AGV_InExecuting);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGV鍏ュ簱鎵ц涓�");
+ ServiceLogger.WriteDebug("ReceiveTask", $"AGV鍏ュ簱鎵ц涓紙鑷姩3001锛夋洿鏂扮姸鎬佹垚鍔燂紝浠诲姟鍙凤細{taskinfo.TaskId}");
return content = WebResponseContent.Instance.OK($"AGV鍏ュ簱鎵ц涓紙鑷姩3001锛夋洿鏂扮姸鎬佹垚鍔燂紝浠诲姟鍙凤細{taskinfo.TaskId}");
}
else
@@ -217,10 +224,12 @@
//鏇存柊浠诲姟琛ㄤ腑NextAddress瀛楁涓烘柊鐨勪换鍔″彿 taskDTO.weight-鏃х殑浠诲姟鍙� taskDTO.task_id-鏂扮殑浠诲姟鍙�
UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGV鎼繍瀹屾垚");
+ ServiceLogger.WriteDebug("ReceiveTask", $"AGV鎼繍瀹屾垚锛�101锛夋洿鏂扮姸鎬佹垚鍔燂紝浠诲姟鍙凤細{taskinfo.TaskId}");
return content = WebResponseContent.Instance.OK($"AGV鎼繍瀹屾垚锛�101锛夋洿鏂扮姸鎬佹垚鍔燂紝浠诲姟鍙凤細{taskinfo.TaskId}");
}
else
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"AGV鎼繍瀹屾垚锛�101锛夋洿鏂扮姸鎬佹椂锛屾煡璇笉鍒颁换鍔″彿");
return content = WebResponseContent.Instance.Error($"AGV鎼繍瀹屾垚锛�101锛夋洿鏂扮姸鎬佹椂锛屾煡璇笉鍒颁换鍔″彿");
}
break;
@@ -252,7 +261,8 @@
}
else
{
- return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿taskDTO.dest_station.ToString()}");
+ ServiceLogger.WriteDebug("ReceiveTask", $"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿taskDTO.dest_station.ToString()}");
+ return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿taskDTO.dest_station.ToString()}");
}
break;
case 104://缁勭珛鏈轰笂鏂� 鏆傚瓨浣�-->缁勭珛鏈�
@@ -270,7 +280,8 @@
}
else
{
- return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿task.TargetAddress.ToString()}");
+ ServiceLogger.WriteDebug("ReceiveTask", $"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿task.TargetAddress.ToString()}");
+ return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌鐩爣绔欑偣瀵瑰簲鐨勫簱浣嶏紝鐩爣绔欑偣锛歿task.TargetAddress.ToString()}");
}
//鏍规嵁鐩爣鍦板潃锛堢粍绔嬫満锛夋煡璇㈤粯璁ょ殑鎵ц浠诲姟鐨勫皬鍫嗗灈鏈虹紪鍙�
Dt_LocationInfo locationtemp2 = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
@@ -280,6 +291,8 @@
}
else
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"WCS鏈煡璇㈠埌缁勭珛鏈哄搴旂殑榛樿灏忓爢鍨涙満閰嶇疆");
return content = WebResponseContent.Instance.Error($"WCS鏈煡璇㈠埌缁勭珛鏈哄搴旂殑榛樿灏忓爢鍨涙満閰嶇疆");
}
@@ -292,7 +305,7 @@
task.TaskNum = taskDTO.task_id;
task.PalletCode = taskDTO.CarId;
- task.Roadway = "SC01";
+
if (string.IsNullOrEmpty(task.SourceAddress))//濡傛灉涓嶆槸绔欑偣锛岀洿鎺ュ彇琛屽垪灞�
{
task.SourceAddress = $"SC01-{taskDTO.src_rack.ToString().PadLeft(3, '0')}-{taskDTO.src_col.ToString().PadLeft(3, '0')}-{taskDTO.src_row.ToString().PadLeft(3, '0')}";
@@ -310,10 +323,12 @@
{
if (srcLocation.EnableStatus == (int)EnableStatusEnum.Disable)
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"婧愬湴鍧�宸茬鐢細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"婧愬湴鍧�宸茬鐢細{srcLocation.LocationCode}");
}
if (tarLocation.EnableStatus == (int)EnableStatusEnum.Disable)
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"鐩爣鍦板潃宸茬鐢細{tarLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"鐩爣鍦板潃宸茬鐢細{tarLocation.LocationCode}");
}
if (taskDTO.cmd != 101)//鍏ュ簱鏃朵笉闇�瑕佸垽鏂槸鍚﹂攣瀹氾紝閿佸畾鐘舵�佹槸鍦ㄧ敓鎴愪换鍔℃椂閿佸畾
@@ -323,10 +338,13 @@
{
if (srcLocation.LocationStatus == (int)LocationStatusEnum.Lock)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"婧愬湴鍧�宸查攣瀹氾細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"婧愬湴鍧�宸查攣瀹氾細{srcLocation.LocationCode}");
}
if (tarLocation.LocationStatus == (int)LocationStatusEnum.Lock)
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"鐩爣鍦板潃宸查攣瀹氾細{tarLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"鐩爣鍦板潃宸查攣瀹氾細{tarLocation.LocationCode}");
}
}
@@ -336,6 +354,8 @@
//WCS鏌ヨ搴撲綅鐘舵�佹槸鍚︿负鈥滅┖闂测�濆苟涓旀湭绂佺敤锛岄攣瀹氬簱浣嶄慨鏀瑰簱浣嶇姸鎬佷负鈥滈攣瀹氣�濓紝鐢熸垚WCS浜у搧鍏ュ簱浠诲姟锛屽姞鍏CS浠诲姟闃熷垪涓��
if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"鍏ュ簱-鐩爣鍦板潃涓嶆槸绌洪棽鐘舵�侊細{tarLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"鍏ュ簱-鐩爣鍦板潃涓嶆槸绌洪棽鐘舵�侊細{tarLocation.LocationCode}");
}
//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -354,10 +374,14 @@
//WCS鏌ヨ搴撲綅鐘舵�佹槸鍚︿负鈥滄湁璐р�濓紝搴撲綅/鏆傚瓨搴撲綅鏄惁鈥滅┖闂测��
if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"绉诲簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"绉诲簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
}
if(tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"绉诲簱-鐩爣鍦板潃涓嶆槸绌洪棽鐘舵�侊細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"绉诲簱-鐩爣鍦板潃涓嶆槸绌洪棽鐘舵�侊細{srcLocation.LocationCode}");
}
srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -369,6 +393,8 @@
//WCS鏌ヨ搴撲綅鐘舵�佹槸鍚︿负鈥滄湁璐р��
if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"寮傚父鍑哄簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"寮傚父鍑哄簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
}
srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -384,6 +410,8 @@
//WCS鏌ヨ鏆傚瓨搴撲綅鏄惁鈥滄湁璐р��
if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"绌鸿溅鍑哄簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"绌鸿溅鍑哄簱-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
}
//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -398,6 +426,8 @@
//WCS鏌ヨ鏆傚瓨搴撲綅鏄惁鈥滄湁璐р��
if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
{
+
+ ServiceLogger.WriteDebug("ReceiveTask", $"涓婃枡浠诲姟-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
return content = WebResponseContent.Instance.Error($"涓婃枡浠诲姟-婧愬湴鍧�涓嶆槸鏈夎揣鐘舵�侊細{srcLocation.LocationCode}");
}
//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -408,6 +438,7 @@
}
else
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"搴撲綅鍦板潃涓嶅瓨鍦紝浠诲姟鍙�:{task.TaskNum}");
return content = WebResponseContent.Instance.Error($"搴撲綅鍦板潃涓嶅瓨鍦紝浠诲姟鍙�:{task.TaskNum}");
}
@@ -431,12 +462,13 @@
_unitOfWorkManage.RollbackTran();
throw;
}
-
- content = WebResponseContent.Instance.OK("鎴愬姛",task);
+ ServiceLogger.WriteDebug("ReceiveTask", $"鎺ユ敹浠诲姟鎴愬姛锛屼换鍔″彿:{task.TaskNum}");
+ content = WebResponseContent.Instance.OK($"鎺ユ敹浠诲姟鎴愬姛锛屼换鍔″彿:{task.TaskNum}", task);
}
catch (Exception ex)
{
+ ServiceLogger.WriteDebug("ReceiveTask", $"浠诲姟鎺ユ敹閿欒,閿欒淇℃伅:{ex.Message}");
content = WebResponseContent.Instance.Error($"浠诲姟鎺ユ敹閿欒,閿欒淇℃伅:{ex.Message}");
}
return content;
@@ -844,6 +876,7 @@
MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
if (res != null && res.code != 0)
{
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍑哄簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満瀹屾垚鍑哄簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
}
@@ -851,6 +884,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
}
@@ -880,16 +914,25 @@
//鍏ュ簱瀹屾垚锛屽洖浼燤ES 鍏ュ簱瀹屾垚鍥炰紶task.NextAddress 涔嬪墠101璇锋眰鏃跺瓨鐨勬柊浠诲姟鍙�
MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = int.Parse(task.NextAddress), status = 6 };
+ string inparam = JsonConvert.SerializeObject(sendcmd);
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍏ュ簱浠诲姟鍚庡洖浼燤ES鍏ュ弬:{inparam}");
MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
if (res != null && res.code != 0)
{
+
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍏ュ簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満瀹屾垚鍏ュ簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
+ }
+ else
+ {
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍏ュ簱浠诲姟鍚庡洖浼燤ES鎴愬姛锛�,浠诲姟鍙�:銆恵taskNum}銆�");
}
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満鎵ц鍏ュ簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満鎵ц鍏ュ簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
}
}
@@ -902,7 +945,7 @@
srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
Dt_LocationInfo tarLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- srcLocation.LocationStatus = (int)LocationStatusEnum.InStock;
+ tarLocation.LocationStatus = (int)LocationStatusEnum.InStock;
UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
@@ -917,9 +960,12 @@
//绉诲簱瀹屾垚锛屽洖浼燤ES
//鍥炰紶鍒癢MS
MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
+ string inparam = JsonConvert.SerializeObject(sendcmd);
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍑哄簱浠诲姟鍚庡洖浼燤ES鍏ュ弬:{inparam}");
MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
if (res != null && res.code != 0)
{
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満瀹屾垚鍑哄簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満瀹屾垚鍑哄簱浠诲姟鍚庡洖浼燤ES澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵res.message}銆�");
}
@@ -927,6 +973,7 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"澶у爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
content = WebResponseContent.Instance.Error($"澶у爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
}
}
@@ -950,6 +997,8 @@
_unitOfWorkManage.CommitTran();
//涓婃枡瀹屾垚锛屽洖浼燱MS
MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
+ string inparam = JsonConvert.SerializeObject(sendcmd);
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"灏忓爢鍨涙満鎵ц鍑哄簱浠诲姟鍥炰紶MES鍏ュ弬{inparam}");
MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
if (res != null && res.code != 0)
{
@@ -973,10 +1022,14 @@
startPlan= "101"+ SourceCodes[2].Substring(1,2);
}
DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
+ string inparam2 = JsonConvert.SerializeObject(send);
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"灏忓爢鍨涙満鎵ц鍑哄簱浠诲姟鍥炰紶MES鍏ュ弬{inparam2}");
ApiInvoke.DeliveryPlanCMD(send);//鍥炶皟MES鎺ュ彛鐢熸垚绌鸿溅鍑哄簱浠诲姟
-
+ //鎵�鏈夌殑灞傛暟閮藉彇瀹岋紝闇�瑕佹妸鏆傚瓨浣嶇姸鎬佹敼涓虹┖闂茬姸鎬�
+ srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
+ _locationInfoRepository.UpdateData(srcLocation);
}
-
+
}
}
@@ -986,19 +1039,23 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"灏忓爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
content = WebResponseContent.Instance.Error($"灏忓爢鍨涙満鎵ц鍑哄簱浠诲姟澶辫触锛�,浠诲姟鍙�:銆恵taskNum}銆�,澶辫触淇℃伅:銆恵ex.Message}銆�");
}
}
else
{
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
}
- content = WebResponseContent.Instance.OK();
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"浠诲姟瀹屾垚鎴愬姛,浠诲姟鍙�:銆恵taskNum}銆�");
+ content = WebResponseContent.Instance.OK($"浠诲姟瀹屾垚鎴愬姛,浠诲姟鍙�:銆恵taskNum}銆�");
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�");
+ ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆憑ex.Message}");
+ content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆憑ex.Message}");
}
return content;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 3e63582..4102b58 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -1,5 +1,6 @@
锘縰sing HslCommunication;
using Microsoft.AspNetCore.Components.Routing;
+using Newtonsoft.Json;
using Quartz;
using System;
using System.Collections.Generic;
@@ -7,6 +8,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Common.ServiceLog;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core.Enums;
@@ -47,7 +49,8 @@
public Task Execute(IJobExecutionContext context)
{
- CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
+ //CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
+ CommonStackerCrane commonStackerCrane = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC01") as CommonStackerCrane;
try
{
if (commonStackerCrane != null)
@@ -102,8 +105,8 @@
//鏌ヨ鎻愬崌鏈�/缁勭珛鏈轰俊鍙�
- //Task.Run(delegate
- //{
+ Task.Run(delegate
+ {
try
{
@@ -145,11 +148,11 @@
if(IsWriteOne == 0)
{
- commonStackerCrane.Communicator.Write<short>("DB1.0.0", 1);
+ var d= commonStackerCrane.Communicator.Write<short>("DB1.0.0", 1);
}
//璇诲彇鎻愬崌鏈轰俊鍙凤紝纭畾鏄惁鎻愬崌瀹屾垚
- commonStackerCrane.Communicator.Read<short>("DB2.2.0");
+ IsFinish= commonStackerCrane.Communicator.Read<short>("DB2.2.0");
}
else if (task3001.SourceAddress == "SC01-002-000-002")//WMS 1002绔欑偣
{
@@ -166,10 +169,14 @@
{
MESSendCMD sendcmd = new MESSendCMD { cmd = 2002, task_id = task3001.TaskNum, status = 6 };
MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
+ string inparam = JsonConvert.SerializeObject(sendcmd);
+ WriteDebug(nameof(CommonStackerCraneJob), $"鎻愬崌鏈烘彁鍗囧畬鎴愶紝鍥炰紶WMS,鍏ュ弬锛歿inparam}");
+
if (res != null && res.code != 0)
{
WriteDebug(nameof(CommonStackerCraneJob), $"鎻愬崌鏈烘彁鍗囧畬鎴愶紝鍥炰紶WMS澶辫触锛佷换鍔″彿{task3001.TaskNum}");
}
+
}
}
@@ -239,9 +246,9 @@
{
WriteError(nameof(CommonStackerCraneJob), "鏌ヨ鎴栧啓鍏LC鐘舵�佸け璐ワ紒", ex);
}
-
- //});
+
+ });
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
index 318452b..fdac4dc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
@@ -56,16 +56,17 @@
CommonStackerCrane? stackerCraneOne = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC02") as CommonStackerCrane;
CommonStackerCrane? stackerCraneTwo = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC03") as CommonStackerCrane;
- Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
- Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
- if(deviceSC02.DeviceStatus=="0")
- {
- stackerCraneOne = null;
- }
- if(deviceSC03.DeviceStatus=="0")
- {
- stackerCraneTwo = null;
- }
+ //Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
+ //Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
+ //if(deviceSC02.DeviceStatus=="0")
+ //{
+ // stackerCraneOne = null;
+ //}
+ //if(deviceSC03.DeviceStatus=="0")
+ //{
+ // stackerCraneTwo = null;
+ //}
+ stackerCraneOne.CheckStackerCraneTaskCompleted();
Dt_Task? task = GetTask();
if (task != null)
{
@@ -159,9 +160,11 @@
}
}
- else//涓嶈兘姝ｅ父宸ヤ綔鐘舵��
+ else//SC02涓嶈兘姝ｅ父宸ヤ綔鐘舵��,杩欓噷闇�瑕佸垽鏂璼c02鏄惁绂佺敤锛屽鏋滃凡绂佺敤锛屾墠鍙互鍚姩sc03
{
- if (stackerCraneTwo != null)
+ Dt_DeviceInfo deviceSC02 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
+
+ if (deviceSC02.DeviceStatus=="0"&& stackerCraneTwo != null)
{
if (!stackerCraneTwo.IsEventSubscribed)
{
@@ -198,9 +201,10 @@
return stackerCraneTwo;
}
}
- else
+ else//SC03涓嶈兘姝ｅ父宸ヤ綔鐘舵��,杩欓噷闇�瑕佸垽鏂璼c03鏄惁绂佺敤锛屽鏋滃凡绂佺敤锛屾墠鍙互鍚姩sc02
{
- if (stackerCraneOne != null)
+ Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
+ if (deviceSC03.DeviceStatus=="0"&&stackerCraneOne != null)
{
if (!stackerCraneOne.IsEventSubscribed)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
index a8572e6..ed70cc3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.1.0" />
+ <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/24GKH202 \346\231\272\346\261\207\345\245\207\347\255\226 \351\203\255\345\272\227\346\231\272\350\203\275\347\253\213\344\275\223\345\272\223\351\241\271\347\233\256\346\212\200\346\234\257\345\215\217\350\256\256-2024.10.25.pdf" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/24GKH202 \346\231\272\346\261\207\345\245\207\347\255\226 \351\203\255\345\272\227\346\231\272\350\203\275\347\253\213\344\275\223\345\272\223\351\241\271\347\233\256\346\212\200\346\234\257\345\215\217\350\256\256-2024.10.25.pdf"
deleted file mode 100644
index 43afaf2..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/24GKH202 \346\231\272\346\261\207\345\245\207\347\255\226 \351\203\255\345\272\227\346\231\272\350\203\275\347\253\213\344\275\223\345\272\223\351\241\271\347\233\256\346\212\200\346\234\257\345\215\217\350\256\256-2024.10.25.pdf"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/PLC\345\234\260\345\235\200.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/PLC\345\234\260\345\235\200.png"
deleted file mode 100644
index 20b86b1..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/PLC\345\234\260\345\235\200.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\205\245\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\205\245\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt"
deleted file mode 100644
index fc7f914..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\205\245\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt"
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "cmd": 101,
- "task_id": 7871,
- "src_rack": 2,
- "src_col": 0,
- "src_row": 1,
- "dest_rack": 2,
- "dest_col": 5,
- "dest_row": 3,
- "src_station": 0,
- "dest_station": 0,
- "size": 0,
- "weight": 0,
- "barcode": "",
- "startIndex": 0,
- "total": 9,
- "carId": "8044",
- "status": 2
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\210\235\345\247\213\345\214\226.txt" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\210\235\345\247\213\345\214\226.txt"
deleted file mode 100644
index 9d07aa0..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\210\235\345\247\213\345\214\226.txt"
+++ /dev/null
@@ -1 +0,0 @@
-111
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx"
deleted file mode 100644
index bdb14e2..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\267\245\344\275\234\350\277\233\345\272\246\351\242\204\344\274\260-\345\230\211\345\205\264\346\265\267\345\256\201 \345\260\226\345\261\261&\351\203\255\345\272\227 WMS&WCS&\345\240\206\345\236\233\346\234\272\347\224\265\346\216\247\351\241\271\347\233\256-2024.09.14.pdf" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\267\245\344\275\234\350\277\233\345\272\246\351\242\204\344\274\260-\345\230\211\345\205\264\346\265\267\345\256\201 \345\260\226\345\261\261&\351\203\255\345\272\227 WMS&WCS&\345\240\206\345\236\233\346\234\272\347\224\265\346\216\247\351\241\271\347\233\256-2024.09.14.pdf"
deleted file mode 100644
index 736e45f..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\267\245\344\275\234\350\277\233\345\272\246\351\242\204\344\274\260-\345\230\211\345\205\264\346\265\267\345\256\201 \345\260\226\345\261\261&\351\203\255\345\272\227 WMS&WCS&\345\240\206\345\236\233\346\234\272\347\224\265\346\216\247\351\241\271\347\233\256-2024.09.14.pdf"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\272\223\344\275\215.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\272\223\344\275\215.png"
deleted file mode 100644
index b8d1144..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\272\223\344\275\215.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\274\202\345\270\270\345\207\272\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\274\202\345\270\270\345\207\272\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt"
deleted file mode 100644
index a7cfa25..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\274\202\345\270\270\345\207\272\345\272\223\347\224\237\346\210\220\344\273\273\345\212\241\346\212\245\346\226\207.txt"
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "cmd": 102,
- "task_id": 7872,
- "src_rack": 2,
- "src_col": 5,
- "src_row": 2,
- "dest_rack":0 ,
- "dest_col":0 ,
- "dest_row":0 ,
- "src_station": 0,
- "dest_station": 1001,
- "size": 0,
- "weight": 0,
- "barcode": "",
- "startIndex": 0,
- "total": 9,
- "carId": "8044",
- "status": 2
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\231\272\346\261\207\345\245\207\347\255\226\351\203\255\345\272\227\345\260\226\345\261\261\351\241\271\347\233\256\351\200\232\346\270\205\345\215\2251031.xls" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\231\272\346\261\207\345\245\207\347\255\226\351\203\255\345\272\227\345\260\226\345\261\261\351\241\271\347\233\256\351\200\232\346\270\205\345\215\2251031.xls"
deleted file mode 100644
index 801977f..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\231\272\346\261\207\345\245\207\347\255\226\351\203\255\345\272\227\345\260\226\345\261\261\351\241\271\347\233\256\351\200\232\346\270\205\345\215\2251031.xls"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2761.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2761.png"
deleted file mode 100644
index d4f5572..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2761.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2762.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2762.png"
deleted file mode 100644
index 38d8674..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\345\233\2762.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\350\257\264\346\230\216.doc" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\350\257\264\346\230\216.doc"
deleted file mode 100644
index 937a5de..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\346\265\201\347\250\213\350\257\264\346\230\216.doc"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\273\204\347\253\213\346\234\272\344\270\212\346\226\231\345\211\251\344\275\231\345\261\202\346\225\260\345\233\236\345\206\231\357\274\210DB28\357\274\211.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\273\204\347\253\213\346\234\272\344\270\212\346\226\231\345\211\251\344\275\231\345\261\202\346\225\260\345\233\236\345\206\231\357\274\210DB28\357\274\211.png"
deleted file mode 100644
index 5fe94cb..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\273\204\347\253\213\346\234\272\344\270\212\346\226\231\345\211\251\344\275\231\345\261\202\346\225\260\345\233\236\345\206\231\357\274\210DB28\357\274\211.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\344\272\247\345\223\20189\345\216\202\347\253\213\345\272\223\345\270\203\345\261\200\345\233\276\0501\051.dwg" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\344\272\247\345\223\20189\345\216\202\347\253\213\345\272\223\345\270\203\345\261\200\345\233\276\0501\051.dwg"
deleted file mode 100644
index 5365a9b..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\344\272\247\345\223\20189\345\216\202\347\253\213\345\272\223\345\270\203\345\261\200\345\233\276\0501\051.dwg"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\345\205\253\345\216\202\350\207\252\345\212\250\345\214\226\351\241\271\347\233\256\347\253\213\344\275\223\345\272\223\346\212\200\346\234\257\345\215\217\350\256\2560302\0502\051.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\345\205\253\345\216\202\350\207\252\345\212\250\345\214\226\351\241\271\347\233\256\347\253\213\344\275\223\345\272\223\346\212\200\346\234\257\345\215\217\350\256\2560302\0502\051.docx"
deleted file mode 100644
index 3310f34..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227-\345\205\253\345\216\202\350\207\252\345\212\250\345\214\226\351\241\271\347\233\256\347\253\213\344\275\223\345\272\223\346\212\200\346\234\257\345\215\217\350\256\2560302\0502\051.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227\351\241\271\347\233\256\345\256\236\346\226\275\345\267\245\344\275\234\345\256\211\346\216\222\345\217\212\350\277\233\345\272\246\347\256\241\347\220\206\350\241\250-\347\254\2541\345\221\250-2024.11.13.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227\351\241\271\347\233\256\345\256\236\346\226\275\345\267\245\344\275\234\345\256\211\346\216\222\345\217\212\350\277\233\345\272\246\347\256\241\347\220\206\350\241\250-\347\254\2541\345\221\250-2024.11.13.xlsx"
deleted file mode 100644
index 32d16e6..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\351\203\255\345\272\227\351\241\271\347\233\256\345\256\236\346\226\275\345\267\245\344\275\234\345\256\211\346\216\222\345\217\212\350\277\233\345\272\246\347\256\241\347\220\206\350\241\250-\347\254\2541\345\221\250-2024.11.13.xlsx"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3