From bcde5ea70330cb16597c2320b94b5f1d7cb15752 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 15 二月 2025 15:32:16 +0800
Subject: [PATCH] 优化页面
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 48f30ad..a86d379 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,4 +1,5 @@
锘縰sing Masuit.Tools;
+using WIDESEA_Common;
using WIDESEA_Common.CustomModels;
//using WIDESEA_Common.CustomModels;
@@ -200,7 +201,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -258,7 +260,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -291,7 +294,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return task;
}
@@ -368,7 +372,8 @@
TaskType = (int)TaskOutboundTypeEnum.InToOut,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = result.ProductionLine
+ ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return taskNG;
}
@@ -418,6 +423,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
int lastStatus = locationInfo.LocationStatus;
ConsoleHelper.WriteSuccessLine($"淇敼鍓嶏細" + lastStatus.ToString());
@@ -653,6 +659,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
return Epmtytask;
}
@@ -714,6 +721,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = result.ProductionLine,
+ ProcessCode = result.ProcessCode,
};
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -872,7 +880,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
+ 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)
@@ -1002,6 +1010,7 @@
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
WMSTaskDTO taskDTO = CreateTaskDTO(task);
@@ -1145,4 +1154,44 @@
}
#endregion
+
+ #region 鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutAsync(RequestTaskDto request)
+ {
+ WebResponseContent content = new WebResponseContent();
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == request.PalletCode && x.CurrentAddress == request.Position);
+ 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
}
\ No newline at end of file
--
Gitblit v1.9.3