From 8f28ca63dde584e5fefe51a07e69fd9b1af76fd2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 09 六月 2025 12:28:27 +0800
Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段
---
service/QC/OaApi.cs | 233 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 171 insertions(+), 62 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 00964f7..98bba9c 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -1,7 +1,9 @@
-锘�// OaApiService.cs
+// OaApiService.cs
using System;
using System.Collections.Generic;
using System.Dynamic;
+using System.Data.SqlClient;
+using System.Data;
using System.IO;
using System.Net.Http;
using System.Security.Cryptography;
@@ -31,10 +33,11 @@
_httpClient.Timeout = TimeSpan.FromSeconds(30);
}
- public async Task<dynamic> SubmitIQCToOA(dynamic queryObj)
+ public dynamic SubmitIQCToOA(dynamic queryObj)
{
// 淇敼鍙傛暟楠岃瘉瀛楁鍚�
- //if (queryObj.userId.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛id涓嶅厑璁镐负绌�");
+ if (string.IsNullOrEmpty(queryObj.userId.ToString())) throw new Exception("鐢ㄦ埛id涓嶅厑璁镐负绌�");
+ if (string.IsNullOrEmpty(queryObj.qcczdGuid.ToString())) throw new Exception("寮傚父澶勭疆鍗昳d涓嶈兘涓虹┖");
//if (queryObj.qcczdGuid.IsNullOrEmpty()) throw new Exception("寮傚父澶勭疆鍗昳d涓嶈兘涓虹┖"); // 鍘熷弬鏁板悕涓� qcczdGuid
try
@@ -44,12 +47,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璁剧疆锛�
@@ -62,14 +65,90 @@
var requestData = BuildRequestData(queryObj);
// 5. 鍙戦�佽姹�
- var response = await PostFormAsync(WorkflowUrl, requestData);
- return JObject.Parse(response);
+ var response = PostForm(WorkflowUrl, requestData);
+
+ // 鏂板鏃ュ織璁板綍锛堝湪杩斿洖鍝嶅簲鍓嶏級
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("prc_log_create", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] logParams =
+ {
+ new("@edtUserGuid", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(queryObj.userId.ToString()) },
+ new("@abtGuid", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(queryObj.qcczdGuid.ToString()) },
+ new("@abtTable", SqlDbType.NVarChar, 40) { Value = "Mes_QC_Exceptional" },
+ new("@detail", SqlDbType.NVarChar, 2500) { Value = "鎻愪氦IQC鍒癘A绯荤粺" },
+ new("@hNo", SqlDbType.NVarChar, 100) { Value = "" },
+ new("@SendJson", SqlDbType.NVarChar) { Value = JObject.FromObject(requestData).ToString() },
+ new("@RtnJson", SqlDbType.NVarChar) { Value = response.Content.ToString() }
+ };
+
+ foreach (var param in logParams)
+ cmd.Parameters.Add(param);
+
+ cmd.ExecuteNonQuery();
+ }
+ catch (Exception logEx)
+ {
+ // 鏃ュ織璁板綍澶辫触涓嶄腑鏂富娴佺▼
+ Console.WriteLine($"鏃ュ織璁板綍澶辫触: {logEx.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ var result = JObject.Parse(response.Content.ToString());
+
+ // 鏂板鐘舵�佹洿鏂帮紙褰揙A杩斿洖鎴愬姛鏃讹級
+ if (result.code?.ToString() == "SUCCESS")
+ {
+ var updateSql = @"UPDATE Mes_QC_Exceptional
+SET checkStatus = 1,
+ checkDate = GETDATE(),
+ checkBy = (select top 1 u.[ACCOUNT] from [dbo].[SYS_USER] u where u.guid = @edtUserCode)
+WHERE GUID = @inOrderGuid";
+
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand(updateSql, conn))
+ {
+ try
+ {
+ conn.Open();
+ //cmd.Parameters.AddWithValue("@dt", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ cmd.Parameters.AddWithValue("@edtUserCode", queryObj.userId?.ToString());
+ cmd.Parameters.AddWithValue("@inOrderGuid", queryObj.qcczdGuid?.ToString());
+ cmd.ExecuteNonQuery();
+ }
+ catch (Exception updateEx)
+ {
+ Console.WriteLine($"鐘舵�佹洿鏂板け璐�: {updateEx.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ return result; // 鐩存帴瑙ｆ瀽涓篔Object
+
}
catch (Exception ex)
{
dynamic error = new ExpandoObject();
- error.Error = true;
- error.Message = ex.Message;
+ error.code = "SYSTEM_INNER_ERROR"; // 鏂板鏍囧噯閿欒鐮�
+ error.errMsg = ex.Message; // 淇瀛楁鍚嶅尮閰嶈鑼�
+ error.data = new JObject();
+ error.reqFailMsg = new JObject();
return error;
}
}
@@ -83,14 +162,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,24 +179,13 @@
["fileName"] = file.FileName?.ToString() ?? "鏈懡鍚嶆枃浠�"
});
}
-
+
return attachments;
}
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,
- B.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
-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 });
@@ -131,10 +199,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", "鏃犵己闄锋弿杩�")
};
@@ -142,7 +215,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,
@@ -157,7 +239,7 @@
'http://192.168.1.145:81/upload/'+url_Path as url
FROM [Mes_QC_Exceptional_Detail] A
LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
-LEFT JOIN MES_FILE C ON C.parent_Guid = B.guid
+RIGHT JOIN MES_FILE C ON C.parent_Guid = B.guid
WHERE pGuid = @guid";
var fileData = Db.Ado.SqlQuery<dynamic>(fileSql, new { guid = queryObj.qcczdGuid });
@@ -288,30 +370,57 @@
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,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 });
+
+ 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"] = "jyr", ["fieldValue"] = record.jyr?.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
}
};
}
@@ -325,7 +434,7 @@
};
}
- private async Task<JObject> GetRegistAsync()
+ private JObject GetRegistAsync()
{
using var rsa = new RSACryptoServiceProvider(2048);
var cpk = Convert.ToBase64String(rsa.ExportRSAPublicKey());
@@ -334,18 +443,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)
@@ -370,7 +479,7 @@
return encryptedContent;
}
- private async Task<string> 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>>();
@@ -378,13 +487,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 response = _httpClient.PostAsync(url, content).Result;
+ var responseString = response.Content.ReadAsStringAsync().Result;
+
// 娣诲姞鍝嶅簲鍏冩暟鎹�
var responseInfo = new JObject
{
@@ -393,15 +502,15 @@
["Headers"] = JToken.FromObject(response.Headers),
["Content"] = responseString
};
-
+
// 璋冭瘯杈撳嚭瀹屾暣鍝嶅簲淇℃伅
Console.WriteLine($"瀹屾暣鍝嶅簲锛歕n{responseInfo.ToString(Formatting.Indented)}");
-
- return responseInfo.ToString();
+
+ return responseInfo;
}
public void Dispose()
{
_httpClient?.Dispose();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3