From 2a18e22c236bc786db2e49fa222c080190a5f417 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 19 十一月 2024 15:19:10 +0800
Subject: [PATCH] 11
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 108ba74..38c9d9a 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -886,8 +886,12 @@
}
var ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
+
+ var newGuid = Guid.NewGuid();
var message = new MessageCenter
{
+ Guid = newGuid,
+ //Pid = newGuid,
TableName = tableName,
Url = ErpUrl,
Status = 1,
@@ -911,11 +915,10 @@
var message = MesToErpParam(query);
var executeReturnIdentity =
- Db.Insertable(message).ExecuteReturnIdentity();
+ Db.Insertable(message).ExecuteCommand();
if (executeReturnIdentity > 0)
{
- // message.Guid = executeReturnIdentity;
- message.Pid = executeReturnIdentity;
+ message.Pid = message.Guid;
return message;
}
@@ -959,24 +962,20 @@
MesInvItemArnDetail>(
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
- g.ItemNo == c.ItemNo && g.Company == c.Company &&
- g.Factory == c.Factory, JoinType.Inner,
+ g.ItemId == c.Id , JoinType.Inner,
d.Id == Convert.ToDecimal(c.ItemUnit),
- JoinType.Inner,
- a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo
- && g.CbillNo == a.CbillNo
+ JoinType.Inner, a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
)
).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
(g, c, d, a) => new Material
{
- // FstockId = g.DepotCode,
- // FuintId = d.Fnumber,
- // FsrcEntryId = a.Id,
- // FmesEntryId = g.Id,
- // FmaterialId = a.ItemNo,
- // DepotSectionCode = g.DepotSectionCode,
- // WorkNo = g.WorkNo,
- // Frealqty = g.Quantity
+ FMaterialId = c.ItemNo,
+ FRealQty = g.Quantity.ToString(),
+ FStockId = g.DepotCode,
+ FLot = a.CbillNo,
+ FUnitID = d.Fnumber,
+ FsrcEntryId = a.Guid.ToString(),
+ FMesEntryid = g.Guid.ToString()
}).ToList();
@@ -986,12 +985,13 @@
var jsonEntries = materials.Select(d => new
{
- // FMaterialId = d.FmaterialId,
- // FUintId = d.FuintId,
- // FRealQty = d.Frealqty,
- // FStockId = d.FstockId,
- // FSRCENTRYID = d.FsrcEntryId.ToString(),
- // F_MES_ENTRYID = d.FmesEntryId.ToString()
+ FMaterialId = d.FMaterialId,
+ FRealQty = d.FRealQty,
+ FStockId = d.FStockId,
+ FLot = d.FLot,
+ FUnitID = d.FUnitID,
+ FsrcEntryId = d.FsrcEntryId,
+ FMesEntryid = d.FMesEntryid
}).ToList();
var fdate = DateTime.Now.ToString("yyyy-MM-dd");
--
Gitblit v1.9.3