From 2276feb4375d99c0424091bb32c1d5d92b67d41b Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 26 十一月 2024 09:31:27 +0800
Subject: [PATCH] 委外变更单更新运行存储过程
---
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 34788f7..3a1b97c 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -14,13 +14,16 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutsManager.cs
- public List<MesInvItemOuts> GetProductionPickPage(WarehouseQuery query)
+ public (List<MesInvItemOuts> Items, int TotalCount) GetProductionPickPage(
+ WarehouseQuery query)
{
- return Db.Queryable<MesInvItemOuts, MesDepots>((a, o) =>
+ var totalCount = 0; // 鍒濆鍖� totalCount
+ // 纭繚杩欓噷浣跨敤 'out' 鏉ヨ幏鍙栨�昏鏁�
+ var result = Db.Queryable<MesInvItemOuts, MesDepots>((a, o) =>
new JoinQueryInfos(
JoinType.Left,
o.DepotCode == a.DepotCode && a.Company == o.Company &&
- a.Factory == o.Factory
+ a.Factory == a.Factory
))
.Where((a, o) => a.BillTypeId == 200 &&
a.TransactionNo == 201 &&
@@ -46,7 +49,10 @@
ItemOutNo = a.ItemOutNo,
DepotName = o.DepotName // 闇�瑕佸姩鎬佹坊鍔犵殑瀛楁
})
- .ToPageList(query.PageIndex, query.Limit);
+ .ToPageList(query.PageIndex, query.Limit,
+ ref totalCount); // 纭繚杩欓噷浣跨敤 'out'
+
+ return (result, totalCount);
}
public MaterialReceipt GetProductionPick(WarehouseQuery query)
@@ -55,9 +61,9 @@
if (query.id != null)
{
var mesInvItemOutsList = GetProductionPickPage(query);
- if (mesInvItemOutsList.Count <= 0) return form;
+ if (mesInvItemOutsList.TotalCount <= 0) return form;
- form.ItemOuts = mesInvItemOutsList[0];
+ form.ItemOuts = mesInvItemOutsList.Items[0];
form.ItemsList = getProductionItemsList(query);
form.InvItemoutCDetails = GetProductionDetails(query);
}
@@ -831,7 +837,7 @@
throw new Exception("鑾峰彇鏁版嵁澶辫触");
}
- private MessageCenter ProductionMesToErpParam(WarehouseQuery query)
+ public MessageCenter ProductionMesToErpParam(WarehouseQuery query)
{
var erpParameters = "";
var title = "";
@@ -927,28 +933,33 @@
item.ItemId + "')";
var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);
+ var xsddh = item.Caa015 ?? "";
+ var wzh = item.PositionNo ?? "";
+ var qty = ((int)item.Quantity).ToString();
+ var erpid = ((int)item.erpId).ToString();
+ var id = ((int)item.Id).ToString();
scllentryList.Add(new
{
FMaterialId = item.ItemNo,
FUnitID = C_ITEM_UNIT,
- FAppQty = item.Quantity,
- FActualQty = item.Quantity,
+ FAppQty = qty,
+ FActualQty = qty,
FStockId = item.DepotCode,
- FPPBomEntryId = item.erpId,
- F_UNW_Text_xsddh = item.Caa015,
- F_UNW_TEXT_WZH = item.PositionNo,
- F_MES_ENTRYID = item.Id
+ FPPBomEntryId = erpid,
+ F_UNW_Text_xsddh = xsddh,
+ F_UNW_TEXT_WZH = wzh,
+ F_MES_ENTRYID = id
});
}
var dataJson = new
{
- F_MES_ID = mesInvItemOuts.Id,
- FDate = mesInvItemOuts.CreateBy,
+ F_MES_ID = mesInvItemOuts.Id.ToString(),
+ FDate = DateTime.Now.ToString("yyyy-MM-dd"),
FPickerId = userName,
F_UNW_LargeText_BZ = " ",
F_UNW_KH = " ",
- F_UNW_DDSL = womcaa.Caa012,
+ F_UNW_DDSL = womcaa.Caa012.ToString(),
F_UNW_Text_CZG = userName,
scllentry = scllentryList
};
--
Gitblit v1.9.3