From 65de1fef14c8b97319f292254c38983c1d4099eb Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 20 十一月 2025 13:14:52 +0800
Subject: [PATCH] SCBG物料汇总
---
service/Wom/MesWorkProdManager.cs | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/service/Wom/MesWorkProdManager.cs b/service/Wom/MesWorkProdManager.cs
index badf030..8de2d61 100644
--- a/service/Wom/MesWorkProdManager.cs
+++ b/service/Wom/MesWorkProdManager.cs
@@ -299,6 +299,7 @@
// 澹版槑鍙橀噺鍦ㄥ灞傦紝纭繚鍦ㄦ墍鏈夊垎鏀腑閮藉彲璁块棶
MesInvItemIns rksqOrder = null;
List<MesInvItemInRksqDetails> rksqDetails = new List<MesInvItemInRksqDetails>();
+ List<MesInvItemInRksqDetails> itemDetails = new List<MesInvItemInRksqDetails>();
if (po_outSum == 1)
{
@@ -319,7 +320,21 @@
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
WHERE A.bill_no= '{0}' ORDER BY A.create_date DESC", rksqOrder.BillNo);
+ var sql1 = string.Format(@"SELECT
+ SUM(ISNULL(B.QUANTITY,0)) as BgQuantity,
+ c.item_no as ItemNo,
+ c.item_name as ItemName,
+ c.item_model as ItemModel,
+ MAX(A.create_date) as LatestCreateDate -- 娣诲姞杩欎釜瀛楁
+FROM MES_INV_ITEM_IN_RKSQ_DETAILS A
+LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_barcode = B.ITEM_BARCODE
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+WHERE A.bill_no = '{0}'
+GROUP BY c.item_no, c.item_name, c.item_model
+ORDER BY MAX(A.create_date) DESC", rksqOrder.BillNo);
+
rksqDetails = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql).ToList();
+ itemDetails = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql1).ToList();
}
}
else if (po_outSum == 2)
@@ -339,6 +354,7 @@
}
rksqDetails = new List<MesInvItemInRksqDetails>();
+ itemDetails = new List<MesInvItemInRksqDetails>();
}
// Check if the procedure failed
@@ -364,6 +380,7 @@
Message = po_outMsg,
sjBillNo = sjBillNo,
BarcodesDetail = rksqDetails,
+ itemDetail = itemDetails
};
}
@@ -567,10 +584,25 @@
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
WHERE A.bill_no= '{0}'ORDER BY A.create_date DESC", rksqOrder.BillNo);
+ var sql1 = string.Format(@"SELECT
+ SUM(ISNULL(B.QUANTITY,0)) as BgQuantity,
+ c.item_no as ItemNo,
+ c.item_name as ItemName,
+ c.item_model as ItemModel,
+ MAX(A.create_date) as LatestCreateDate -- 娣诲姞杩欎釜瀛楁
+FROM MES_INV_ITEM_IN_RKSQ_DETAILS A
+LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_barcode = B.ITEM_BARCODE
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+WHERE A.bill_no = '{0}'
+GROUP BY c.item_no, c.item_name, c.item_model
+ORDER BY MAX(A.create_date) DESC", rksqOrder.BillNo);
+
var RKSQ = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql);
+ var wlhz = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql1);
var rksqDetails = RKSQ.ToList();
+ var wlhzDetails = wlhz.ToList();
//var rksqDetails = Db.Queryable<MesInvItemInRksqDetails>()
@@ -581,6 +613,7 @@
return new ScanWorkResult
{
BarcodesDetail = rksqDetails,
+ itemDetail = wlhzDetails
};
}
--
Gitblit v1.9.3