From 71d29e20547b01047be2f5fde0734dec48bb9b86 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 19 三月 2026 22:20:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 170 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 106 insertions(+), 64 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 2fad111..0b22aa0 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"
@@ -59,6 +59,10 @@
{
return content.Error($"鐢熸垚浠诲姟澶辫触");
}
+ tasks.ForEach(x =>
+ {
+ x.Grade = 99;
+ });
stockInfos.ForEach(x =>
{
x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
@@ -391,8 +395,11 @@
taskType = outStockLockInfo.MachineName.ObjToInt() switch
{
(int)StationAreaEnum.浜屾ゼ绾歌 => TaskTypeEnum.PaperYLOutZDGL,
+ (int)StationAreaEnum.浜屾ゼ鏃犵汉甯冭 => TaskTypeEnum.OutWFBGL,
+ (int)StationAreaEnum.涓�妤兼棤绾烘穻鑶� => TaskTypeEnum.OutWFBLM,
(int)StationAreaEnum.涓�妤煎嵃鍒� => TaskTypeEnum.PrintYLOutbound,
(int)StationAreaEnum.涓�妤煎垎鍒� => TaskTypeEnum.OutFenQie,
+ (int)StationAreaEnum.涓�妤肩焊寮犳穻鑶� => TaskTypeEnum.OutPaperLM,
_ => throw new Exception($"鏈壘鍒板姞宸ヤ腑蹇冧换鍔＄被鍨嬪垎閰�")
};
Dt_Task task = new()
@@ -679,7 +686,7 @@
List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
//鐢熸垚浠诲姟銆佸簱瀛樼瓑淇℃伅
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutSGTaskDataHandle(keys);
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?,string) result = OutSGTaskDataHandle(keys);
if (result.Item2 != null && result.Item2.Count > 0)
{
stockInfos.AddRange(result.Item2);
@@ -700,6 +707,7 @@
{
tasks.AddRange(result.Item1);
}
+ content.Message = result.Item6;
//澶勭悊鍑哄簱鏁版嵁
return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos);
}
@@ -717,7 +725,7 @@
/// <param name="stockSelectViews"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutSGTaskDataHandle(int[] keys)
+ public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?,string) OutSGTaskDataHandle(int[] keys)
{
List<Dt_Task> tasks = new List<Dt_Task>();
List<Dt_OutSGOrderDetail> outSGOrderDetails = _outboundRepository.OutSGOrderDetailRepository.QueryData(x => keys.Contains(x.Id));
@@ -737,11 +745,11 @@
List<Dt_LocationInfo>? locationInfos = null;
//鍒嗛厤搴撳瓨
- (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutSGOrderDetailService.AssignStockOutbound(outSGOrderDetails);
+ (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>,string) result = _outboundService.OutSGOrderDetailService.AssignStockOutbound(outSGOrderDetails);
if (result.Item1 != null && result.Item1.Count > 0)
{
//鑾峰彇浠诲姟
- tasks = GetTasks(result.Item1, TaskTypeEnum.OldYLOutbound);
+ tasks = GetTasks(result.Item1.Where(x=> !x.LocationCode.IsNullOrEmpty()).ToList(), TaskTypeEnum.OldYLOutbound);
result.Item2.ForEach(x =>
{
if (result.Item3.FirstOrDefault(t=>t.OrderDetailId==x.Id)!=null)
@@ -751,7 +759,14 @@
});
result.Item3.ForEach(x =>
{
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ if (x.LocationCode== "鑰佸巶缂撳瓨鍖�")
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+ else
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ }
});
stockInfos = result.Item1;
@@ -764,7 +779,7 @@
throw new Exception("鏃犲簱瀛�");
}
- return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
+ return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, result.Item5);
}
/// <summary>
/// 澶勭悊鍑哄簱鏁版嵁
@@ -829,42 +844,72 @@
WebResponseContent content = new WebResponseContent();
try
{
- //鏂板
- List<BSTPickInfoDTO> bSTPickInfosAdd = bSTPickInfoDTOs.Where(x => x.Way == 1).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsAdd = null;
- //淇敼
- List<BSTPickInfoDTO> bSTPickInfosUp = bSTPickInfoDTOs.Where(x => x.Way == 2).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsUp = null;
- if (bSTPickInfosAdd != null && bSTPickInfosAdd.Count > 0)
- {
- paperMattakeDetailItemsAdd = bSTPickInfosAdd.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- if (bSTPickInfosUp != null && bSTPickInfosUp.Count > 0)
- {
- paperMattakeDetailItemsUp = bSTPickInfosUp.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- //鑾峰彇鎵�鏈夊緟棰嗘枡鐨勫嚭搴撹鎯�
- List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt());
- #region 棰嗘枡閫昏緫
- if (paperMattakeDetailItemsAdd != null && paperMattakeDetailItemsAdd.Count > 0)
- {
- foreach (var item in paperMattakeDetailItemsAdd)
- {
- //鑾峰彇瀵瑰簲鐨�
- }
- }
- if (paperMattakeDetailItemsUp != null && paperMattakeDetailItemsUp.Count > 0)
+ //鑾峰彇棰嗘枡鏉＄爜鍙婂簱瀛�
+ List<string> lockCodes = bSTPickInfoDTOs.SelectMany(x => x.PaperMattakeDetails).Select(x=>x.Barcode).Distinct().ToList();
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => lockCodes.Contains(x.PalletCode) && x.WarehouseId == WarehouseEnum.LLDOldCache.ObjToInt());
+ List<string> ExistNoCodes = lockCodes.Where(x => !stockInfos.Select(x=>x.PalletCode).Contains(x)).ToList();
+ //鑾峰彇寰呴鏂欑殑鍑哄簱璇︽儏
+ List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && lockCodes.Distinct().ToList().Contains(x.PalletCode));
+ //鍑哄簱璇︽儏鐘舵�佹洿鏂�
+ if (outStockLockInfos.Count > 0)
{
- foreach (var item in paperMattakeDetailItemsUp)
+ outStockLockInfos.ForEach(x =>
{
-
+ x.Status = OutLockStockStatusEnum.鍏抽棴.ObjToInt();
+ });
+ }
+ List<int> BSTPickDetailsId = outStockLockInfos.Select(x => x.OrderDetailId).Distinct().ToList();
+ //鑾峰彇瀵瑰簲鎺掔▼
+ List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Where(x => x.OutSGOrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt()).Includes(x => x.Details)
+ .Where(x => x.Details
+ .Any(v =>
+ BSTPickDetailsId.Contains(v.Id))
+ ).OrderBy(x => x.CreateDate).ToList();
+ List<Dt_OutSGOrderDetail> orderDetails = new List<Dt_OutSGOrderDetail>();
+ //澶勭悊鎺掔▼
+ if (outSGOrders.Count>0)
+ {
+ orderDetails = outSGOrders.SelectMany(x=>x.Details).Where(x=> BSTPickDetailsId.Contains(x.Id)).ToList();
+ orderDetails.ForEach(x =>
+ {
+ x.OutSGOrderDetailStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ });
+ foreach (var item in outSGOrders)
+ {
+ int overCount = item.Details.Where(x=>x.OutSGOrderDetailStatus==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt()).Count();
+ int thisCount = orderDetails.Where(x => x.OutSGOrderId == item.Id).Count();
+ if ((overCount + thisCount) == item.Details.Count)
+ {
+ item.OutSGOrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
}
-
+ }
+ //鑾峰彇鎵�鏈夊緟棰嗘枡鐨勫簱瀛�
+ #region 棰嗘枡閫昏緫
+ foreach (var item in stockInfos)
+ {
+ if (item.StockStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ item.StockLength = 0;
+ item.MaterielWeight = 0;
+ item.MaterielThickness = 0;
+ item.MaterielWide = 0;
+ item.StockOutLength = 0;
+ item.IsFull = WhetherEnum.True.ObjToInt();
+ item.IsPick = WhetherEnum.True.ObjToInt();
+ }
}
#endregion
+ List<Dt_OutLineView> outLineViewsDel = _outboundRepository.OutLineViewRepository.QueryData(x => stockInfos.Select(x=>x.PalletCode).Contains(x.PalletCode));
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.StockInfoRepository.UpdateData(stockInfos);
+ _outboundRepository.OutStockLockInfoRepository.UpdateData(outStockLockInfos);
+ _outboundRepository.OutSGOrderRepository.UpdateData(outSGOrders);
+ _outboundRepository.OutSGOrderDetailRepository.UpdateData(orderDetails);
+ _outboundRepository.OutLineViewRepository.DeleteData(outLineViewsDel);
+ _unitOfWorkManage.CommitTran();
+ content.OK(ExistNoCodes.Count>0 ? string.Join(",", ExistNoCodes)+"鑰佸巶鍙墸搴撳瓨涓嶅瓨鍦�" : "");
}
catch (Exception ex)
{
@@ -912,6 +957,7 @@
public WebResponseContent ReceiveOutBound(List<OutMESOrderDTO> outMESOrderDTOs)
{
WebResponseContent content = new WebResponseContent();
+ string ErrorMsg = "";
try
{
if (outMESOrderDTOs == null || outMESOrderDTOs.Count <= 0)
@@ -941,11 +987,11 @@
//鑾峰彇鎵�鏈夊姞宸ヤ腑蹇�
List<Dt_MakeCenterInfo> makeCenterInfos = _basicRepository.MakeCenterInfoRepository.QueryData();
- OutMESOrderDTO? CheckMaterialCode = outMESOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
- if (CheckMaterialCode != null)
- {
- return content.Error($"鐗╂枡缂栫爜{nameof(OutMESOrderDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}淇℃伅涓嶅瓨鍦�");
- }
+ //OutMESOrderDTO? CheckMaterialCode = outMESOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
+ //if (CheckMaterialCode != null)
+ //{
+ // return content.Error($"鐗╂枡缂栫爜{nameof(OutMESOrderDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}淇℃伅涓嶅瓨鍦�");
+ //}
OutMESOrderDTO? CheckMakeCenterCode = outMESOrderDTOs.FirstOrDefault(x => !makeCenterInfos.Select(x => x.MakeCode).Contains(x.MakeCode));
if (CheckMakeCenterCode!=null)
{
@@ -956,17 +1002,23 @@
{
return content.Error($"棰嗘枡璁″垝{nameof(OutMESOrderDTO.OutDetailId)}:{OldoutMESOrder.OutDetailId}淇℃伅宸插瓨鍦�");
}
- List<Dt_OutMESOrder> AddoutMESOrders = outMESOrderDTOs.Select(x => _mapper.Map<Dt_OutMESOrder>(x)).ToList();
- foreach (var item in AddoutMESOrders)
+ List<Dt_OutMESOrder> AddoutMESOrders = new List<Dt_OutMESOrder>();
+ foreach (var item in outMESOrderDTOs)
{
- Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
- Dt_MakeCenterInfo makeCenterInfo=makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
- item.MakeArea = makeCenterInfo.MakeArea;
- item.WarehouseId = materielInfo.WarehouseId;
- item.MaterielUnit = materielInfo.MaterielUnit;
- item.AssistUnitCode = materielInfo.AssistUnitCode;
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
+ if (materielInfo==null)
+ {
+ ErrorMsg += $"鐗╂枡缂栫爜:{item.MaterialCode}淇℃伅涓嶅瓨鍦�;";
+ continue;
+ }
+ Dt_MakeCenterInfo makeCenterInfo = makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
+ Dt_OutMESOrder outMESOrder = _mapper.Map<Dt_OutMESOrder>(item);
+ outMESOrder.MakeArea = makeCenterInfo.MakeArea;
+ outMESOrder.WarehouseId = materielInfo.WarehouseId;
+ outMESOrder.MaterielUnit = materielInfo.MaterielUnit;
+ outMESOrder.AssistUnitCode = materielInfo.AssistUnitCode;
+ AddoutMESOrders.Add(outMESOrder);
}
-
_unitOfWorkManage.BeginTran();
//鎿嶄綔鏁版嵁锛屽苟鍒嗛厤闇�姹傚簱瀛�
_outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
@@ -978,7 +1030,7 @@
List<Dt_OutStockLockInfo>? outStockLockInfos = null;
List<Dt_LocationInfo>? locationInfos = null;
{
- if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count>0)
+ if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count > 0)
{
//鍒嗛厤搴撳瓨
(List<Dt_ProStockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignProStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList());
@@ -986,15 +1038,10 @@
{
//鍒涘缓浠诲姟
tasks = GetTasks(result.Item1, result.Item3);
- result.Item2.ForEach(x =>
- {
- OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- });
result.Item3.ForEach(x =>
{
x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
});
-
stockInfos = result.Item1;
Orders = result.Item2;
outStockLockInfos = result.Item3;
@@ -1002,7 +1049,7 @@
}
}
}
- if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
+ if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count > 0)
{
BaseDal.AddData(tasks);
stockInfos.ForEach(x =>
@@ -1033,10 +1080,6 @@
{
//鍒涘缓浠诲姟
tasks = GetTasks(result.Item1, result.Item3);
- result.Item2.ForEach(x =>
- {
- OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- });
result.Item3.ForEach(x =>
{
x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
@@ -1048,7 +1091,7 @@
}
}
}
- if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
+ if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count > 0)
{
BaseDal.AddData(tasks);
stockInfos.ForEach(x =>
@@ -1064,8 +1107,7 @@
}
}
_unitOfWorkManage.CommitTran();
-
- return content.OK("鎺ユ敹鎴愬姛");
+ return content.OK(ErrorMsg.IsNullOrEmpty()? "鎺ユ敹鎴愬姛" : $"淇℃伅锛歿ErrorMsg}");
}
catch (Exception ex)
{
--
Gitblit v1.9.3