Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -97,7 +97,7 @@ if (!content.Status) { // wms失败返回去NG口任务 return content; } Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
@@ -150,6 +150,36 @@ } /// <summary> /// 输送线请求空框 /// </summary> /// <param name="conveyorLine"></param> /// <param name="command"></param> /// <param name="stationInfo"></param> public void RequestEmptyOutbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo) { if (stationInfo.stationType != 7) return; var taskNew = _taskRepository.QueryFirst(x => x.Roadway == stationInfo.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.OutTray); if (taskNew == null) //不存在空框出库任务 则请求WMS出空库 { if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status) { Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway); if (task != null) { //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task); //taskCommand.InteractiveSignal = command.InteractiveSignal; //taskCommand.ResponState = 1; //taskCommand.ConveyorLineTaskNum = task.TaskNum; //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress); //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode); //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress); //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); } } } } /// <summary> /// 输送线请求入库 /// </summary> /// <param name="conveyorLine">输送线实例对象</param> Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineDBName_After.cs
@@ -44,11 +44,8 @@ /// </summary> ConveyorLineBarcode, /// <summary> /// 请求反馈 /// </summary> ResponState, Reserve1, Reserve2, Reserve3, @@ -66,8 +63,11 @@ /// 报警代码 /// </summary> ConveyorLineAlarm, Reserve4, /// <summary> /// 请求反馈 /// </summary> ResponState, Reserve5, #endregion Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
@@ -47,14 +47,14 @@ [DataLength(25)] public string ConveyorLineBarcode { get; set; } public short ResponState { get; set; } public short Reserved1 { get; set; } public short Reserved2 { get; set; } public short Reserved3 { get; set; } public byte InteractiveSignal { get; set; } public short HasPallet { get; set; } //public ushort ConveyorLineAlarm { get; set; } //public short Reserved4 { get; set; } //public short Reserved5 { get; set; } public short ConveyorLineAlarm { get; set; } public short ResponState { get; set; } public short Reserved5 { get; set; } } //public class ConveyorLineTaskCommandWrite : DeviceCommand Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
@@ -36,7 +36,7 @@ LogFactory.GetLog("分容库位同步").Info(true, $"\r\r--------------------------------------"); LogFactory.GetLog("分容库位同步").Info(true, json); LogFactory.GetLog("分容库位同步").Info(true, result); return content.OK(); } catch (Exception ex) Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -533,9 +533,10 @@ //case 4: case 5: task = await CreateInToOutTaskAsync(input, stationManager); break; case 7: task = await CreateEmptyOutTaskAsync(input, stationManager); break; default: throw new Exception("位置站台类型"); throw new Exception("未知站台类型"); } return task; } @@ -575,7 +576,16 @@ { if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("错误的调取"); DtLocationInfo locationInfo = await RequestLocation(input); DtLocationInfo locationInfo = null; if (stationManager.stationType == 1 && stationManager.Roadway.Contains("FR")) { locationInfo = await RequestLocation(input, true); } else { locationInfo = await RequestLocation(input); } //DtLocationInfo locationInfo = await RequestLocation(input); if (locationInfo == null) throw new Exception("库位已满"); @@ -659,13 +669,13 @@ /// </summary> /// <param name="requestTask">请求参数</param> /// <returns></returns> private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask) private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false) { #region 获取货位 try { List<DtLocationInfo> locations; if (requestTask.Roadways.Contains("FR")) if (isCheckRequest) { locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 2 && x.Remark == "1"); } @@ -687,7 +697,7 @@ return null; } #endregion 获取货位 } } #endregion // 获取工艺申请 @@ -706,8 +716,52 @@ }; } #endregion 请求任务入库 #endregion 请求空框出库 public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager) { try { if (stationManager.stationType != 7) throw new Exception("错误的调取"); var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>() .Includes(x => x.LocationInfo) //.Includes(x=>x.StockInfoDetails) .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway) .OrderBy(x => x.CreateDate) .FirstAsync(); if (stockinfo == null) return null; var task = new Dt_Task { CurrentAddress = input.Position, Grade = 1, Roadway = input.Roadways, TargetAddress = stationManager.stationLocation, Dispatchertime = DateTime.Now, MaterialNo = "", NextAddress = input.Roadways, OrderNo = null, PalletCode = input.PalletCode, SourceAddress = stockinfo.LocationCode, TaskState = (int)TaskOutStatusEnum.OutNew, TaskType = (int)TaskOutboundTypeEnum.OutTray, TaskNum = await BaseDal.GetTaskNo(), Creater = "Systeam" }; return task; } catch (Exception ex) { throw new Exception(ex.Message); } } #region 直接出库任务完成 public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task) { WebResponseContent content = new WebResponseContent(); @@ -723,10 +777,9 @@ } catch (Exception ex) { return content.Error (ex.Message); return content.Error(ex.Message); } return content; } #endregion }
