From f0ad716dd169be56c2c3a5c5ae66371d09994991 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期三, 26 十一月 2025 15:19:31 +0800
Subject: [PATCH] 1111
---
StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
index 7926c7b..5f3c137 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
@@ -28,9 +28,15 @@
}
// 1. 鏌ヨXB_RACKING_TASK_SYXT_LOG涓璉temBarcode鍜孭alletCode鐨勬槧灏勫叧绯�
- var rackingTaskData = Db.Queryable<XbRackingTaskSyxtLog>()
+ var allRackingTaskData = Db.Queryable<XbRackingTaskSyxtLog>()
.Where(x => !string.IsNullOrEmpty(x.ItemBarcode))
- .Select(x => new { x.ItemBarcode, x.PalletCode })
+ .Select(x => new { x.ItemBarcode, x.PalletCode, x.Code, x.Id })
+ .ToList();
+
+ var rackingTaskData = allRackingTaskData
+ .GroupBy(x => x.ItemBarcode)
+ .Select(g => g.OrderByDescending(x => x.Id).First())
+ .Where(x => x.Code != "500")
.ToList();
if (rackingTaskData == null || !rackingTaskData.Any())
@@ -384,10 +390,12 @@
decimal messageId = 0;
string taskCode = "";
- // 鏍规嵁鏉＄爜鏌ヨXB_RACKING_TASK_SYXT_LOG琛紝鏌ヨmax(PALLETCODE)
- var maxPalletCode = Db.Queryable<XbRackingTaskSyxtLog>()
+ // 鏍规嵁鏉＄爜鏌ヨXB_RACKING_TASK_SYXT_LOG琛紝鏌ヨmax(PALLETCODE)鍜屽搴旂殑widthType
+ var rackingTaskInfo = Db.Queryable<XbRackingTaskSyxtLog>()
.Where(x => x.ItemBarcode == barcode)
- .Max(x => x.PalletCode);
+ .OrderByDescending(x => x.Id)
+ .Select(x => new { x.PalletCode, x.WidthType })
+ .First();
try
{
@@ -427,8 +435,8 @@
{
taskCode = taskCode,
taskType = "1",
- palletCode = maxPalletCode ?? "",
- widthType = "180",
+ palletCode = rackingTaskInfo?.PalletCode ?? "",
+ widthType = rackingTaskInfo?.WidthType?.ToString() ?? "2000",
station = "3"
};
var requestList = new[] { requestData };
@@ -494,8 +502,8 @@
CreateDate = DateTime.Now,
TaskCode = taskCode,
TaskType = "绔嬪簱鍑哄簱璇锋眰",
- PalletCode = maxPalletCode,
- WidthType = 180,
+ PalletCode = rackingTaskInfo?.PalletCode ?? "",
+ WidthType = rackingTaskInfo?.WidthType ?? 2000,
MaterialName = firstStock.ItemName,
MaterialCode = firstStock.ItemNo,
BatchNo = firstStock.LotNo,
--
Gitblit v1.9.3