From fb745c842df36edc5101291a7f239c11c97bcc2f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 11 九月 2025 16:46:33 +0800
Subject: [PATCH] 最新代码更新，BST，MES部分
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 170 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 79 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index 3c00276..ae4290d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -87,7 +87,7 @@
try
{
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
- if (warehouse.WarehouseCode == WarehouseEnum.LLDCP.ToString()) //鎴愬搧瀹屾垚
+ if (warehouse.WarehouseCode == WarehouseEnum.LLDCP.ToString() || warehouse.WarehouseCode == WarehouseEnum.LLDFL.ToString()) //鎴愬搧瀹屾垚
{
Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
if (locationInfoStart == null)
@@ -189,7 +189,7 @@
}
return tasks;
}
- public List<Dt_Task> GetTasks(List<Dt_ProStockInfo> stockInfos, TaskTypeEnum taskType)
+ public List<Dt_Task> GetTasks(List<Dt_ProStockInfo> stockInfos, TaskTypeEnum taskType,List<Dt_LocationInfo> locationInfos)
{
List<Dt_Task> tasks = new List<Dt_Task>();
for (int i = 0; i < stockInfos.Count; i++)
@@ -198,7 +198,7 @@
if (stockInfo != null)
{
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ Dt_LocationInfo locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == stockInfo.LocationCode);
if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
{
Dt_Task task = new()
@@ -226,37 +226,48 @@
/// <summary>
/// 鎴愬搧鍑哄簱
/// </summary>
- /// <param name="Count"></param>
/// <returns></returns>
- public WebResponseContent RequestCPWMSTaskOut(int Count)
+ public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, int targetId)
{
WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_AGVStationInfo> aGVStationInfos = _agvStationInfoRepository.QueryData(x=>x.StationArea==AGVStationAreaEnum.AreaA.ObjToInt() && x.IsOccupied==WhetherEnum.False.ObjToInt());
+ List<Dt_AGVStationInfo> aGVStationInfos = _agvStationInfoRepository.QueryData(x=>x.StationArea == targetId && x.IsOccupied==WhetherEnum.False.ObjToInt());
if (aGVStationInfos.Count< Count)
{
return content.Error($"鍙敤缂撳瓨鏁颁笉瓒�");
}
- List<Dt_ProStockInfo> stockInfos = _stockRepository.ProStockInfoRepository.QueryData(x => x.ProStockAttribute == ProStockAttributeEnum.鎴愬搧.ObjToInt() && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).OrderBy(x=>x.CreateDate).Take(Count).ToList();
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
- if (stockInfos.Count < Count)
+ //鑾峰彇璐т綅
+ List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
+
+ //鑾峰彇鍙敤搴撳瓨
+ List<Dt_ProStockInfo> stockInfos = BaseDal.Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).Includes(x => x.proStockInfoDetails)
+ .Where(x => x.proStockInfoDetails
+ .Any(v =>
+ v.ProductCode == materialCode)
+ ).ToList();
+
+ if (stockInfos.Count!=Count)
{
- return content.Error($"搴撳瓨鏁伴噺涓嶈冻");
+ return content.Error($"搴撳瓨{materialCode}鏁伴噺涓嶈冻");
}
+ List<Dt_LocationInfo> AssignLocations = new List<Dt_LocationInfo>();
foreach (var item in stockInfos)
{
Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
- if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
+ if (locationInfo != null)
{
+ AssignLocations.Add(locationInfo);
item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
}
- else
- {
- return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- }
}
- List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
+ TaskTypeEnum typeEnum = targetId switch
+ {
+ (int)AGVStationAreaEnum.AreaA => TaskTypeEnum.OutProduct,
+ (int)AGVStationAreaEnum.AreaC => TaskTypeEnum.OutWFB,
+ _ => throw new Exception("鏈壘鍒板搴斾换鍔�")
+ };
+ List<Dt_Task> tasks = GetTasks(stockInfos, typeEnum, AssignLocations);
if (tasks == null || tasks.Count <= 0)
{
return content.Error($"鐢熸垚浠诲姟澶辫触");
@@ -272,9 +283,9 @@
_stockRepository.ProStockInfoRepository.UpdateData(stockInfos);
_agvStationInfoRepository.UpdateData(aGVStationInfos);
//鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
+ _basicRepository.LocationInfoRepository.UpdateLocationStatus(AssignLocations, LocationStatusEnum.Lock);
//鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(AssignLocations, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
//鏂板缓浠诲姟
BaseDal.AddData(tasks);
_unitOfWorkManage.CommitTran();
@@ -292,65 +303,65 @@
/// </summary>
/// <param name="Count"></param>
/// <returns></returns>
- public WebResponseContent RequestWFBWMSTaskOut(int Count)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_AGVStationInfo> aGVStationInfos = _agvStationInfoRepository.QueryData(x => x.StationArea == AGVStationAreaEnum.AreaC.ObjToInt() && x.IsOccupied == WhetherEnum.False.ObjToInt());
- if (aGVStationInfos.Count < Count)
- {
- return content.Error($"鍙敤缂撳瓨鏁颁笉瓒�");
- }
- List<Dt_ProStockInfo> stockInfos = _stockRepository.ProStockInfoRepository.QueryData(x => x.ProStockAttribute == ProStockAttributeEnum.杈呮枡澶囦欢.ObjToInt() && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).OrderBy(x => x.CreateDate).Take(Count).ToList();
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
- if (stockInfos.Count < Count)
- {
- return content.Error($"搴撳瓨鏁伴噺涓嶈冻");
- }
- foreach (var item in stockInfos)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
- if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- }
- else
- {
- return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- }
- }
- List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutWFB);
- if (tasks == null || tasks.Count <= 0)
- {
- return content.Error($"鐢熸垚浠诲姟澶辫触");
- }
- for (int i = 0; i < tasks.Count; i++)
- {
- aGVStationInfos[i].IsOccupied = WhetherEnum.True.ObjToInt();
- tasks[i].TargetAddress = aGVStationInfos[i].AGVStationCode;
- }
- //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
- _unitOfWorkManage.BeginTran();
- //鏇存柊搴撳瓨鐘舵��
- _stockRepository.ProStockInfoRepository.UpdateData(stockInfos);
- _agvStationInfoRepository.UpdateData(aGVStationInfos);
- //鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
- //鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
- //鏂板缓浠诲姟
- BaseDal.AddData(tasks);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- content.OK();
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
+ //public WebResponseContent RequestWFBWMSTaskOut(int Count)
+ //{
+ // WebResponseContent content = new WebResponseContent();
+ // try
+ // {
+ // List<Dt_AGVStationInfo> aGVStationInfos = _agvStationInfoRepository.QueryData(x => x.StationArea == AGVStationAreaEnum.AreaC.ObjToInt() && x.IsOccupied == WhetherEnum.False.ObjToInt());
+ // if (aGVStationInfos.Count < Count)
+ // {
+ // return content.Error($"鍙敤缂撳瓨鏁颁笉瓒�");
+ // }
+ // List<Dt_ProStockInfo> stockInfos = _stockRepository.ProStockInfoRepository.QueryData(x => x.ProStockAttribute == ProStockAttributeEnum.杈呮枡澶囦欢.ObjToInt() && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).OrderBy(x => x.CreateDate).Take(Count).ToList();
+ // List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
+ // if (stockInfos.Count < Count)
+ // {
+ // return content.Error($"搴撳瓨鏁伴噺涓嶈冻");
+ // }
+ // foreach (var item in stockInfos)
+ // {
+ // Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
+ // if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
+ // {
+ // item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ // }
+ // else
+ // {
+ // return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
+ // }
+ // }
+ // List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutWFB);
+ // if (tasks == null || tasks.Count <= 0)
+ // {
+ // return content.Error($"鐢熸垚浠诲姟澶辫触");
+ // }
+ // for (int i = 0; i < tasks.Count; i++)
+ // {
+ // aGVStationInfos[i].IsOccupied = WhetherEnum.True.ObjToInt();
+ // tasks[i].TargetAddress = aGVStationInfos[i].AGVStationCode;
+ // }
+ // //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
+ // _unitOfWorkManage.BeginTran();
+ // //鏇存柊搴撳瓨鐘舵��
+ // _stockRepository.ProStockInfoRepository.UpdateData(stockInfos);
+ // _agvStationInfoRepository.UpdateData(aGVStationInfos);
+ // //鏇存柊璐т綅鐘舵��
+ // _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
+ // //鍔犲叆璐т綅鍙樺姩璁板綍
+ // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
+ // //鏂板缓浠诲姟
+ // BaseDal.AddData(tasks);
+ // _unitOfWorkManage.CommitTran();
+ // PushTasksToWCS(tasks);
+ // content.OK();
+ // }
+ // catch (Exception ex)
+ // {
+ // content.Error(ex.Message);
+ // }
+ // return content;
+ //}
/// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
@@ -382,6 +393,7 @@
item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
}
}
+ //鍖哄垎浠诲姟
TaskTypeEnum taskTypeEnum = new();
if (stockInfos.FirstOrDefault()?.MaterielInvOrgId==MaterielInvOrgEnum.鑰佸巶.ObjToInt())
{
@@ -438,7 +450,7 @@
List<Dt_OutBSTOrderDetail> outBSTOrderDetails = new List<Dt_OutBSTOrderDetail>();
List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
-
+ //鐢熸垚浠诲姟銆佸簱瀛樼瓑淇℃伅
(List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutBSTOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
if (result.Item2 != null && result.Item2.Count > 0)
{
@@ -460,7 +472,7 @@
{
tasks.AddRange(result.Item1);
}
-
+ //澶勭悊鍑哄簱鏁版嵁
return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outBSTOrderDetails, outStockLockInfos, locationInfos);
}
catch (Exception ex)
--
Gitblit v1.9.3