From 7803a1f8d35c9b80ae07f14c60f871a74a5aebd6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 31 三月 2026 15:28:00 +0800
Subject: [PATCH] 更新领料判断
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 c5ad0d1..2128eda 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"
@@ -223,7 +223,7 @@
}
if (outStockLockInfosMES != null && outStockLockInfosMES.Count() > 0)
{
- Dt_AGVStationInfo aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==task.TargetAddress);
+ Dt_AGVStationInfo aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==task.TargetAddress || x.MESPointCode == task.TargetAddress);
MESDeliveryModel mESDeliveryModel = MESDeliveryUp(outStockLockInfosMES, aGVStationInfo.MESPointCode);
MESResponse response = _invokeMESService.MESDelivery(mESDeliveryModel).DeserializeObject<MESResponse>() ?? throw new Exception("鏈幏鍙栧埌杩斿洖淇℃伅");
if (!response.Result)
@@ -804,8 +804,12 @@
{
tasks.ForEach(x =>
{
- string orderNos = string.Join(",", outStockLockInfos.Where(t => t.PalletCode == x.PalletCode).Select(x => x.OrderNo).Distinct());
+ List<Dt_OutStockLockInfo> outStockNos = outStockLockInfos.Where(t => t.PalletCode == x.PalletCode).ToList();
+ List<int> outDetailIds = outStockNos.Select(t => t.OrderDetailId).ToList();
+ int numberNo = outboundOrderDetails.Where(t => outDetailIds.Contains(t.Id)).OrderBy(x => x.Number).FirstOrDefault().Number;
+ string orderNos = string.Join(",", outStockNos.Select(t => t.OrderNo).Distinct());
x.OrderNo = orderNos;
+ x.Grade = numberNo;
});
}
BaseDal.AddData(tasks);
@@ -898,7 +902,7 @@
#region 棰嗘枡閫昏緫
foreach (var item in stockInfos)
{
- if (item.StockStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
+ if (item.StockStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() || item.StockStatus==StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt())
{
item.StockLength = 0;
item.MaterielWeight = 0;
@@ -911,6 +915,7 @@
}
#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);
--
Gitblit v1.9.3