From 84b36c79f37d9d3abad3bba4ff7ea99b2cc17942 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期三, 18 十二月 2024 23:19:51 +0800
Subject: [PATCH] 合并
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 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 0635fc9..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,5 +1,6 @@
锘縰sing Mapster;
using Masuit.Tools;
+using System.Text.RegularExpressions;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -154,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,
@@ -314,6 +315,13 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
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);
@@ -431,6 +439,9 @@
AreaCode = area.AreaCode,
LocationId = loation.Id,
StockInfoDetails = boxDetail,
+ ProcessCode = boxing.ProcessCode,
+ NextProcessCode = boxing.NextProcessCode,
+ Remark = boxing.BoxingInfoDetails.Count().ToString(),
};
// 澶勭悊璇锋眰鍙傛暟
@@ -791,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", // 淇鎷煎啓閿欒
@@ -799,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("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
@@ -821,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);
@@ -1163,33 +1185,6 @@
#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 鍑哄簱瑙ｇ洏
-
#region 鎸囧畾浠诲姟鍑哄簱
public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
@@ -1215,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)
//{
--
Gitblit v1.9.3