From 9e9bbd003a79f25ead9ca990d2897ab6a2ed824a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期三, 18 十二月 2024 23:09:47 +0800
Subject: [PATCH] 更新
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 120 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index f726190..ffd4a8a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1,20 +1,12 @@
-锘�
-using AngleSharp.Io;
-using log4net.Core;
-using Mapster;
+锘縰sing Mapster;
using Masuit.Tools;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using SixLabors.Fonts.Tables.AdvancedTypographic;
+using System.Text.RegularExpressions;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
-using WIDESEA_Model.Models;
-using WIDESEA_Services;
-using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_BasicInfoRepository;
-using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
@@ -75,7 +67,6 @@
#region 澶栭儴鎺ュ彛鏂规硶
#region 鍑哄簱浠诲姟瀹屾垚
-
public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
{
@@ -164,13 +155,13 @@
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
- SerialNoResult = isNG,
+ SerialNoResult = true, //isNG,
ParameterInfo = new List<ParameterInfoOutput> {
new ParameterInfoOutput() {
Value = outHours.ToString(),
ParameterCode =parameterInfo.ParameterCode,
ParameterDesc = parameterInfo.Description,
- ParameterResult = isNG.ToString(),
+ ParameterResult = "OK", //isNG.ToString(),
TargetValue = parameterInfo.TargetValue,
LowerLomit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
@@ -184,7 +175,6 @@
private void ValidateResponse(WebResponseContent content)
{
-
}
private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
@@ -304,7 +294,6 @@
// 鎵ц鏁版嵁搴撲簨鍔�
await _unitOfWorkManage.UseTranAsync(async () =>
{
-
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;
@@ -326,9 +315,15 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
+ if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ {
+ await _locationRepository.UpdateDataAsync(locationInf);
+ await _task_HtyRepository.AddDataAsync(taskHty);
+ await BaseDal.DeleteDataAsync(task);
+ return content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
+ }
// 鏍规嵁鏄惁鏈夌粍鐩樹俊鎭垱寤哄簱瀛樺疄渚嬫ā鍨�
DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);
-
// 鎵ц鏁版嵁搴撲簨鍔�
bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
@@ -432,7 +427,6 @@
throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
}
-
var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
var stock = new DtStockInfo()
@@ -445,6 +439,9 @@
AreaCode = area.AreaCode,
LocationId = loation.Id,
StockInfoDetails = boxDetail,
+ ProcessCode = boxing.ProcessCode,
+ NextProcessCode = boxing.NextProcessCode,
+ Remark = boxing.BoxingInfoDetails.Count().ToString(),
};
// 澶勭悊璇锋眰鍙傛暟
@@ -528,6 +525,7 @@
case (int)TaskRelocationTypeEnum.Relocation:
return await CompleteTransferTaskAsync(task, stock);
+
default:
return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
}
@@ -538,6 +536,7 @@
#region 璇锋眰浠诲姟鍏ュ簱
#region
+
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
/// </summary>
@@ -572,7 +571,6 @@
return content.OK(data: taskDTO);
}
}
-
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
if (stock != null)
@@ -725,18 +723,23 @@
case "CH01":
areaIn = "CH001";
break;
+
case "JZ01":
areaIn = "JZ001";
break;
+
case "GW01":
areaIn = "GWSC1";
break;
+
case "CW01":
areaIn = "CWSC1";
break;
+
case "CW02":
areaIn = "CWSC2";
break;
+
default:
break;
}
@@ -768,7 +771,7 @@
return content;
}
- #endregion
+ #endregion 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
@@ -799,7 +802,7 @@
PalletCode = stock.PalletCode,
SourceAddress = input.Position,
CurrentAddress = input.Position,
- TaskState = (int)TaskInStatusEnum.InNew,
+ TaskState = stock.LocationInfo.RoadwayNo.Contains("CH") ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InQuality,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System", // 淇鎷煎啓閿欒
@@ -807,12 +810,15 @@
TaskId = 0,
};
- var taskDTO = CreateTaskDTO(task);
+ var taskDTO = CreateTaskDTO(taskNew);
+ BaseDal.AddData(taskNew);
+ return content.OK(data: taskDTO);
// TODO璐ㄦ鍥炲簱
}
// 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
- var area = await QueryAreaInfoByPosition(input.Position.Replace("-1", ""));
+ var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
+ var area = await QueryAreaInfoByPosition(areaCode);
if (area == null)
{
return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -829,7 +835,15 @@
if (result.SerialNos.Count <= 0)
{
// 绌烘墭鐩樺叆搴撻�昏緫
- return await RequestTrayInTaskAsync(input);
+ var staion = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position && x.stationType == 1 && x.remark == "IN");
+ if (staion != null)
+ {
+ return await HandleErrorCells(input, area);
+ }
+ else
+ {
+ return await RequestTrayInTaskAsync(input);
+ }
}
else
return content.Error(result.MOMMessage);
@@ -841,7 +855,6 @@
{
return await HandleErrorCells(input, area, serialNosError);
}
-
var boxing = CreateBoxingInfo(result, input.PalletCode);
if (boxing == null) return content.Error("缁勭洏澶辫触");
@@ -857,6 +870,7 @@
return content;
}
+
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -872,11 +886,9 @@
return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
return content = await UpdateExistingTask(input, task);
-
}
catch (Exception err)
{
-
throw;
}
}
@@ -891,7 +903,6 @@
WebResponseContent content = new WebResponseContent();
try
{
-
// 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
@@ -912,7 +923,6 @@
return content.OK(data: task);
}
-
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
{
@@ -927,7 +937,6 @@
}
catch (Exception)
{
-
throw;
}
}
@@ -972,7 +981,7 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 澶栭儴鎺ュ彛鏂规硶
#region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -1124,7 +1133,7 @@
};
}
- #endregion 璇锋眰鍑哄簱
+ #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 浠诲姟鐘舵�佹洿鏀�
@@ -1174,34 +1183,7 @@
return content;
}
- #endregion
-
- #region 鍑哄簱瑙ｇ洏
-
- /// <summary>
- /// 鍑哄簱瑙ｇ洏鎺ュ彛
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
- if (task == null)
- return content.Error("鏈壘鍒颁换鍔�");
- task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
- var taskHty = CreateHistoricalTask(task);
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- #endregion
+ #endregion 浠诲姟鐘舵�佹洿鏀�
#region 鎸囧畾浠诲姟鍑哄簱
@@ -1228,8 +1210,19 @@
taskType = (int)TaskOutboundTypeEnum.OutQuality;
else
taskType = (int)TaskOutboundTypeEnum.OutTray;
- // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
- task = CreateTask(stockInfo, "1020-1", taskType);
+
+ if (stockInfo.AreaCode.Contains("CH"))
+ {
+ // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
+ task = CreateTask(stockInfo, "1020-1", taskType);
+ }
+ else
+ {
+ if (stockInfo.LocationInfo.RoadwayNo == "JZSC1")
+ {
+ task = CreateTask(stockInfo, "1359-4", taskType);
+ }
+ }
//var taskId = await BaseDal.AddDataAsync(task);
//if (taskId <= 0)
//{
@@ -1267,6 +1260,7 @@
return content;
}
+
private string GetWCSIpReceiveTask()
{
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -1279,7 +1273,7 @@
return wmsBase + ipAddress;
}
- #endregion
+ #endregion 鎸囧畾浠诲姟鍑哄簱
#endregion 澶栭儴鎺ュ彛鏂规硶
@@ -1500,7 +1494,6 @@
.Include(x => x.BoxingInfoDetails)
.ExecuteCommandAsync();
}
-
}
var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
@@ -1612,7 +1605,6 @@
_unitOfWorkManage.CommitTran();
return content.OK(data: task);
}
-
}
catch (Exception ex)
{
--
Gitblit v1.9.3