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 | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 164 insertions(+), 6 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 c937a83..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
@@ -6,6 +6,7 @@
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;
@@ -390,6 +391,11 @@
}
}
+ //if (input.area != 3)
+ //{
+ // if (input.PalletCode == null || input.PalletCode.Trim() == "")
+ // return content.Error("鎵樼洏鏉＄爜涓虹┖");
+ //}
//鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
//TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
//{
@@ -469,7 +475,11 @@
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);
// 鍒涘缓鏂颁换鍔″疄渚�
@@ -510,6 +520,8 @@
TaskType = task.TaskType,
};
content.OK(data: taskDTO);
+
+
}
else
content.Error("娣诲姞浠诲姟澶辫触");
@@ -532,7 +544,7 @@
case 1:
task = await CreateInTaskAsync(input, stationManager); break;
//case 2:
- //case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
+ case 3: //寮傚父鎺掑嚭缁橶CS澶勭悊
//case 4:
case 5:
task = await CreateInToOutTaskAsync(input, stationManager); break;
@@ -547,7 +559,80 @@
#region 鐩存帴鍑哄簱浠诲姟
private async Task<Dt_Task> CreateInToOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
{
- if (stationManager.stationType != 5) throw new Exception("閿欒鐨勮皟鍙�");
+ //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);
@@ -611,7 +696,28 @@
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0) throw new Exception(result.MOMMessage);
+ if (result.SerialNos.Count <= 0)
+ {
+ 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 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
@@ -657,8 +763,9 @@
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;
@@ -683,7 +790,7 @@
}
else
{
- locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
}
if (locations == null)
@@ -909,4 +1016,55 @@
#endregion
+ #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