From 459621921ba77d8cc8bf0789209b76d387b820e8 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 27 八月 2025 09:29:44 +0800
Subject: [PATCH] 1.携客云字段优化 2.库位变更——hyx
---
service/QC/OaApi.cs | 84 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 60c3601..259a45b 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -23,9 +23,13 @@
public class OaApiService : Repository<dynamic>
{
private readonly HttpClient _httpClient;
- private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
- private const string BaseUrl = "http://192.168.1.149:8099/api/ec/dev/auth/";
- private const string WorkflowUrl = "http://192.168.1.149:8099/api/workflow/paService/doCreateRequest";
+ //private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ //private const string BaseUrl = "http://192.168.1.149:8099/api/ec/dev/auth/";
+ //private const string WorkflowUrl = "http://192.168.1.149:8099/api/workflow/paService/doCreateRequest";
+
+ private const string AppId = "AB7F0461-89C3-4EAD-B5B5-B7D540617921";
+ private const string BaseUrl = "http://192.168.1.20:80/api/ec/dev/auth/";
+ private const string WorkflowUrl = "http://192.168.1.20:80/api/workflow/paService/doCreateRequest";
public OaApiService()
{
@@ -33,7 +37,7 @@
_httpClient.Timeout = TimeSpan.FromSeconds(30);
}
- public async Task<dynamic> SubmitIQCToOA(dynamic queryObj)
+ public dynamic SubmitIQCToOA(dynamic queryObj)
{
// 淇敼鍙傛暟楠岃瘉瀛楁鍚�
if (string.IsNullOrEmpty(queryObj.userId.ToString())) throw new Exception("鐢ㄦ埛id涓嶅厑璁镐负绌�");
@@ -47,12 +51,12 @@
//var query = JObject.FromObject(queryObj);
// 1. 娉ㄥ唽鑾峰彇鍑瘉
- var registResult = await GetRegistAsync();
+ var registResult = GetRegistAsync();
var secret = registResult["secrit"].ToString();
var spk = registResult["spk"].ToString();
// 2. 鑾峰彇璁块棶浠ょ墝
- var tokenResult = await ApplyTokenAsync(secret, spk);
+ var tokenResult = ApplyTokenAsync(secret, spk);
var token = tokenResult["token"].ToString();
// 3. 鍑嗗璇锋眰澶达紙绉婚櫎Content-Type璁剧疆锛�
@@ -65,7 +69,7 @@
var requestData = BuildRequestData(queryObj);
// 5. 鍙戦�佽姹�
- var response = await PostFormAsync(WorkflowUrl, requestData);
+ var response = PostForm(WorkflowUrl, requestData);
// 鏂板鏃ュ織璁板綍锛堝湪杩斿洖鍝嶅簲鍓嶏級
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -160,7 +164,7 @@
{
{"mainData", BuildMainData(queryObj)},
{"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
- {"workflowId", "379"},
+ {"workflowId", "600"},//娴嬭瘯锛�379 姝ｅ紡锛�600
//{"otherParams", BuildOtherParams()},
{"detailData", BuildDetailData(queryObj)}
};
@@ -185,20 +189,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,10 +203,15 @@
// 瀛楁鏄犲皠閰嶇疆锛堝瓧娈靛悕 -> 鏁版嵁搴撳垪鍚嶏級
var fieldMappings = new Dictionary<string, (string Field, string Default)>
{
- ["wlbm"] = ("wlbm", "N/A"),
+ ["sqr"] = ("sqr", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["sqrq"] = ("sqrq", ""), // 绌哄瓧绗︿覆鐢ㄤ簬鏃ユ湡鏍煎紡鍖�
+ ["szbm"] = ("szbm", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["szdw"] = ("szdw", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["ycczdh"] = ("ycczdh", "N/A"),
+ ["lh"] = ("lh", "N/A"),
["khgys"] = ("khgys", "N/A"),
["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
- ["dhdhmes"] = ("dhdhmes", "N/A"),
+ ["dhdhtxt"] = ("dhdhtxt", "N/A"),
["bhgpqxms"] = ("bhgpqxms", "鏃犵己闄锋弿杩�")
};
@@ -223,7 +219,16 @@
var result = new JArray();
foreach (var mapping in fieldMappings)
{
- var value = GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default);
+ var value = mapping.Key switch
+ {
+ "sqr" or "szbm" or "szdw" =>
+ int.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default), out int num)
+ ? num : 0,
+ "sqrq" => DateTime.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, ""), out DateTime date)
+ ? date.ToString("yyyy-MM-dd")
+ : DateTime.Now.ToString("yyyy-MM-dd"),
+ _ => GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default)
+ };
result.Add(new JObject
{
["fieldName"] = mapping.Key,
@@ -373,8 +378,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 +396,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 +409,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
@@ -415,7 +423,7 @@
{
new JObject
{
- ["tableDBName"] = "formtable_main_33_dt1",
+ ["tableDBName"] = "formtable_main_321_dt1",//娴嬭瘯锛歠ormtable_main_33_dt1
["workflowRequestTableRecords"] = tableRecords
}
};
@@ -430,7 +438,7 @@
};
}
- private async Task<JObject> GetRegistAsync()
+ private JObject GetRegistAsync()
{
using var rsa = new RSACryptoServiceProvider(2048);
var cpk = Convert.ToBase64String(rsa.ExportRSAPublicKey());
@@ -439,18 +447,18 @@
_httpClient.DefaultRequestHeaders.Add("appid", AppId);
_httpClient.DefaultRequestHeaders.Add("cpk", cpk);
- var response = await _httpClient.PostAsync(BaseUrl + "regist", null);
- return JObject.Parse(await response.Content.ReadAsStringAsync());
+ var response = _httpClient.PostAsync(BaseUrl + "regist", null).Result;
+ return JObject.Parse(response.Content.ReadAsStringAsync().Result);
}
- private async Task<JObject> ApplyTokenAsync(string secret, string spk)
+ private JObject ApplyTokenAsync(string secret, string spk)
{
_httpClient.DefaultRequestHeaders.Clear();
_httpClient.DefaultRequestHeaders.Add("appid", AppId);
_httpClient.DefaultRequestHeaders.Add("secret", RSAEncrypt(secret, spk));
- var response = await _httpClient.PostAsync(BaseUrl + "applytoken", null);
- return JObject.Parse(await response.Content.ReadAsStringAsync());
+ var response = _httpClient.PostAsync(BaseUrl + "applytoken", null).Result;
+ return JObject.Parse(response.Content.ReadAsStringAsync().Result);
}
private string RSAEncrypt(string data, string publicKey)
@@ -475,7 +483,7 @@
return encryptedContent;
}
- private async Task<dynamic> PostFormAsync(string url, Dictionary<string, object> data)
+ private dynamic PostForm(string url, Dictionary<string, object> data)
{
// 鏀圭敤FormUrlEncodedContent骞舵纭缃瓹ontent-Type
var formData = new List<KeyValuePair<string, string>>();
@@ -487,8 +495,8 @@
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 response = _httpClient.PostAsync(url, content).Result;
+ var responseString = response.Content.ReadAsStringAsync().Result;
// 娣诲姞鍝嶅簲鍏冩暟鎹�
var responseInfo = new JObject
--
Gitblit v1.9.3