From 79cea1bc2685b73f2f6a29379f37580ca1a38c79 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 11 四月 2026 15:56:50 +0800
Subject: [PATCH] 优化提升机质检料箱接口，添加平库的修改库区以及查看
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 425 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 353 insertions(+), 72 deletions(-)
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 c13ac63..505e820 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 SixLabors.ImageSharp.ColorSpaces;
using SqlSugar;
using System.Collections.Generic;
@@ -55,6 +56,8 @@
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
private readonly IApiInfoService _apiInfoService;
private readonly IStationMangerService _stationMangerService;
+ private readonly IStationInfoService _stationInfo;
+ private readonly ITaskErrorMessageService _taskErrorMessageService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -74,7 +77,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService, IStationInfoService stationInfo, ITaskErrorMessageService taskErrorMessageService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -86,6 +89,8 @@
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
_stationMangerService = stationMangerService;
+ _stationInfo = stationInfo;
+ _taskErrorMessageService = taskErrorMessageService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -94,12 +99,12 @@
{
List<object> objects = new List<object>();
foreach (var item in taskDTOs)
- {
+ {
foreach (var task in item.tasks)
{
#region 鍒ゆ柇
- content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status)
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ if (!contentStatus.Status)
{
objects.Add(new
{
@@ -107,7 +112,6 @@
Message = $"浠诲姟鍙枫�恵task.taskCode}銆憑content.Message}"
});
continue;
- //throw new Exception(content.Message);
}
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode && x.TaskType == item.taskType) != null)
{
@@ -119,7 +123,7 @@
continue;
//throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟");
}
- if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode && x.TaskType == item.taskType) != null)
+ if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode /*&& x.TaskType == item.taskType*/) != null)
{
objects.Add(new
{
@@ -129,7 +133,7 @@
continue;
//throw new Exception($"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
}
- if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType) != null)
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType && x.TaskState < TaskStatusEnum.TakeFinish.ObjToInt()) != null)
{
objects.Add(new
{
@@ -142,6 +146,7 @@
#endregion
switch (item.taskType)
{
+ #region 鍑箰澹獳GV闈㈡枡搴�
case (int)TaskTypeEnum.MLInbound:
content = CreateKLSNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -150,6 +155,8 @@
content = CreateKLSNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
+ #region 鏃疯鍥涘悜杞︽垚鍝佸簱
case (int)TaskTypeEnum.CPInbound:
content = CreateRGVNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -158,22 +165,40 @@
content = CreateRGVNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJInbound:
+ case (int)TaskTypeEnum.CPMoveInventory:
+ content = CreateRGVNewMoveTask(task, item.taskType);
+ objects.Add(content.Data);
+ break;
+ #endregion
+ #region 娴峰悍AGV
+ case (int)TaskTypeEnum.STURR:
+ case (int)TaskTypeEnum.Q1TSJ4:
content = CreateHKNewInTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJOutbound:
+ case (int)TaskTypeEnum.STU0003:
+ case (int)TaskTypeEnum.CHUKU1:
content = CreateHKNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.Carry:
+
+ case (int)TaskTypeEnum.Q3RK:
+ case (int)TaskTypeEnum.Q3CK:
content = CarryTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJCarry:
+ case (int)TaskTypeEnum.F01:
+ content = HKF01Transport(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.F04:
+ case (int)TaskTypeEnum.RK3F:
+ case (int)TaskTypeEnum.F02:
+ case (int)TaskTypeEnum.F03:
+ case (int)TaskTypeEnum.CK3F:
content = CJCarryTaske(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
default:
objects.Add(new
{
@@ -209,9 +234,10 @@
var KLS = new CancelGALAXISTask();
CancelHIKROBOTTask cancelHIKROBOTTask = new CancelHIKROBOTTask();
CancelSXCTake cancelSXCTake = new CancelSXCTake();
+ var deviceName = "";
try
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode && x.TaskType != TaskTypeEnum.CPMoveInventory.ObjToInt());
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
@@ -220,12 +246,13 @@
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK || dt_Task.TaskType == (int)TaskTypeEnum.STURR;
//杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
#region 鍑箰澹�
if (isGALAXISTask)
{
+ deviceName = "鍑箰澹獳GV";
KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
@@ -253,25 +280,40 @@
#region 鍥涘悜杞�
if (isAGV)
{
- cancelSXCTake = new CancelSXCTake
+ deviceName = "鍥涘悜杞�";
+ if (dt_Task.RGVTaskId == 0)
{
- taskID = dt_Task.RGVTaskId,
- withoutRunning = 1
- };
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
- if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
- FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.OK(data: fOURBOTReturn);
- if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
- {
- //鐩存帴绉诲叆鍘嗗彶
- BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ if (dt_Task.TaskType == TaskTypeEnum.CPOutbound.ObjToInt() && dt_Task.TaskState == TaskStatusEnum.RGV_WaitSend.ObjToInt())
+ {
+ //淇敼搴撲綅鐘舵��
+ var rgvlocaiion = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == dt_Task.SourceAddress);
+ rgvlocaiion.LocationStatus = LocationStatusEnum.InStock.ObjToInt(); //灏嗗簱浣嶇姸鎬佹敼涓烘湁璐�
+ }
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩鍒犻櫎);
content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ cancelSXCTake = new CancelSXCTake
+ {
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.OK(data: fOURBOTReturn);
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
+ }
}
}
#endregion
@@ -279,14 +321,20 @@
#region 娴峰悍
if (isHK)
{
+ deviceName = "娴峰悍鏈哄櫒浜�";
cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
- cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
+ cancelType = "DROP"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
};
+ var headers = new Dictionary<string, string>
+ {
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString() + wMSCancelTask.TaskCode }
+ };
+
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelHIKROBOTTask));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, cancelHIKROBOTTask.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelHIKROBOTTask.Serialize(), headers: headers);
HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
content.OK(data: hIKROBOTReturn);
if (hIKROBOTReturn.code == "SUCCESS" && hIKROBOTReturn.message == "鎴愬姛")
@@ -310,30 +358,7 @@
}
finally
{
- // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
- object logObject = null;
- string deviceName = "";
-
- if (KLS != null)
- {
- logObject = KLS;
- deviceName = "鍑箰澹獳GV";
- }
- else if (cancelHIKROBOTTask != null)
- {
- logObject = cancelHIKROBOTTask;
- deviceName = "娴峰悍鏈哄櫒浜�";
- }
- else if (cancelSXCTake != null)
- {
- logObject = cancelSXCTake;
- deviceName = "鍥涘悜杞�";
- }
-
- if (logObject != null)
- {
- _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
- }
+ _trackloginfoService.AddTrackLog(wMSCancelTask, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
}
return content;
}
@@ -363,7 +388,7 @@
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK;
//淇敼鍘熸湰浠诲姟浼樺厛绾�
dt_Task.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
@@ -489,6 +514,7 @@
var rgv = new List<Dt_RGVLocationInfo>();
var kls = new List<Dt_KLSLocationInfo>();
var hk = new List<Dt_HKLocationInfo>();
+ var pk = new List<Dt_StationInfo>();
if (wMSUpdateLocationArea.WarehouseId == 1)
{
var rgvList = _rGVLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
@@ -516,6 +542,15 @@
item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
hk.AddRange(hkList);
+ }
+ if (wMSUpdateLocationArea.WarehouseId == 4)
+ {
+ var pkList = _stationInfo.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.StationCode)).ToList();
+ foreach (var item in pk)
+ {
+ item.StationRegion = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
+ }
+ pk.AddRange(pkList);
}
Db.Ado.BeginTran();
_rGVLocationInfoService.UpdateData(rgv);
@@ -1103,7 +1138,9 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
+
});
}
content.OK(data: list);
@@ -1121,35 +1158,81 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
});
}
content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 3)
{
-
+ //杩欓噷鏄彁鍗囨満鐨�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) throw new Exception("鏈壘鍒版彁鍗囨満璁惧淇℃伅");
+ if (!device.IsConnected) throw new Exception("PLC1鎻愬崌鏈鸿澶囪繛鎺ュけ璐�");
+ var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJC3F");
+ list.Add(new
+ {
+ LoctionCode = value,
+ LocationStatus = value != 0 ? 100 : 0,
+ EnableStatus = 0,
+ });
+ content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 4)
{
-
+ List<Dt_HKLocationInfo> rGVLocationInfos = new List<Dt_HKLocationInfo>();
+ if (!string.IsNullOrEmpty(getLocationInfo.AreaCode))
+ rGVLocationInfos = _hKLocationInfoService.Repository.QueryData(x => x.WarehouseId == getLocationInfo.AreaCode.ObjToInt());
+ else
+ rGVLocationInfos = _hKLocationInfoService.Repository.QueryData();
+ foreach (var item in rGVLocationInfos)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.LocationCode,
+ LocationStatus = item.LocationStatus,
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
+ });
+ }
+ content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 5)
{
//璇诲彇鍏夌數淇″彿
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
- if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�") ;
+ if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
- var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
+ var sta = _stationMangerService.Repository.QueryData(x => x.StationName.Contains("鎴愬搧浠�"));
foreach (var item in sta)
{
- bool value = device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
- list.Add(new
- {
- LoctionCode = item.StationCode,
- LocationStatus = value?100:0,
- EnableStatus = 0,
- });
+ bool value = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = value ? 100 : 0,
+ EnableStatus = 0,
+ });
+ }
+ content.OK(data: list);
+ }
+ else if (getLocationInfo.WarehouseId == 6)
+ {
+ List<Dt_StationInfo> StationInfo = new List<Dt_StationInfo>();
+ if (!string.IsNullOrEmpty(getLocationInfo.AreaCode))
+ StationInfo = _stationInfo.Repository.QueryData(x => x.StationRegion == getLocationInfo.AreaCode.ObjToInt());
+ else
+ StationInfo = _stationInfo.Repository.QueryData();
+ foreach (var item in StationInfo)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = item.StationStatus,
+ EnableStatus = item.IsOccupied,
+ PalletCode = item.PalletCode
+ });
}
content.OK(data: list);
}
@@ -1182,7 +1265,28 @@
{
throw new NotImplementedException();
}
-
+ public WebResponseContent InboundElevatorExit(string LocationCode, string containerCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ inboundElevatorExitDTO inboundElevator = new inboundElevatorExitDTO();
+ try
+ {
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(inboundElevatorExitDTO)) ?? throw new Exception("鏈壘鍒�4F鎻愬崌鏈哄嚭鍙ｆ墭鐩樺彿涓婃姤WMS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ inboundElevator.containerCode = containerCode;
+ inboundElevator.toLocationCode = LocationCode;
+ string response = HttpHelper.Post(apiInfo.ApiAddress, inboundElevator.Serialize());
+ content.OK(data: response);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(inboundElevator, content, "4F鎻愬崌鏈哄嚭鍙ｆ墭鐩樺彿涓婃姤WMS", "", "");
+ }
+ }
/// <summary>
/// 鏂欑楠岃瘉
/// </summary>
@@ -1191,7 +1295,33 @@
/// <returns></returns>
public WebResponseContent MaterialBoxInspection(string taskCode, string containerCode)
{
- throw new NotImplementedException();
+ WebResponseContent content = new WebResponseContent();
+ inboundTransportCheckDTO checkDTO = new inboundTransportCheckDTO();
+ try
+ {
+ checkDTO.containerCode = containerCode;
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(inboundTransportCheckDTO)) ?? throw new Exception("鏈壘鍒拌鐗囧叆搴�3F鍒�4F杩愯緭绠卞彿鏍￠獙鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, checkDTO.Serialize());
+ content.OK(data: response);
+ WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>();
+ if (wMSReturn == null) throw new Exception("WMS杩斿洖缁撴灉杞崲澶辫触锛�");
+ if (!wMSReturn.success) throw new Exception(wMSReturn.message);
+ string dataJson = wMSReturn.result.ToString();
+ Exists? exists = JsonConvert.DeserializeObject<Exists>(dataJson);
+ if (exists == null) throw new Exception($"WMS杩斿洖缁撴灉鐨剅esult杞崲澶辫触");
+ //濡傛灉鎴愬姛灏变笉杩斿洖
+ if (exists.taskExists) return WebResponseContent.Instance.OK();
+ //濡傛灉澶辫触浜嗗氨杩斿洖exists.errorAreaCode
+ return WebResponseContent.Instance.OK(exists.errorAreaCode);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(checkDTO, content, "瑁佺墖鍏ュ簱3F鍒�4F杩愯緭绠卞彿鏍￠獙", "", "");
+ }
}
/// <summary>
@@ -1203,6 +1333,41 @@
throw new NotImplementedException();
}
/// <summary>
+ /// 骞冲簱璐т綅涓婁笅鏋跺鍣�
+ /// </summary>
+ /// <param name="wMSUpOrDown"></param>
+ /// <returns></returns>
+ public WebResponseContent UpOrDownContainer(WMSUpOrDownContainerDTO wMSUpOrDown)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_StationInfo stationInfo = _stationInfo.Repository.QueryFirst(x => x.StationCode == wMSUpOrDown.locationCode) ?? throw new Exception($"鏈壘鍒拌揣浣嶃�恵wMSUpOrDown.locationCode}銆戜俊鎭�");
+ if (wMSUpOrDown.direction == 1)
+ {
+ stationInfo.StationStatus = LocationStatusEnum.InStock.ObjToInt();
+ stationInfo.PalletCode = wMSUpOrDown.containerCode;
+ }
+ else
+ {
+ stationInfo.StationStatus = LocationStatusEnum.Free.ObjToInt();
+ stationInfo.PalletCode = "";
+ }
+ _stationInfo.UpdateData(stationInfo);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(wMSUpOrDown, content, "骞冲簱璐т綅涓婁笅鏋跺鍣�", "", "");
+ }
+ return content;
+ }
+
+ /// <summary>
/// 瀹瑰櫒娴佸姩璇锋眰
/// </summary>
/// <param name="wMSContainerFlow"></param>
@@ -1210,6 +1375,7 @@
/// <exception cref="NotImplementedException"></exception>
public WebResponseContent ContainerRequest(WMSContainerFlow wMSContainerFlow)
{
+ WebResponseContent content = new WebResponseContent();
try
{
Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == wMSContainerFlow.slotCode) ?? throw new Exception($"鏈壘鍒扮珯鍙般�恵wMSContainerFlow.slotCode}銆戜俊鎭�");
@@ -1217,20 +1383,26 @@
if (wMSContainerFlow.direction == "200")
{
stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ stationManger.Remark = "";
FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation()
{
stationCode = wMSContainerFlow.slotCode,
};
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.OK(data: fOURBOTReturn);
if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
_stationMangerService.UpdateData(stationManger);
}
- return WebResponseContent.Instance.OK();
+ return content.OK();
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(wMSContainerFlow, content, "瀹瑰櫒娴佸姩璇锋眰", "", "");
}
}
/// <summary>
@@ -1283,11 +1455,21 @@
//task.TaskState = (int)TaskStatusEnum.Execut;
//BaseDal.UpdateData(task);
#endregion
+
+ #region 涓婃灦涓渶瑕佸皢绔欏彴鐘舵�佹敼涓哄崰鐢� 缁戝畾瀹瑰櫒缂栫爜
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ stationManger.Remark = iQC.ContainerCode;
+ _stationMangerService.UpdateData(stationManger);
+ #endregion
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(iQC, content, "IQC璐ㄦ缁撴灉鍙嶉", "", "");
}
}
@@ -1299,6 +1481,7 @@
/// <exception cref="NotImplementedException"></exception>
public WebResponseContent multiSetNodeStatus(FOURBOTStorageStatusNotify fOURBOTStorageStatusNotify)
{
+ WebResponseContent content = new WebResponseContent();
try
{
var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x => fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
@@ -1307,13 +1490,111 @@
item.EnableStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
}
_rGVLocationInfoService.UpdateData(Agvlocation);
- return WebResponseContent.Instance.OK();
+ return content.OK();
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
+ finally
+ {
+ _trackloginfoService.AddTrackLog(fOURBOTStorageStatusNotify, content, "鎵归噺鏇存柊鍌ㄤ綅鐘舵��", "", "");
+ }
}
+
+
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ try
+ {
+ // 鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
+ var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));
+
+ // 鎵ц绉诲叆鍘嗗彶鎿嶄綔锛屽苟妫�鏌ョ粨鏋�
+ bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.浜哄伐鍒犻櫎);
+
+ if (!moveResult)
+ {
+ // 绉诲叆鍘嗗彶澶辫触锛岃繑鍥為敊璇俊鎭�
+ return WebResponseContent.Instance.Error("绉诲叆鍘嗗彶璁板綍澶辫触");
+ }
+ return WebResponseContent.Instance.OK("鍒犻櫎鎴愬姛锛屾暟鎹凡绉诲叆鍘嗗彶");
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ // Logger.Error(ex.Message);
+ return WebResponseContent.Instance.Error("鍒犻櫎澶辫触锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鏍￠獙浠诲姟鐩稿叧鐨勫簱浣嶇姸鎬佸拰缁戝畾鍏崇郴
+ /// </summary>
+ /// <param name="taskType">浠诲姟绫诲瀷</param>
+ /// <param name="taskDTO">浠诲姟DTO</param>
+ /// <returns>杩斿洖璧风偣搴撲綅鍜岀粓鐐瑰簱浣嶄俊鎭�</returns>
+ /// <exception cref="Exception">鏍￠獙澶辫触鏃舵姏鍑哄紓甯�</exception>
+ private WebResponseContent ValidateLocationForTask(int taskType, TaskDTO taskDTO)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ #region
+ // 鍏ュ簱绫讳换鍔★紙闇�瑕佹牎楠岀粓鐐瑰簱浣嶏級
+ if (taskType == (int)TaskTypeEnum.CK3F || taskType == (int)TaskTypeEnum.F03)
+ {
+ var toStation = _stationInfo.Repository.QueryFirst(x => x.StationName == taskDTO.toLocationCode)
+ ?? throw new Exception($"鏈壘鍒扮粓鐐瑰簱浣嶃�恵taskDTO.toLocationCode}銆戯紒");
+
+ if (toStation.StationStatus != (int)LocationStatusEnum.Free)
+ throw new Exception($"缁堢偣搴撲綅銆恵taskDTO.toLocationCode}銆戝簱浣嶇姸鎬佷笉鍙叆搴擄紒");
+ }
+ // 鍑哄簱绫讳换鍔★紙闇�瑕佹牎楠岃捣鐐瑰簱浣嶏級
+ else if (taskType == (int)TaskTypeEnum.RK3F || taskType == (int)TaskTypeEnum.F04)
+ {
+ var fromStation = _stationInfo.Repository.QueryFirst(x => x.StationName == taskDTO.fromLocationCode)
+ ?? throw new Exception($"鏈壘鍒拌捣鐐瑰簱浣嶃�恵taskDTO.fromLocationCode}銆戯紒");
+
+ if (fromStation.StationStatus != (int)LocationStatusEnum.InStock)
+ throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戝綋鍓嶅簱浣嶇姸鎬佷笉鍙嚭搴擄紒");
+
+ if (fromStation.PalletCode != taskDTO.containerCode)
+ throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戠粦瀹氭枡绠卞彿銆恵fromStation.PalletCode}銆戜笌浠诲姟鏂欑鍙枫�恵taskDTO.containerCode}銆戜笉鍖归厤锛�");
+ }
+ // 绉诲簱绫讳换鍔★紙闇�瑕佸悓鏃舵牎楠岃捣鐐瑰拰缁堢偣锛�
+ else if (taskType == (int)TaskTypeEnum.F02)
+ {
+ // 鏍￠獙缁堢偣搴撲綅
+ var toStation = _stationInfo.Repository.QueryFirst(x => x.StationName == taskDTO.toLocationCode)
+ ?? throw new Exception($"鏈壘鍒扮粓鐐瑰簱浣嶃�恵taskDTO.toLocationCode}銆戯紒");
+
+ if (toStation.StationStatus != (int)LocationStatusEnum.Free)
+ throw new Exception($"缁堢偣搴撲綅銆恵taskDTO.toLocationCode}銆戝簱浣嶇姸鎬佷笉鍙叆搴擄紒");
+
+ // 鏍￠獙璧风偣搴撲綅
+ var fromStation = _stationInfo.Repository.QueryFirst(x => x.StationName == taskDTO.fromLocationCode)
+ ?? throw new Exception($"鏈壘鍒拌捣鐐瑰簱浣嶃�恵taskDTO.fromLocationCode}銆戯紒");
+
+ if (fromStation.StationStatus != (int)LocationStatusEnum.InStock)
+ throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戝綋鍓嶅簱浣嶇姸鎬佷笉鍙嚭搴擄紒");
+
+ if (fromStation.PalletCode != taskDTO.containerCode)
+ throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戠粦瀹氭枡绠卞彿銆恵fromStation.PalletCode}銆戜笌浠诲姟鏂欑鍙枫�恵taskDTO.containerCode}銆戜笉鍖归厤锛�");
+ }
+ #endregion
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+
+ return content.Error(ex.Message);
+ }
+
+
+ }
+
+
}
}
--
Gitblit v1.9.3