From 9b52fedadde2099fef19aad25feac309ce034119 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 08 九月 2025 17:41:38 +0800
Subject: [PATCH] 采购退货多行合并成一张单据
---
StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 051f6fe..7ea5d7b 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Masuit.Tools;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -18,7 +19,8 @@
{
// 鏍规嵁AsnNo鍜孧esNo瀵规槑缁嗚繘琛屽垎缁�
var groupedItems = itemOutLists
- .GroupBy(item => new { item.MesNo, item.SqNo })
+ // .GroupBy(item => new { item.MesNo, item.SqNo })
+ .GroupBy(item => new { item.MesNo })
.ToList();
int result = 1;
@@ -35,19 +37,20 @@
throw new NotImplementedException("鍏ュ簱鍗曞崟鍙蜂笉鑳戒负绌�");
}
- if (group.Key.SqNo == null)
- {
- throw new NotImplementedException("閫�璐х敵璇峰崟琛屽彿涓嶈兘涓虹┖");
- }
+ //if (group.Key.SqNo == null)
+ //{
+ // throw new NotImplementedException("閫�璐х敵璇峰崟琛屽彿涓嶈兘涓虹┖");
+ //}
// 鍒涘缓涓�涓复鏃剁殑itemOutFrom瀵硅薄锛屼娇鐢ㄥ垎缁勭殑Key浣滀负涓昏灞炴��
var tempItemOutFrom = new ItemOutFrom
{
//AsnNo = group.Key.AsnNo,
MesNo = group.Key.MesNo,
- SqNo = group.Key.SqNo,
+ //SqNo = group.Key.SqNo,
// 缁ф壙鍘熷itemOutFrom鐨勫叾浠栧睘鎬�
- RtnNo = itemOutFrom.RtnNo+ "-"+count.ToString(),
+ //RtnNo = itemOutFrom.RtnNo+ "-"+count.ToString(),
+ RtnNo = itemOutFrom.RtnNo,
Type = itemOutFrom.Type,
CreateBy = itemOutFrom.CreateBy,
FMRMODE = itemOutFrom.FMRMODE,
@@ -247,6 +250,8 @@
throw new NotImplementedException("[" + itemOutList.itemId +
"]鐗╂枡涓嶅瓨鍦紝璇峰悓姝ョ粰MES");
}
+ var mesUnit = Db.Queryable<MesUnit>()
+ .Where(s => s.Id == int.Parse(mesItems.ItemUnit)).First();
if (itemOutList.SrcDocNo!=null&& itemOutList.SrcDocNo!="")
{
@@ -272,6 +277,7 @@
{
throw new NotImplementedException("鍏ュ簱鍗曞叧鑱旂殑閲囪喘鍗曞彿涓嶈兘涓虹┖");
}
+
mesInvItemOutItems.Add(new MesInvItemOutItems
{
@@ -298,7 +304,7 @@
ItemId = Decimal.Parse(itemIdLinkU9.MesId), // 纭繚ItemId鏈夊��
SqNo = itemOutList.SqNo, // 纭繚ItemId鏈夊��
//ZzitemId = itemOutList.AsnLineNo, // 纭繚ItemId鏈夊��
- // Unit = item.Unit,
+ Unit = mesUnit.Fnumber,
});
}
else
@@ -351,7 +357,7 @@
ItemId = Decimal.Parse(itemIdLinkU9.MesId), // 纭繚ItemId鏈夊��
SqNo = itemOutList.SqNo, // 纭繚ItemId鏈夊��
//ZzitemId = itemOutList.AsnLineNo, // 纭繚ItemId鏈夊��
- // Unit = item.Unit,
+ Unit = mesUnit.Fnumber,
});
}
--
Gitblit v1.9.3