From 457b75b642a1fdaa7158e5b047cabc5d7ae16333 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期一, 10 三月 2025 10:10:13 +0800
Subject: [PATCH] 修复和优化 Dt_TaskService.cs 中的任务请求逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 973 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 731 insertions(+), 242 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 7f61b12..528d7af 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1,29 +1,18 @@
-锘�
-using log4net.Core;
-using Mapster;
-using Masuit.Tools;
-using Masuit.Tools.Models;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using SixLabors.Fonts.Tables.AdvancedTypographic;
-using System.Diagnostics;
-using WIDESEA_Common;
+锘縰sing Masuit.Tools;
+using SqlSugar;
+using WIDESEA_Common.CustomModels;
using WIDESEA_Core.Const;
-using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
-using WIDESEA_IStorageBasicRepository;
-using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
-using WIDESEA_StorageBasicRepository;
-using WIDESEA_StorageTaskRepository;
-using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob.Models;
namespace WIDESEA_StorageTaskServices;
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
#region 璇锋眰浠诲姟鍏ュ簱
+
/// <summary>
/// 璇锋眰鍏ュ簱
/// </summary>
@@ -42,23 +31,23 @@
//if (task.TaskState == (int)TaskInStatusEnum.InNew)
{
// 鍒涘缓WMS浠诲姟
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = task.TaskType,
- };
+ //WMSTaskDTO taskDTO = new WMSTaskDTO()
+ //{
+ // TaskNum = task.TaskNum.Value,
+ // Grade = 1,
+ // PalletCode = task.PalletCode,
+ // RoadWay = task.Roadway,
+ // SourceAddress = task.SourceAddress,
+ // TargetAddress = task.TargetAddress,
+ // TaskState = task.TaskState.Value,
+ // Id = 0,
+ // TaskType = task.TaskType,
+ // ProductionLine = task.ProductionLine,
+ //};
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
return content.OK(data: taskDTO);
}
}
-
-
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input);
}
@@ -73,56 +62,58 @@
}
/// <summary>
- ///
+ ///
/// </summary>
/// <param name="input">璇锋眰鍙傛暟</param>
/// <param name="flag">瀹炴绌烘鏍囪瘑</param>
/// <returns></returns>
private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input)
{
- WebResponseContent content = new WebResponseContent();
-
- //DtLocationInfo locationInfo = await RequestLocation(input);
-
- //if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
-
- var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
-
- if (stationinfo == null) throw new Exception("鏈煡绔欏彴");
-
- if (stationinfo.stationType != 7)
+ try
{
- if (input.PalletCode == null || input.PalletCode.Trim() == "")
- return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
- }
- var task = await CreateNewTaskByStation(input, stationinfo);
+ WebResponseContent content = new WebResponseContent();
- // 灏濊瘯娣诲姞鏂颁换鍔�
- if (task == null) return content.Error();
- var taskId = await BaseDal.AddDataAsync(task);
- bool isResult = taskId > 0;
- if (isResult)
- {
- // 鍒涘缓WMS浠诲姟
- WMSTaskDTO taskDTO = new WMSTaskDTO()
+ var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
+
+ if (stationinfo == null) throw new Exception("鏈煡绔欏彴");
+
+ if (stationinfo.stationType != 7)
{
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = task.TaskType,
- };
- content.OK(data: taskDTO);
+ if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
+ }
+ var task = await CreateNewTaskByStation(input, stationinfo);
-
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ if (task == null) return content.Error();
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (isResult)
+ {
+ // 鍒涘缓WMS浠诲姟
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = task.Grade.Value,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine
+ };
+ content.OK(data: taskDTO);
+ }
+ else
+ content.Error("娣诲姞浠诲姟澶辫触");
+ return content;
}
- else
- content.Error("娣诲姞浠诲姟澶辫触");
- return content;
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
/// <summary>
@@ -134,56 +125,63 @@
/// <exception cref="Exception"></exception>
private async Task<Dt_Task> CreateNewTaskByStation(RequestTaskDto input, Dt_StationManager stationManager)
{
- Dt_Task task = null;
- switch (stationManager.stationType)
+ try
{
- case 6:
- case 1:
- task = await CreateInTaskAsync(input, stationManager); break;
- //case 2:
- case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
- //case 4:
- case 5:
- task = await CreateInToOutTaskAsync(input, stationManager); break;
- case 7:
- task = await CreateEmptyOutTaskAsync(input, stationManager); break;
- case 15:
- task = await CheckAbnormalTaskAsync(input, stationManager); break;
- default:
- throw new Exception("鏈煡绔欏彴绫诲瀷");
+ Dt_Task task = null;
+ switch (stationManager.stationType)
+ {
+ case 6:
+ case 1:
+ task = await CreateInTaskAsync(input, stationManager); break;
+ //case 2:
+ case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
+ //case 4:
+ case 5:
+ task = await CreateInToOutTaskAsync(input, stationManager); break;
+ case 7:
+ task = await CreateEmptyOutTaskAsync(input, stationManager); break;
+ case 15:
+ task = await CheckAbnormalTaskAsync(input, stationManager); break;
+ default:
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
+ }
+ return task;
}
- return task;
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
#region 鐩存帴鍑哄簱浠诲姟
+
private async Task<Dt_Task> CreateInToOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
- //if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
-
-
- input.EquiCodeMOM = "24MEJQ11-1006-1";
-
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ try
{
- Software = "WMS",
- TrayBarcode = input.PalletCode,
- //EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = input.EquiCodeMOM
- };
+ //if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
- // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) throw new Exception(content.Message);
+ input.EquiCodeMOM = "24MEJQ11-1006-1";
- // 娣诲姞缁勭洏淇℃伅
- // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
- {
- ConsoleHelper.WriteErrorLine(result.MOMMessage);
- if (stationManager.stationType != 3)
+ // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = "WMS",
+ TrayBarcode = input.PalletCode,
+ //EquipmentCode = "EQ_CWJZ01"
+ EquipmentCode = input.EquiCodeMOM
+ };
+
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) throw new Exception(content.Message);
+
+ // 缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
+ if (!result.Success)
{
var taskNG = new Dt_Task
{
@@ -200,69 +198,115 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
- else
- {
- return null;
- }
- }
- // 澶勭悊寮傚父鐢佃姱鎯呭喌
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
- if (serialNosError.Count > 0)
- {
- if (stationManager.stationType != 3)
+ if (result.SerialNos.Count <= 0)
{
- var taskNG = new Dt_Task
+ ConsoleHelper.WriteErrorLine(result.MOMMessage);
+ if (stationManager.stationType != 3)
{
- CurrentAddress = input.Position,
- Grade = 1,
- Roadway = input.Roadways,
- TargetAddress = stationManager.stationNGLocation,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = stationManager.stationNGChildCode,
- OrderNo = null,
- PalletCode = input.PalletCode,
- SourceAddress = stationManager.stationLocation,
- TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.OutNG,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
- };
- return taskNG;
+ var taskNG = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 3,
+ Roadway = input.Roadways,
+ TargetAddress = stationManager.stationNGLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = stationManager.stationNGChildCode,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "System"
+ };
+ return taskNG;
+ }
+ else
+ {
+ //鏃犵數鑺� 鈫� 褰撶┖妗嗭紵 杩樻槸杩斿洖寮傚父锛�
+ return null;
+ }
}
+
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ if (serialNosError.Count > 0)
+ {
+ if (stationManager.stationType != 3)
+ {
+ var taskNG = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 1,
+ Roadway = input.Roadways,
+ TargetAddress = stationManager.stationNGLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = stationManager.stationNGChildCode,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
+ };
+ return taskNG;
+ }
+ else
+ {
+ Console.WriteLine($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}");
+ return null;
+ }
+ }
+ //else
+ //{
+ // throw new Exception($"绔欏彴{stationManager.stationChildCode}MOM杩斿洖鐢佃姱寮傚父:{result.MOMMessage}");
+ //}
+
+ var targetStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == stationManager.stationPLC && x.Roadway == stationManager.Roadway && x.stationType == 2);
+
+ var task = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 3,
+ Roadway = input.Roadways,
+ TargetAddress = targetStation.stationLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = input.Roadways,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
+ };
+ return task;
}
-
- var targetStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == stationManager.stationPLC && x.Roadway == stationManager.Roadway && x.stationType == 2);
-
- var task = new Dt_Task
+ catch (Exception ex)
{
- CurrentAddress = input.Position,
- Grade = 1,
- Roadway = input.Roadways,
- TargetAddress = targetStation.stationLocation,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = input.Roadways,
- OrderNo = null,
- PalletCode = input.PalletCode,
- SourceAddress = stationManager.stationLocation,
- TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.InToOut,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
- };
-
- return task;
+ throw new Exception(ex.Message);
+ }
}
- #endregion
+ #endregion 鐩存帴鍑哄簱浠诲姟
#region 鍏ュ簱浠诲姟
+
private async Task<Dt_Task> CreateInTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
@@ -280,25 +324,33 @@
if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
+ // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = "WMS",
+ TrayBarcode = input.PalletCode,
+ //EquipmentCode = "EQ_CWJZ01"
+ EquipmentCode = input.EquiCodeMOM
+ };
+
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) throw new Exception(content.Message);
+
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
+ if (stationManager.stationType == 6 && result.ProductionLine.IsNullOrEmpty())
+ {
+ ConsoleHelper.WriteErrorLine($"褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
+ throw new Exception("褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
+ }
+
if (stationManager.stationType == 1)
{
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- {
- Software = "WMS",
- TrayBarcode = input.PalletCode,
- //EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = input.EquiCodeMOM
- };
+ #region
- // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) throw new Exception(content.Message);
-
- // 娣诲姞缁勭洏淇℃伅
- // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
if (result.SerialNos.Count <= 0)
{
ConsoleHelper.WriteErrorLine(result.MOMMessage);
@@ -317,7 +369,9 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -347,6 +401,7 @@
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ #endregion 鍏ュ簱浠诲姟
}
var task = new Dt_Task
@@ -364,27 +419,35 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
- ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
+ int lastStatus = locationInfo.LocationStatus;
+ ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
await UpdateLocationAsync(locationInfo);
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+
return task;
}
- #endregion
+
+ #endregion 璇锋眰浠诲姟鍏ュ簱
#region 搴撲綅鍒嗛厤
+
+ #region 鑾峰彇璐т綅
+
/// <summary>
- ///
+ ///
/// </summary>
/// <param name="requestTask">璇锋眰鍙傛暟</param>
/// <param name="isCheckRequest">鏄惁鏈娴嬪簱浣嶇被鍨�</param>
/// <returns></returns>
private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
{
- #region 鑾峰彇璐т綅
try
{
List<DtLocationInfo> locations;
@@ -395,6 +458,10 @@
else
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ if (locations == null)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ }
}
if (locations == null)
@@ -409,15 +476,49 @@
Console.WriteLine(err.Message.ToString());
return null;
}
- #endregion 鑾峰彇璐т綅
}
- #endregion
+
+ #endregion 鑾峰彇璐т綅
+
+ #region 寮傚父鍙ｅ叆搴撹幏鍙栧簱浣�
+
+ private async Task<DtLocationInfo> RequestLocationByAbnormal(RequestTaskDto requestTask, bool isCheckRequest = false)
+ {
+ try
+ {
+ List<DtLocationInfo> locations;
+ 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");
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ }
+
+ if (locations == null)
+ {
+ return null;
+ }
+
+ return locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ }
+ catch (Exception err)
+ {
+ Console.WriteLine(err.Message.ToString());
+ return null;
+ }
+ }
+
+ #endregion 寮傚父鍙ｅ叆搴撹幏鍙栧簱浣�
+
+ #endregion 搴撲綅鍒嗛厤
// 鑾峰彇宸ヨ壓鐢宠
- private async Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
+ private Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
{
// 鍒涘缓涓�涓狿rocessApplyDto瀵硅薄锛屽苟璧嬪��
- return new ProcessApplyDto()
+ return Task.FromResult(new ProcessApplyDto()
{
EquipmentCode = input.EquiCodeMOM,
Software = "WMS",
@@ -426,31 +527,34 @@
{
SerialNo = item.SerialNo
}).ToList()
- };
+ });
}
- #endregion 璇锋眰绌烘鍑哄簱
+ #endregion 璇锋眰浠诲姟鍏ュ簱
#region 鍒涘缓绌烘鍑哄簱浠诲姟
+
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();
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ var stockinfo1 = stockInfoList.OrderBy(x => x.CreateDate)
+ .ToList();
+ var stockinfo = stockinfo1.Where(x => x.LocationInfo != null && !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ .FirstOrDefault();
if (stockinfo == null) return null;
var task = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 2,
Roadway = input.Roadways,
TargetAddress = stationManager.stationLocation,
Dispatchertime = DateTime.Now,
@@ -462,20 +566,22 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.OutTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = stockinfo.ProductionLine,
};
-
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { task.PalletCode });
return task;
}
catch (Exception ex)
{
-
throw new Exception(ex.Message);
}
}
+
#endregion
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
+
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
@@ -483,7 +589,8 @@
{
//娣诲姞鍘嗗彶
var taskHty = CreateHistoricalTask(task);
-
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
//鍒犻櫎浠诲姟
BaseDal.DeleteData(task);
@@ -494,13 +601,24 @@
return content.Error(ex.Message);
}
}
+
#endregion
#region 寮傚父鍙ｄ换鍔℃娴�
+
+ /// <summary>
+ /// 寮傚父鎺掑嚭鍙ｅ叆搴撴牎楠� 鎵�鏈夊紓甯镐氦缁橶CS鍋氬師鍦板潃NG澶勭悊
+ /// </summary>
+ /// <param name="input"></param>
+ /// <param name="stationManager"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
public async Task<Dt_Task> CheckAbnormalTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
try
{
+ if (stationManager.stationType == 15) throw new Exception("");
+
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
@@ -513,32 +631,41 @@
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) throw new Exception(content.Message);
+ if (!content.Status) //鑾峰彇鏁寸洏鐢佃姱鏁版嵁锛� 濡傚紓甯� 浣跨敤绌烘绫诲瀷鍏ュ簱
+ {
+ ConsoleHelper.WriteErrorLine(content.Message);
+ throw new Exception("MOM鏁寸洏鐢佃姱灞炴�ц幏鍙栧紓甯�");
+ }
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
+ if (result.SerialNos.Count <= 0) //濡傝皟鐢ㄦ垚鍔� 浣嗙數鑺负0鍒欏畾涓虹┖鐩�
{
- ConsoleHelper.WriteErrorLine(result.MOMMessage);
- var taskNG = new Dt_Task
+ DtLocationInfo EmptylocationInfo = await RequestLocationByAbnormal(input);
+
+ if (EmptylocationInfo == null) throw new Exception("搴撲綅宸叉弧");
+
+ var Epmtytask = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 4, //浼樺厛澶勭悊寮傚父鎺掑嚭鍙ｇ殑浠诲姟 闃叉姝ｅ父闇�鎺掑嚭寮傚父鍙ｇ殑浠诲姟鍫电嚎
Roadway = input.Roadways,
- TargetAddress = stationManager.stationNGLocation,
+ TargetAddress = EmptylocationInfo.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = stationManager.stationNGChildCode,
+ NextAddress = input.Roadways,
OrderNo = null,
PalletCode = input.PalletCode,
SourceAddress = stationManager.stationLocation,
TaskState = (int)TaskInStatusEnum.Line_InFinish,
- TaskType = (int)TaskOutboundTypeEnum.InToOut,
+ TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
- return taskNG;
+ return Epmtytask;
}
//Console.WriteLine(result);
@@ -551,51 +678,79 @@
var boxing = CreateBoxingInfo(result, input.PalletCode);
if (boxing == null) throw new Exception("缁勭洏澶辫触");
- //// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- //ProcessApplyDto process = await GetProcessApplyAsync(input, result);
+ if (!stationManager.Roadway.Contains("FR")) //闈炲垎瀹瑰簱鍖� 鍏ュ簱楠岃瘉宸ヨ壓璺嚎
+ {
+ // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ ProcessApplyDto process = await GetProcessApplyAsync(input, result);
- //// 濡傛灉process涓簄ull锛屽垯杩斿洖content
- //if (process == null) return content;
+ // 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ if (process == null) throw new Exception("宸ヨ壓璇锋眰鍙傛暟寮傚父");
- //// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- //content = await _processApplyService.GetProcessApplyAsync(process);
+ // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ content = await _processApplyService.GetProcessApplyAsync(process);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- //if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
-
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ if (!content.Status) throw new Exception("宸ヨ壓鐢宠澶辫触");
+ }
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+
+ DtLocationInfo locationInfo = null;
+ if (stationManager.Roadway.Contains("FR"))
+ {
+ locationInfo = await RequestLocation(input, true);
+ }
+ else
+ {
+ locationInfo = await RequestLocationByAbnormal(input);
+ }
+ //DtLocationInfo locationInfo = await RequestLocation(input);
+
+ if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
var task = new Dt_Task
{
CurrentAddress = input.Position,
- Grade = 1,
+ Grade = 3, //浼樺厛澶勭悊寮傚父鎺掑嚭鍙ｇ殑浠诲姟 闃叉姝ｅ父闇�鎺掑嚭寮傚父鍙ｇ殑浠诲姟鍫电嚎
Roadway = input.Roadways,
- TargetAddress = stationManager.stationLocation,
+ TargetAddress = locationInfo.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = input.Roadways,
OrderNo = null,
- //PalletCode = stockinfo.PalletCode,
- //SourceAddress = stockinfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
+
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+
+ int lastStatus = locationInfo.LocationStatus;
+
+ ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
+ locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
+ ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
+ await UpdateLocationAsync(locationInfo);
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
return task;
}
catch (Exception ex)
{
-
throw new Exception(ex.Message);
}
}
+
#endregion
#region 绉诲簱浠诲姟浜嬪姟
+
private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo fromLocation, DtLocationInfo toLocation, int taskId)
{
_unitOfWorkManage.BeginTran();
@@ -634,12 +789,13 @@
throw new Exception(err.Message); // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
}
}
- #endregion
+
+ #endregion MyRegion
#region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
+
public WebResponseContent StockCheckingAsync()
{
-
WebResponseContent webResponseContent = new WebResponseContent();
try
{
@@ -649,21 +805,27 @@
{
try
{
- Thread.Sleep(10000);
+ Thread.Sleep(TimeSpan.FromMinutes(10));
+
var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
+ var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("GWSC"))
+ .ToList();
+ var deviceCode = devices.Select(x => x.DeviceCode).ToList();
var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
.Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
.Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
.Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
.OrderBy(x => x.OutboundTime) // 鎺掑簭
.ToListAsync(); // 鑾峰彇绗竴涓厓绱�
if (stockInfo.Count <= 0) continue;
foreach (var item in stockInfo)
{
-
var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode);
if (hasTask != null)
{
@@ -682,7 +844,6 @@
// 鍒涘缓浠诲姟DTO
WMSTaskDTO taskDTO = CreateTaskDTO(task);
-
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
@@ -696,10 +857,13 @@
var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
if (content.Status)
{
+ int lastStatus = item.LocationInfo.LocationStatus;
await BaseDal.AddDataAsync(task);
// 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
await _locationRepository.UpdateDataAsync(item.LocationInfo);
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(item.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
}
}
}
@@ -718,15 +882,39 @@
}
}
- #endregion
+ #endregion 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
#region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTrackerToCW = new();
+
public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)
{
WebResponseContent content = new WebResponseContent();
try
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
+ //string requestKey = JsonConvert.SerializeObject(taskDTO);
+ //// 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ //if (requestTrackerToCW.TryGetValue(requestKey, out var requestInfo))
+ //{
+ // if (requestInfo.Count > 5 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(2))
+ // {
+ // // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ // throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ // }
+ //}
+
+ //// 鏇存柊璇锋眰璺熻釜淇℃伅
+ //if (requestTrackerToCW.ContainsKey(requestKey))
+ //{
+ // requestTrackerToCW[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ //}
+ //else
+ //{
+ // requestTrackerToCW[requestKey] = (1, DateTime.Now);
+ //}
+
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position && x.stationStatus == "1");
var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
if (locations.Count > 10)
@@ -735,7 +923,7 @@
var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");
+ var stockInfo = await QueryStockInfoForEmptyTrayFRAsync("CWSC1", "10086", taskDTO.ProductionLine);
if (stockInfo != null)
{
@@ -745,6 +933,7 @@
WMSTaskDTO wmsTask = CreateTaskDTO(task);
// 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ int lastStatus = location.LocationStatus;
stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
location.LocationStatus = (int)LocationEnum.Distribute;
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -754,7 +943,11 @@
await _locationRepository.UpdateDataAsync(location);
});
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
+
// 杩斿洖鎴愬姛鍝嶅簲
+ //requestTrackerToCW.Remove(requestKey);
+
return content.OK(data: wmsTask);
}
else
@@ -768,27 +961,101 @@
return content;
}
+ /// <summary>
+ /// 鏌ヨ绌虹洏搴撳瓨淇℃伅
+ /// </summary>
+ private async Task<DtStockInfo> QueryStockInfoForEmptyTrayFRAsync(string areaCode, string position, string productLine)
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+
+ ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
+ var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
+
+ ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
+ var stackers = station.Roadway.Split(',').ToList();
+
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => stackers.Contains(x.DeviceCode))
+ .ToList().Select(x => x.DeviceCode).ToList();
+
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+
+ var result1 = stockInfoList.Where(x => x.ProductionLine == productLine)
+ .Where(x => x.AreaCode == areaCode && x.IsFull == false)
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .ToList(); // 杞崲涓哄垪琛�
+
+ var result = result1.Where(x => x.StockInfoDetails != null && x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
+ .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .FirstOrDefault(); // 鑾峰彇绗竴涓厓绱�
+
+ if (result != null)
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
+ else
+ ConsoleHelper.WriteColorLine($"甯告俯{productLine}绌烘墭鐩樺簱瀛樹笉瓒�", ConsoleColor.Red);
+
+ return result;
+ }
+
#endregion
+ #region 甯告俯3鍑哄簱鑷冲寘瑁�
+
+ // 鐢ㄤ簬杩借釜姣忎釜璇锋眰鐨勮皟鐢ㄦ鏁板拰鏈�鍚庤姹傛椂闂淬��
+ private static readonly Dictionary<string, (int Count, DateTime LastRequestTime)> requestTracker = new();
+
+ /// <summary>
+ /// 甯告俯3鍑哄簱鑷冲寘瑁�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> RequestOutTaskToBZAsync(RequestTaskDto json)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position);
+ Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
+ if (station == null) { throw new Exception($"鏈壘鍒板寘瑁呯珯鍙颁俊鎭紝璇锋鏌ヤ紶鍏ュ弬鏁皗json.Position}"); }
- DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == "ZJ-7");
- if (stockInfo == null) throw new Exception("搴撳唴鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("CWSC")) // 杩囨护鏉′欢
+ .ToList().Select(x => x.DeviceCode).ToList();
- Dt_StationManager OutStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1016" && x.stationType == 10);
+ // 浠庣紦瀛樹腑鑾峰彇搴撳瓨淇℃伅
+ IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
+ List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
+ // 淇敼鍚庣殑鏌ヨ浠ｇ爜
+ var stockInfo1 = stockInfoList
+ .Where(x => x.ProductionLine == station.productLine)
+ .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true)
+ .OrderBy(x => x.OutboundTime)
+ .ToList();
+
+ var stockInfo = stockInfo1
+ // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)
+ // 澧炲姞瀵� LocationInfo 鐨勭┖鍊兼鏌�
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => x.LocationInfo != null && deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .FirstOrDefault();
+
+ if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�");
+
+ DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);
+
+ Dt_StationManager OutStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1016" && x.stationType == 10 && x.Roadway == locationInfo.RoadwayNo && x.stationStatus == "1");
// 鍒涘缓鏂颁换鍔″疄渚�
var task = new Dt_Task
{
- CurrentAddress = stockInfo.LocationInfo.RoadwayNo,
+ CurrentAddress = stockInfo.LocationCode,
Grade = 1,
- Roadway = stockInfo.LocationInfo.RoadwayNo,
+ Roadway = locationInfo.RoadwayNo,
TargetAddress = json.Position,
Dispatchertime = DateTime.Now,
MaterialNo = "",
@@ -799,17 +1066,239 @@
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam"
+ Creater = "System",
+ ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
WMSTaskDTO taskDTO = CreateTaskDTO(task);
+ int lastStatus = locationInfo.LocationStatus;
+
+ BaseDal.AddData(task);
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ _locationRepository.UpdateData(stockInfo.LocationInfo);
+
+ _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { taskDTO.PalletCode });
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(stockInfo.LocationInfo, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
return content.OK(data: taskDTO);
}
catch (Exception ex)
{
+ Console.WriteLine($"CW3鑷冲寘瑁呭嚭搴撳紓甯�:{ex.ToString()}");
return content.Error($"澶辫触锛歿ex.Message}");
}
}
-}
\ No newline at end of file
+
+ #endregion
+
+ #region 鐏鍑哄簱
+
+ public WebResponseContent EmergencyTask(object obj)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var emergencyTask = new DTSEmergencyTask();
+ try
+ {
+ emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString());
+
+ if (emergencyTask == null) throw new Exception("鐏鍙傛暟涓虹┖");
+
+ DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == emergencyTask.row && x.Column == emergencyTask.column && x.Layer == emergencyTask.layer && x.AreaId == emergencyTask.zone);
+ if (locationInfo == null)
+ {
+ throw new Exception("鏈煡搴撲綅");
+ }
+
+ //鏌ユ壘娑堥槻绔欏彴
+ var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo
+ && t.stationType == (int)StationManager.FireStation
+ /*&& t. == "Enable"*/);
+ if (station == null)
+ {
+ throw new Exception("娑堥槻绔欏彴鏈厤缃�!");
+ }
+
+ //鏌ユ壘搴撳瓨淇℃伅
+ var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo);
+ //鎵樼洏鐮�
+ string barcode = string.Empty;
+ if (stockInfo != null)
+ {
+ barcode = stockInfo.PalletCode;
+ }
+ else
+ {
+ //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮�
+ barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000);
+ }
+
+ Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == 500 && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway);
+
+ if (fireTask != null)
+ {
+ throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
+ }
+
+ int taskNum = BaseDal.GetTaskNo().Result;
+ Dt_Task task = new Dt_Task
+ {
+ CreateDate = DateTime.Now,
+ Creater = "DTS",
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = 1,
+ Dispatchertime = DateTime.Now,
+ PalletCode = barcode,
+ Roadway = station.Roadway,
+ SourceAddress = locationInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = 500,
+ TargetAddress = station.stationLocation,
+ NextAddress = station.stationChildCode,
+ TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
+ TaskId = 0,
+ };
+
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = 500,
+ };
+
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue;
+ if (ReceiveByWMSTask == null || ipAddress == null)
+ {
+ throw new Exception("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
+
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));
+ if (respon != null)
+ {
+ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
+ if (respone.Status)
+ {
+ var taskId = BaseDal.AddData(task);
+ }
+ else
+ {
+ throw new Exception("WCS澶勭悊澶辫触:" + respone.Message);
+ }
+ }
+ else
+ {
+ throw new Exception("璇锋眰澶勭悊澶辫触");
+ }
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, obj.ToJsonString());
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, ex.Message);
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
+ #region 鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱
+
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutAsync(RequestTaskDto request)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == request.PalletCode);
+ if (!task.IsNullOrEmpty())
+ {
+ var fromStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == request.Position);
+ var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 7 && x.productLine == fromStation.productLine && x.stationArea == fromStation.stationArea);
+ if (!toStation.IsNullOrEmpty())
+ {
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
+ task.TargetAddress = toStation.stationLocation;
+ task.NextAddress = toStation.stationChildCode;
+ task.Grade = 3;
+ task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+
+ location.LocationStatus = (int)LocationEnum.Free;
+
+ await _locationRepository.UpdateDataAsync(location);
+ await BaseDal.UpdateDataAsync(task);
+ return content.OK("鎴愬姛");
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒板搴旂珯鍙�");
+ content.Error("鏈壘鍒板搴旂珯鍙�");
+ }
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒颁换鍔�");
+ content.Error("鏈壘鍒颁换鍔�");
+ }
+ return content;
+ }
+
+ #endregion
+
+ #region 鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱
+
+ /// <summary>
+ /// 鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutOneAsync(RequestTaskDto request)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == request.PalletCode);
+ if (!task.IsNullOrEmpty())
+ {
+ var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == request.Position);
+ var fromStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == toStation.productLine && x.stationArea == toStation.stationArea);
+ if (!fromStation.IsNullOrEmpty())
+ {
+ //var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
+ task.SourceAddress = toStation.stationLocation;
+ task.CurrentAddress = toStation.stationChildCode;
+ task.Grade = 3;
+ task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+
+ //location.LocationStatus = (int)LocationEnum.Free;
+
+ //await _locationRepository.UpdateDataAsync(location);
+ await BaseDal.UpdateDataAsync(task);
+ return content.OK("鎴愬姛");
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒板搴旂珯鍙�");
+ content.Error("鏈壘鍒板搴旂珯鍙�");
+ }
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine("鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱:鏈壘鍒颁换鍔�");
+ content.Error("鏈壘鍒颁换鍔�");
+ }
+ return content;
+ }
+
+ #endregion
+}
\ No newline at end of file
--
Gitblit v1.9.3