From 27d6dca7a4a23da0daa9a0a8a75aab1e7436dedb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 27 八月 2025 11:22:33 +0800
Subject: [PATCH] 忽略文件
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 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 fb613e5..e9c6340 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"
@@ -284,13 +284,77 @@
return content;
}
/// <summary>
+ /// 鏃犵汉甯冨嚭搴�
+ /// </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;
+ }
+ /// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
/// <param name="materielCode">鐗╂枡浠ｇ爜</param>
/// <param name="materielWide">鐗╂枡骞呭</param>
/// <param name="Count">鍗锋暟</param>
/// <returns></returns>
- public WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count)
+ public WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count, string address = "")
{
WebResponseContent content = new WebResponseContent();
try
@@ -323,13 +387,20 @@
}
else
{
- taskTypeEnum = TaskTypeEnum.Outbound;
+ taskTypeEnum = TaskTypeEnum.PrintOutbound;
}
List<Dt_Task> tasks = GetTasks(stockInfos, taskTypeEnum);
if (tasks == null || tasks.Count <= 0)
{
return content.Error($"鐢熸垚浠诲姟澶辫触");
}
+ if (!string.IsNullOrEmpty(address))
+ {
+ tasks.ForEach(x =>
+ {
+ x.TargetAddress= address;
+ });
+ }
//鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
_unitOfWorkManage.BeginTran();
//鏇存柊搴撳瓨鐘舵��
--
Gitblit v1.9.3