From 004a418bd6674d62d06587030e29897ce430f0f2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 30 四月 2025 15:57:04 +0800
Subject: [PATCH] 1.异常处置单推送OA 2.现场管理新增现场收料的条码查询功能
---
service/QC/OaApi.cs | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 00964f7..a126489 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -83,14 +83,14 @@
{"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
{"workflowId", "379"},
//{"otherParams", BuildOtherParams()},
- //{"detailData", BuildDetailData(queryObj)}
+ {"detailData", BuildDetailData(queryObj)}
};
}
-
+
private JArray createbhgpqxmszp(dynamic files)
{
var attachments = new JArray();
-
+
foreach (var file in files ?? Enumerable.Empty<dynamic>())
{
attachments.Add(new JObject
@@ -100,7 +100,7 @@
["fileName"] = file.FileName?.ToString() ?? "鏈懡鍚嶆枃浠�"
});
}
-
+
return attachments;
}
private JArray BuildMainData(dynamic queryObj)
@@ -112,7 +112,7 @@
C.item_name AS jzmcwlmc,
D.supp_name AS khgys,
B.bill_no AS dhdhmes,
- B.remark AS bhgpqxms
+ A.remark 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
@@ -288,30 +288,54 @@
return array;
}
- private JArray BuildDetailData(JObject query)
+ private JArray BuildDetailData(dynamic queryObj)
{
- // 绀轰緥鏄庣粏鏁版嵁锛屾牴鎹疄闄呬笟鍔¤皟鏁�
+ // 浣跨敤鍙傛暟鍖栨煡璇㈣幏鍙栨槑缁嗘暟鎹�
+ 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]
+ WHERE pGuid = @guid";
+
+ var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
+
+ var tableRecords = new JArray();
+
+ // 閬嶅巻姣忔潯鏄庣粏鏁版嵁
+ foreach (var record in details ?? Enumerable.Empty<dynamic>())
+ {
+ // 淇瀛楁绫诲瀷杞崲锛堟暟鍊肩被鍨嬪幓闄ゅ瓧绗︿覆鍖呰９锛�
+ var fields = new JArray
+ {
+ //new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
+ new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
+ new JObject {
+ ["fieldName"] = "jydrq",
+ // 鏍煎紡鍖栦负"yyyy-MM-dd"瀛楃涓�
+ ["fieldValue"] = (record.jydrq != null
+ ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ")
+ : DateTime.Now.ToString("yyyy-MM-dd"))
+ },
+ // 鏁板�煎瓧娈典繚鎸佹暟瀛楃被鍨嬭�岄潪瀛楃涓�
+ // 淇鏁板�肩被鍨嬭浆鎹㈡柟寮�
+ 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 }
+ };
+
+ tableRecords.Add(new JObject
+ {
+ ["recordOrder"] = 0, // 瀹為檯涓氬姟涓彲鑳介渶瑕佹牴鎹鍙疯缃�
+ ["workflowRequestTableFields"] = fields
+ });
+ }
+
return new JArray
{
new JObject
{
["tableDBName"] = "formtable_main_33_dt1",
- ["workflowRequestTableRecords"] = new JArray
- {
- new JObject
- {
- ["recordOrder"] = "0",
- ["workflowRequestTableFields"] = new JArray
- {
- new JObject { ["fieldName"] = "jydh", ["fieldValue"] = query[""] ?? "妫�楠屽崟鍙�" },
- new JObject { ["fieldName"] = "jydrq", ["fieldValue"] = query[""] ?? "妫�楠屽崟鏃ユ湡" },
- new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = query[""] ?? "娑夊強鏁伴噺" },
- new JObject { ["fieldName"] = "cys", ["fieldValue"] = query[""] ?? "鎶芥牱鏁�" },
- new JObject { ["fieldName"] = "bls", ["fieldValue"] = query[""] ?? "涓嶈壇鏁�" },
- new JObject { ["fieldName"] = "bll", ["fieldValue"] = query[""] ?? "涓嶈壇鐜�" }
- }
- }
- }
+ ["workflowRequestTableRecords"] = tableRecords
}
};
}
@@ -378,13 +402,13 @@
{
formData.Add(new KeyValuePair<string, string>(item.Key, item.Value.ToString()));
}
-
+
var content = new FormUrlEncodedContent(formData);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/x-www-form-urlencoded");
var response = await _httpClient.PostAsync(url, content);
var responseString = await response.Content.ReadAsStringAsync();
-
+
// 娣诲姞鍝嶅簲鍏冩暟鎹�
var responseInfo = new JObject
{
@@ -393,10 +417,10 @@
["Headers"] = JToken.FromObject(response.Headers),
["Content"] = responseString
};
-
+
// 璋冭瘯杈撳嚭瀹屾暣鍝嶅簲淇℃伅
Console.WriteLine($"瀹屾暣鍝嶅簲锛歕n{responseInfo.ToString(Formatting.Indented)}");
-
+
return responseInfo.ToString();
}
--
Gitblit v1.9.3