From cba2c0ff983f40757aa9840a3bd520c28a9896d9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 四月 2026 17:37:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 346 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 220 insertions(+), 126 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 5f476de..24a178f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -1,6 +1,7 @@
锘縰sing Autofac.Core;
using Magicodes.IE.Core;
using NetTaste;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -8,6 +9,7 @@
using System.Reflection.Metadata;
using System.Text;
using System.Text.Json;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
@@ -83,19 +85,7 @@
task.TaskState = (int)TaskStatusEnum.HktransportIng;
BaseDal.UpdateData(task);
}
- else if (task.TaskType == (int)TaskTypeEnum.Q3CK)
- {
- UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Lock);
- task.TaskState = (int)TaskStatusEnum.Takeing;
- TaskFeedback(task, 1);
- }
- else if (task.TaskType == (int)TaskTypeEnum.Q3RK)
- {
- UpdateStandStatus(task, task.TargetAddress, LocationStatusEnum.Lock);
- task.TaskState = (int)TaskStatusEnum.Takeing;
- TaskFeedback(task, 1);
- }
- else
+ else if (task.TaskState == (int)TaskStatusEnum.Execut)
{
task.TaskState = (int)TaskStatusEnum.Takeing;
TaskFeedback(task, 1);
@@ -103,24 +93,11 @@
break;
case "outbin"://绂诲紑璧风偣
{
- if (task.TaskType == (int)TaskTypeEnum.Q3RK|| task.TaskType == (int)TaskTypeEnum.Q3CK)
- {
- UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Free);
- task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
- BaseDal.UpdateData(task);
- TaskFeedback(task, 1);
- }
- else
- {
-
- TaskFromCompleted(task, deviceTypeEnum); //浠诲姟鐘朵綋鏀逛负3鍙栬揣瀹屾垚锛屾洿鏂拌捣鐐硅揣浣嶇姸鎬侊紝骞跺弽棣圵MS璧风偣瀹屾垚
- }
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum); //浠诲姟鐘朵綋鏀逛负3鍙栬揣瀹屾垚锛屾洿鏂拌捣鐐硅揣浣嶇姸鎬侊紝骞跺弽棣圵MS璧风偣瀹屾垚
}
break;
case "finish"://绂诲紑鎻愬崌鏈�
{
-
//鍏ユ彁鍗囨満
if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
{
@@ -128,11 +105,22 @@
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
- DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());//鏀惧埌浣嶄簡
+ bool Work = false;
if (device.IsConnected)
- device.SetValue(HoistEnum.Inboundboxon, 1);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ {
+ int i = 0;
+ while (!Work && i <= 3)
+ {
+ i++;
+ Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
+ Thread.Sleep(500);
+ }
+ }
+ if (!Work)
+ {
+ task.ExceptionMessage = $"銆恵task.TargetAddress}銆戝啓鍏�3妤煎叆搴撶鏀惧埌浣嶅け璐�";
+ task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
+ }
}
BaseDal.UpdateData(task);
}
@@ -144,58 +132,101 @@
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
+ bool Work = false;
if (device.IsConnected)
- device.SetValue(HoistEnum.Outboundboxon, 1);//鍑哄簱瀹屾垚
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ {
+ int i = 0;
+ while (!Work && i <= 3)
+ {
+ i++;
+ Work = device.SetValue(HoistEnum.Outboundboxon, 1, task.SourceAddress);//鍑哄簱瀹屾垚
+ Thread.Sleep(500);
+ }
+ }
+ if (!Work)
+ {
+ task.ExceptionMessage = $"銆恵task.SourceAddress}銆戝啓鍏�3妤煎嚭搴撶鏀惧埌浣嶅け璐�";
+ task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}";
+ }
}
BaseDal.UpdateData(task);
}
- //鍥涙ゼ 鍑哄簱
+ //鍥涙ゼ 鍑哄簱
else if ((task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() || task.TaskType == TaskTypeEnum.F04.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
{
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
+ bool Work = false;
if (device.IsConnected)
- device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ {
+ int i = 0;
+ while (!Work && i <= 3)
+ {
+ i++;
+ Work = device.SetValue(HoistEnum.Emptyboxplacedinposition, 1, task.TargetAddress);
+ Thread.Sleep(500);
+ }
+ }
+ if (!Work)
+ {
+ task.ExceptionMessage = $"銆恵task.TargetAddress}銆戝啓鍏�4妤肩┖绠辨斁鍒颁綅澶辫触";
+ task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
+ }
}
BaseDal.UpdateData(task);
}
- // //鍥涙ゼ鍑烘彁鍗囨満 鍏ュ簱 涔嬪墠鏄疉GV_ToExecute
- if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ // //鍥涙ゼ鍑烘彁鍗囨満 鍏ュ簱 涔嬪墠鏄疉GV_ToExecute //瑕佸啓鎴愬彇璐у畬鎴愮姸鎬乀akeFinish
+ else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.TakeFinish)
{
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
+ bool Work = false;
if (device.IsConnected)
- //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
- device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ {
+ int i = 0;
+ while (!Work && i <= 3)
+ {
+ i++;
+ Work = device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
+ Thread.Sleep(500);
+ }
+ }
+ if (!Work)
+ {
+ task.ExceptionMessage = $"銆恵task.SourceAddress}銆戝啓鍏�4妤煎嚭搴撳彇绠卞畬鎴愬け璐�";
+ task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
+ }
}
BaseDal.UpdateData(task);
}
//璺ㄦゼ灞�
- else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || task.TaskType == TaskTypeEnum.Q3CK.ObjToInt() && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || task.TaskType == TaskTypeEnum.Q3CK.ObjToInt()/* && task.TaskState == (int)TaskStatusEnum.TakeFinish*/)
{
- if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt()|| task.TaskType == TaskTypeEnum.Q3RK.ObjToInt())
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒拌川妫�闂ㄤ俊鎭�";
+ else
{
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
- if (device == null) task.ExceptionMessage = "鏈壘鍒拌川妫�闂ㄤ俊鎭�";
- else
+ bool Wok = false;
+ var Address = task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() ? task.TargetAddress : task.SourceAddress;
+ if (device.IsConnected)
{
- if (device.IsConnected)
- //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
- device.SetValue(QualityInspectionCommandEnum.RequestToEnter, false, task.TargetAddress);
- else
- task.ExceptionMessage = "璐ㄦ闂ㄤ俊鎭澶囪繛鎺ュけ璐�";
+ int i = 0;
+ while (!Wok && i <= 3)
+ {
+ i++;
+ Wok = device.SetValue(QualityInspectionCommandEnum.RequestToEnter, false, Address);
+ Thread.Sleep(500);
+ }
}
-
+ if (!Wok)
+ {
+ task.ExceptionMessage = $"銆恵Address}銆戝叧闂姹傝繘鍏ュけ璐ワ紒";
+ task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
+ }
}
BaseDal.UpdateData(task);
}
@@ -214,11 +245,22 @@
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
+ bool Wok = false;
if (device.IsConnected)
- //鎵撳紑鎵爜鍣�
- device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ {
+ int i = 0;
+ while (!Wok && i <= 3)
+ {
+ i++;
+ Wok = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1, "TSJR3F");
+ Thread.Sleep(500);
+ }
+ }
+ if (!Wok)
+ {
+ task.ExceptionMessage = $"銆怲SJR3F銆�3妤艰鐮佽Е鍙戝け璐ワ紒";
+ task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
+ }
}
task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
BaseDal.UpdateData(task);
@@ -226,16 +268,16 @@
break;
case "end"://浠诲姟瀹屾垚閫氱煡
{
- if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.Q3CK|| task.TaskType == (int)TaskTypeEnum.MOVE)
+ if (task.TaskType == (int)TaskTypeEnum.MOVE)
{
task.TaskState = TaskStatusEnum.Finish.ObjToInt();
- BaseDal.UpdateData(task);
- TaskFeedback(task, 2);
BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
+ var Task = BaseDal.QueryFirst(x => task.WMSTaskNum.Contains(x.WMSTaskNum));
+ Task.TaskState = TaskStatusEnum.HkTransportCompleted.ObjToInt();
+ BaseDal.UpdateData(Task);
}
else
{
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
TaskCompleted(task, deviceTypeEnum);
}
}
@@ -243,16 +285,16 @@
case "intolift": //杩涘叆鐢垫
{
//鍏ゼ鍒颁竴妤肩殑鍏ュ簱浠诲姟
- if (task.TaskType==(int)TaskTypeEnum.Q3RK||task.TaskType==(int)TaskTypeEnum.MOVE)
+ if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.MOVE || task.TaskType == (int)TaskTypeEnum.F01 || task.TaskType == (int)TaskTypeEnum.Q3CK)
{
task.TaskState = TaskStatusEnum.Hkintolift.ObjToInt();
BaseDal.UpdateData(task);
}
}
break;
- case "leavelift": //绂诲紑鐢垫
+ case "leavelift": //绂诲紑鐢垫
{
- if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.MOVE)
+ if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.MOVE || task.TaskType == (int)TaskTypeEnum.F01 || task.TaskType == (int)TaskTypeEnum.Q3CK)
{
task.TaskState = TaskStatusEnum.HKleavelift.ObjToInt();
BaseDal.UpdateData(task);
@@ -275,31 +317,40 @@
var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵Rgv.content.taskID}銆�");
//绉诲簱
- if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && Rgv.messageType == 10 && Rgv.content.status == 4)
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
{
- deviceName += "绉诲簱";
- WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
+ if (Rgv.messageType == 72)
{
- containerCode = task.PalletCode,
- fromStationCode = task.SourceAddress,
- toLocationCode = task.TargetAddress
- };
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSMoveLocationFeedback));
- WMSReturn agvContent = null;
- if (apiInfo == null) task.ExceptionMessage = "鏈壘鍒扮Щ搴撳畬鎴愬弽棣圵MS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
- else
+ task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
+ BaseDal.UpdateData(task);
+ UpdateLocationStatus(task.SourceAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.Free);
+ }
+ if (Rgv.messageType == 10 && Rgv.content.status == 4)
{
- task.TaskState = TaskStatusEnum.Finish.ObjToInt();
- string response = HttpHelper.Post(apiInfo.ApiAddress, wMSMoveLocationFeedback.Serialize());
- agvContent = response.DeserializeObject<WMSReturn>();
- content.OK(data: agvContent);
- if (agvContent.code != 200)
+ deviceName += "绉诲簱";
+ WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
{
- task.ExceptionMessage = agvContent.message;
- content.Error(agvContent.message);
+ containerCode = task.PalletCode,
+ fromStationCode = task.SourceAddress,
+ toLocationCode = task.TargetAddress
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSMoveLocationFeedback));
+ WMSReturn agvContent = null;
+ if (apiInfo == null) task.ExceptionMessage = "鏈壘鍒扮Щ搴撳畬鎴愬弽棣圵MS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
+ else
+ {
+ task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ string response = HttpHelper.Post(apiInfo.ApiAddress, wMSMoveLocationFeedback.Serialize());
+ agvContent = response.DeserializeObject<WMSReturn>();
+ content.OK(data: agvContent);
+ if (agvContent.code != 200)
+ {
+ task.ExceptionMessage = agvContent.message;
+ content.Error(agvContent.message);
+ }
+ UpdateLocationStatus(task.TargetAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
}
- UpdateLocationStatus(task.TargetAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
- BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
}
}
else
@@ -351,6 +402,29 @@
TaskCompleted(task, deviceTypeEnum);
}
}
+ if (Rgv.content.status == 5)
+ {
+ task.ExceptionMessage = Rgv.content.errorReason;
+ var Error = _taskErrorMessageService.Repository.QueryFirst(x => x.ErrorCode == Rgv.content.errorCode && x.DeviceType == (int)deviceTypeEnum);
+ if (task.TaskType == (int)TaskTypeEnum.CPOutbound && task.TaskState == (int)TaskStatusEnum.Execut && Rgv.content.errorCode == 1330003)//鎴愬搧鍑哄簱浠诲姟涓嬪彂鍚庡弽棣堟湁闃荤鎵橈紝淇敼浠诲姟鐘舵�佷负鏂板缓閲嶆柊鏌ヨ闃荤鎵樺叧绯�
+ {
+ task.TaskState = (int)TaskStatusEnum.New;
+ BaseDal.UpdateData(task);
+ }
+ else
+ {
+ if (Error != null)
+ {
+ task.ExceptionMessage = Error.ExceptionMessage;
+ MatchCollection matches = Regex.Matches(Rgv.content.errorReason, @"\(([^)]+)\)");
+ if (matches.Count > 0)
+ task.ExceptionMessage = ReplacePlaceholders(Rgv.content.errorReason, Error.ExceptionMessage);
+ ErrorTaskFeedback(task, true, Error.ErrorCode.ToString());
+ }
+ else
+ ErrorTaskFeedback(task, true);
+ }
+ }
}
}
}
@@ -365,6 +439,30 @@
_trackloginfoService.AddTrackLog(TaskDTO, content, $"{deviceName}浠诲姟鐘舵�佸弽棣�", "", "");
}
return content;
+ }
+ #endregion
+
+ #region 寮傚父淇℃伅杞崲
+ /// <summary>
+ /// 寮傚父淇℃伅()鍐呭杞崲
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="targetTemplate"></param>
+ /// <returns></returns>
+ public string ReplacePlaceholders(string source, string targetTemplate)
+ {
+ // 鎻愬彇婧愬瓧绗︿覆涓殑鎵�鏈夋嫭鍙峰��
+ var values = Regex.Matches(source, @"\(([^)]+)\)")
+ .Cast<Match>()
+ .Select(m => m.Groups[1].Value)
+ .ToList();
+
+ // 鏇挎崲鐩爣妯℃澘涓殑鎵�鏈� (%v)
+ int idx = 0;
+ string result = Regex.Replace(targetTemplate, @"\(\%v\)", _ =>
+ idx < values.Count ? values[idx++] : "");
+
+ return result;
}
#endregion
@@ -449,7 +547,7 @@
try
{
dt_Task.TaskState = TaskStatusEnum.Finish.ObjToInt();
- TaskFeedback(dt_Task, 2);
+ TaskFeedback(dt_Task, 2, string.IsNullOrEmpty(dt_Task.Remark));
//Db.Ado.BeginTran();
UpdateLocationStatus(dt_Task.TargetAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
@@ -523,6 +621,21 @@
stationInfo.StationStatus = locationStatusEnum.ObjToInt();
_stationInfo.UpdateData(stationInfo);
}
+ Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == locationCode);
+ if (stationManger != null)
+ {
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ stationManger.Remark = "";
+ stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ }
+ else
+ {
+ stationManger.Remark = palletCode;
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ }
+ _stationMangerService.UpdateData(stationManger);
+ }
}
else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
{
@@ -542,38 +655,22 @@
dt_RGVLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
_rGVLocationInfoService.Repository.UpdateData(dt_RGVLocationInfo);
}
- }
- else//骞冲簱搴撲綅
- {
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
- #endregion
-
- #region 鏇存柊涓�妤肩珯鍙扮姸鎬�
- public WebResponseContent UpdateStandStatus(Dt_Task task,string stationCode,LocationStatusEnum locationStatusEnum)
- {
- try
- {
- Dt_StationManger? stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == task.TargetAddress);
- //stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
- if (stationManger != null)
- {
- if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == locationCode);
+ if (stationManger != null)
{
- stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ stationManger.Remark = "";
+ stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ }
+ else
+ {
+ stationManger.Remark = palletCode;
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ }
+ _stationMangerService.UpdateData(stationManger);
}
- else
- {
- stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
- }
- _stationMangerService.UpdateData(stationManger);
}
return WebResponseContent.Instance.OK();
}
@@ -585,7 +682,7 @@
#endregion
#region 涓婃姤WMS
- public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status)
+ public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status, bool Del = false)
{
WebResponseContent content = new WebResponseContent();
WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
@@ -602,7 +699,7 @@
boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
boundCompleteFeedback.status = Status;
boundCompleteFeedback.custStatus = "";
- string response = HttpHelper.Post(apiInfo.ApiAddress,boundCompleteFeedback.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
agvContent = response.DeserializeObject<WMSReturn>();
content.OK(data: agvContent);
if (agvContent.code != 200)
@@ -619,7 +716,7 @@
finally
{
_trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "鍑哄叆搴撲换鍔＄姸鎬佸弽棣圵MS", "", "");
- if (agvContent != null && agvContent.code == 200 && Status == 2)
+ if (agvContent != null && agvContent.code == 200 && Del)
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
else
BaseDal.UpdateData(dt_Task);
@@ -628,7 +725,7 @@
}
#endregion
#region 澶辫触浠诲姟涓婃姤WMS骞跺垹闄や换鍔�
- public WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del)
+ public WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del = false, string ErrorCode = "")
{
WebResponseContent content = new WebResponseContent();
WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
@@ -644,7 +741,7 @@
boundCompleteFeedback.fromStationCode = dt_Task.SourceAddress;
boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
boundCompleteFeedback.status = 3;
- boundCompleteFeedback.custStatus = "";
+ boundCompleteFeedback.custStatus = ErrorCode;
boundCompleteFeedback.memo = dt_Task.ExceptionMessage;
string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
agvContent = response.DeserializeObject<WMSReturn>();
@@ -665,15 +762,12 @@
finally
{
_trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "鍑哄叆搴撲换鍔＄姸鎬佸弽棣圵MS", "", "");
- if (agvContent != null && agvContent.code == 200 && Del) BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
+ if (agvContent != null && agvContent.code == 200 && Del)
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
else BaseDal.UpdateData(dt_Task);
}
return content;
}
#endregion
-
-
-
-
}
}
--
Gitblit v1.9.3