From c6239213a60120d4f3f8d2105f48b6fa715a99ed Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 21 五月 2025 13:30:02 +0800
Subject: [PATCH] 1.获取携客云信息返回结构优化 2.SRM送货单扫码收料-PDA 3.OA->MES新增字段
---
service/QC/OaApi.cs | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index b185592..0d83dd4 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -185,20 +185,7 @@
private JArray BuildMainData(dynamic queryObj)
{
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- const string mainSql = @"
-SELECT TOP 1
- C.item_no AS wlbm,
- C.item_name AS jzmcwlmc,
- D.supp_name AS khgys,
- B.bill_no AS dhdhmes,
- (SELECT STRING_AGG(releaseNo+':' + mx.fng_desc+'\n', ',') AS OrderIDs
-FROM [Mes_QC_Exceptional_Detail] mx where mx.pGuid=a.guid
-) AS bhgpqxms
-FROM Mes_QC_Exceptional A
-LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
-LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
-LEFT JOIN MES_SUPPLIER D ON B.supp_id = D.id
-WHERE a.guid = @guid";
+ const string mainSql = @"EXEC select_oa_BuildMainData @guid";
var mainData = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
@@ -212,6 +199,7 @@
// 瀛楁鏄犲皠閰嶇疆锛堝瓧娈靛悕 -> 鏁版嵁搴撳垪鍚嶏級
var fieldMappings = new Dictionary<string, (string Field, string Default)>
{
+ ["ycczdh"] = ("ycczdh", "N/A"),
["wlbm"] = ("wlbm", "N/A"),
["khgys"] = ("khgys", "N/A"),
["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
@@ -373,8 +361,10 @@
{
// 浣跨敤鍙傛暟鍖栨煡璇㈣幏鍙栨槑缁嗘暟鎹�
const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
- chouQty AS cys, badQty AS bls, badProb AS bll
- from [Mes_QC_Exceptional_Detail]
+ chouQty AS cys, badQty AS bls, badProb AS bll,C.USER_NAME AS jyr
+ from Mes_QC_Exceptional_Detail A
+ LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
+ LEFT JOIN SYS_USER C ON C.ACCOUNT = B.fcheck_by
WHERE pGuid = @guid";
var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
@@ -389,6 +379,7 @@
{
//new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
+ new JObject { ["fieldName"] = "jyr", ["fieldValue"] = record.jyr?.ToString() ?? "" },
new JObject {
["fieldName"] = "jydrq",
// 鏍煎紡鍖栦负"yyyy-MM-dd"瀛楃涓�
@@ -401,7 +392,7 @@
new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
- new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1 }
+ new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1, }
};
tableRecords.Add(new JObject
--
Gitblit v1.9.3