From 578c0eefb1f2e945c4d22ddcd1ab5d20b9c036f6 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 10 十二月 2024 15:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 717 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 631 insertions(+), 86 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 58269a9..c4046ca 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,7 +1,14 @@
-锘縰sing log4net.Core;
+锘�
+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;
+using WIDESEA_Core.Const;
+using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
@@ -10,13 +17,14 @@
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
+using WIDESEAWCS_Model.Models;
-namespace WIDESEA_StorageOutTaskServices;
+namespace WIDESEA_StorageTaskServices;
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
- //#region 鍑哄簱浠诲姟瀹屾垚
+ #region 鍑哄簱浠诲姟瀹屾垚
//public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
@@ -145,7 +153,7 @@
// }
//}
- //#endregion 鍑哄簱浠诲姟瀹屾垚
+ #endregion 鍑哄簱浠诲姟瀹屾垚
#region 绉诲簱浠诲姟瀹屾垚
@@ -374,7 +382,7 @@
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
- TargetAddress = task.Roadway,
+ TargetAddress = task.TargetAddress,
TaskState = task.TaskState.Value,
Id = 0,
TaskType = task.TaskType,
@@ -383,6 +391,294 @@
}
}
+ //if (input.area != 3)
+ //{
+ // if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ // return content.Error("鎵樼洏鏉＄爜涓虹┖");
+ //}
+ //鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ //{
+ // Software = "WMS",
+ // TrayBarcode = input.PalletCode,
+ // //EquipmentCode = "EQ_CWJZ01"
+ // EquipmentCode = input.EquiCodeMOM
+ //};
+
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ //content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ //if (!content.Status) return content;
+
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ //if (result.SerialNos.Count <= 0)
+ // return content.Error(result.MOMMessage);
+
+ //Console.WriteLine(result);
+ //// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
+ ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
+ ////if (productions.Count <= 0)
+ //// return content.Error("鏂欐灞炴�т笉瀛樺湪");
+
+ //// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
+ //var boxing = CreateBoxingInfo(result, input.PalletCode);
+ //if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ //// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ //ProcessApplyDto process = await GetProcessApplyAsync(input, result);
+
+ //// 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ //if (process == null) return content;
+
+ //// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ //content = await _processApplyService.GetProcessApplyAsync(process);
+
+ //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ //if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ ////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
+ ////var processResponse = await GetProcessResponseAsync(process, input.Position);
+ // 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+ content = await CreateNewTask(input);
+ //if (content.Status)
+ //{
+ // var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ //}
+ }
+ catch (Exception err)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
+ content.Error(err.Message);
+ Console.WriteLine(err.Message);
+ }
+ // 杩斿洖content
+ return content;
+ }
+
+ /// <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)
+ {
+ if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ return content.Error($"銆恵stationinfo.remark}銆戞墭鐩樻潯鐮佷负绌�");
+ }
+ var task = await CreateNewTaskByStation(input, stationinfo);
+
+ // 鍒涘缓鏂颁换鍔″疄渚�
+ //var task = new Dt_Task
+ //{
+ // CurrentAddress = input.Position,
+ // Grade = 1,
+ // Roadway = input.Roadways,
+ // TargetAddress = locationInfo.LocationCode,
+ // Dispatchertime = DateTime.Now,
+ // MaterialNo = "",
+ // NextAddress = input.Roadways,
+ // OrderNo = null,
+ // PalletCode = input.PalletCode,
+ // SourceAddress = stationinfo.stationLocation,
+ // TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ // TaskType = (int)TaskInboundTypeEnum.Inbound,
+ // TaskNum = await BaseDal.GetTaskNo(),
+ // Creater = "Systeam"
+ //};
+
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ var taskId = await BaseDal.AddDataAsync(task);
+ bool isResult = taskId > 0;
+ if (isResult)
+ {
+ // 鍒涘缓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,
+ };
+ content.OK(data: taskDTO);
+
+
+ }
+ else
+ content.Error("娣诲姞浠诲姟澶辫触");
+ return content;
+ }
+
+ /// <summary>
+ /// 鏍规嵁璇锋眰鍙傛暟鍜岀珯鍙� 鍋氫笉鍚屼换鍔″鐞�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <param name="stationManager"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ private async Task<Dt_Task> CreateNewTaskByStation(RequestTaskDto input, Dt_StationManager stationManager)
+ {
+ 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;
+ default:
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
+ }
+ return task;
+ }
+
+ #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()
+ {
+ 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.SerialNos.Count <= 0)
+ {
+ ConsoleHelper.WriteErrorLine(result.MOMMessage);
+ 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 = "Systeam"
+ };
+ return taskNG;
+ }
+ }
+
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).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.OutNG,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ return taskNG;
+ }
+ }
+
+ 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 = 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;
+ }
+ #endregion
+
+
+ #region 鍏ュ簱浠诲姟
+ private async Task<Dt_Task> CreateInTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
+ {
+ if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
+
+ 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("搴撲綅宸叉弧");
+
+ if (stationManager.stationType == 1)
+ {
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
{
@@ -393,61 +689,125 @@
};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- content = await GetTrayCellStatusAsync(trayCells);
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) return 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)
- return content.Error(result.MOMMessage);
-
- Console.WriteLine(result);
- // TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
- //var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
- //if (productions.Count <= 0)
- // return content.Error("鏂欐灞炴�т笉瀛樺湪");
-
- // 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- var boxing = await CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- ProcessApplyDto process = await GetProcessApplyAsync(input, result);
-
- // 濡傛灉process涓簄ull锛屽垯杩斿洖content
- if (process == null) return content;
-
- // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- content = await _processApplyService.GetProcessApplyAsync(process);
-
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
-
- //// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
- //var processResponse = await GetProcessResponseAsync(process, input.Position);
-
- List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
- // 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, strings);
- if (content.Status)
{
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ ConsoleHelper.WriteErrorLine(result.MOMMessage);
+ 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 = "Systeam"
+ };
+ return taskNG;
}
+
+ //Console.WriteLine(result);
+ //// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
+ ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
+ ////if (productions.Count <= 0)
+ //// return content.Error("鏂欐灞炴�т笉瀛樺湪");
+
+ //// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) throw new Exception("缁勭洏澶辫触");
+
+ //// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
+ //ProcessApplyDto process = await GetProcessApplyAsync(input, result);
+
+ //// 濡傛灉process涓簄ull锛屽垯杩斿洖content
+ //if (process == null) return content;
+
+ //// 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
+ //content = await _processApplyService.GetProcessApplyAsync(process);
+
+ //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
+ //if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
+
+ ////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
+ ////var processResponse = await GetProcessResponseAsync(process, input.Position);
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ }
+
+ var task = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 1,
+ Roadway = input.Roadways,
+ TargetAddress = locationInfo.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = input.Roadways,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stationManager.stationLocation,
+ TaskState = (int)TaskInStatusEnum.Line_InFinish,
+ TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+ ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + locationInfo.LocationStatus.ToString());
+ locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
+ ConsoleHelper.WriteSuccessLine($"淇敼鍚庯細" + locationInfo.LocationStatus.ToString());
+ await UpdateLocationAsync(locationInfo);
+
+ return task;
+ }
+ #endregion
+
+ #region 搴撲綅鍒嗛厤
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="requestTask">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
+ {
+ #region 鑾峰彇璐т綅
+ 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.Distribute && 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)
{
- // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
- content.Error(err.Message);
- Console.WriteLine(err.Message);
+ Console.WriteLine(err.Message.ToString());
+ return null;
}
-
- // 杩斿洖content
- return content;
+ #endregion 鑾峰彇璐т綅
}
-
+ #endregion
// 鑾峰彇宸ヨ壓鐢宠
private async Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
@@ -457,7 +817,7 @@
{
EquipmentCode = input.EquiCodeMOM,
Software = "WMS",
- //WipOrderNo = result.BindCode,
+ //WipOrderNo = result.BindCode,"
SerialNos = content.SerialNos.Select(item => new SerialNos
{
SerialNo = item.SerialNo
@@ -465,61 +825,246 @@
};
}
- #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 = stockinfo.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();
+ try
+ {
+ //娣诲姞鍘嗗彶
+ var taskHty = CreateHistoricalTask(task);
+
+ //鍒犻櫎浠诲姟
+ BaseDal.DeleteData(task);
+
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ #endregion
-
-
- #region 浠诲姟鐘舵�佹洿鏀�
-
- /// <summary>
- /// 鏇存柊浠诲姟鐘舵��&鍑哄簱瑙ｇ洏
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="taskState"></param>
- /// <returns></returns>
- //public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
+ #region MyRegion
+ //private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
//{
- // WebResponseContent content = new WebResponseContent();
+ // _unitOfWorkManage.BeginTran();
// try
// {
- // var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
- // if (task == null)
- // return content.Error("鏈壘鍒颁换鍔�");
+ // var isUpdateStock = true;
- // if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskOutStatusEnum.SC_OutFinish)
+ // // 娣诲姞鍘嗗彶浠诲姟
+ // var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+
+ // // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
+ // var isUpdateLoc = _locationRepository.UpdateData(locationInfo);
+
+ // // 鍒犻櫎浠诲姟鏁版嵁
+ // var isTaskDelete = await Delete(taskId);
+
+ // // 鎻愪氦鎴栧洖婊氫簨鍔�
+ // if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
// {
- // var taskHty = CreateHistoricalTask(task);
- // await _unitOfWorkManage.UseTranAsync(async () =>
- // {
- // var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
- // var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- // if (asb && asbHty)
- // content.OK();
- // else
- // throw new Exception();
- // });
- // content.OK();
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ // _unitOfWorkManage.CommitTran();
+ // return true;
// }
// else
// {
- // task.TaskState = taskState;
- // var asb = await BaseDal.UpdateDataAsync(task);
- // if (asb)
- // content.OK();
- // else
- // content.Error();
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ // _unitOfWorkManage.RollbackTran();
+ // return false;
// }
// }
- // catch (Exception ex)
+ // catch (Exception err)
// {
- // content.Error(ex.Message);
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ // _unitOfWorkManage.RollbackTran();
+ // throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
// }
- // return content;
//}
+ #endregion
+
+ #region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
+
+ public WebResponseContent StockCheckingAsync()
+ {
+
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ Task.Run(async () =>
+ {
+ while (true)
+ {
+ try
+ {
+ Thread.Sleep(10000);
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
+
+ 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) // 杩囨护鏉′欢
+ .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)
+ {
+ Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�");
+ continue;
+ }
+
+ string position = string.Empty;
+ if (item.LocationInfo.RoadwayNo == "GWSC1")
+ position = "1059";
+ else
+ position = "1065";
+
+ var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound);
+ task.NextAddress = "002-000-002";
+ // 鍒涘缓浠诲姟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;
+ if (wmsBase == null || ipAddress == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + ipAddress;
+
+ var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+ var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(item.LocationInfo);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ });
+ return webResponseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message.ToString());
+ return webResponseContent.Error(ex.Message);
+ }
+ }
#endregion
- //private WebResponseContent CheckInTask()
+ #region 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
+
+ public async Task<WebResponseContent> GetFROutTrayToCW(RequestTaskDto taskDTO)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
+ var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
+
+ if (locations.Count > 10)
+ {
+ ConsoleHelper.WriteColorLine(locations.Count.ToString(), ConsoleColor.Blue);
+
+ var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+
+ var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");
+
+ if (stockInfo != null)
+ {
+ var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);
+
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO wmsTask = CreateTaskDTO(task);
+
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ location.LocationStatus = (int)LocationEnum.Distribute;
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(task);
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ await _locationRepository.UpdateDataAsync(location);
+ });
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return content.OK(data: wmsTask);
+ }
+ else
+ content.Error("甯告俯绌烘墭鐩樻暟閲忎笉瓒�");
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3