From 2ed39b33a7f3dd6a7bd2e66b7ee5de78e00861f1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 26 八月 2025 11:08:11 +0800
Subject: [PATCH] 1.OA正式库切换
---
service/QC/OaApi.cs | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 8430e3b..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()
{
@@ -160,7 +164,7 @@
{
{"mainData", BuildMainData(queryObj)},
{"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
- {"workflowId", "379"},
+ {"workflowId", "600"},//娴嬭瘯锛�379 姝ｅ紡锛�600
//{"otherParams", BuildOtherParams()},
{"detailData", BuildDetailData(queryObj)}
};
@@ -185,21 +189,7 @@
private JArray BuildMainData(dynamic queryObj)
{
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- const string mainSql = @"
-SELECT TOP 1
- A.fBillNo AS ycczdh,
- 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 });
@@ -213,11 +203,15 @@
// 瀛楁鏄犲皠閰嶇疆锛堝瓧娈靛悕 -> 鏁版嵁搴撳垪鍚嶏級
var fieldMappings = new Dictionary<string, (string Field, string Default)>
{
+ ["sqr"] = ("sqr", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["sqrq"] = ("sqrq", ""), // 绌哄瓧绗︿覆鐢ㄤ簬鏃ユ湡鏍煎紡鍖�
+ ["szbm"] = ("szbm", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["szdw"] = ("szdw", "0"), // 榛樿鍊兼敼涓烘暟瀛�
["ycczdh"] = ("ycczdh", "N/A"),
- ["wlbm"] = ("wlbm", "N/A"),
+ ["lh"] = ("lh", "N/A"),
["khgys"] = ("khgys", "N/A"),
["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
- ["dhdhmes"] = ("dhdhmes", "N/A"),
+ ["dhdhtxt"] = ("dhdhtxt", "N/A"),
["bhgpqxms"] = ("bhgpqxms", "鏃犵己闄锋弿杩�")
};
@@ -225,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,
@@ -375,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 });
@@ -391,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"瀛楃涓�
@@ -403,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
@@ -417,7 +423,7 @@
{
new JObject
{
- ["tableDBName"] = "formtable_main_33_dt1",
+ ["tableDBName"] = "formtable_main_321_dt1",//娴嬭瘯锛歠ormtable_main_33_dt1
["workflowRequestTableRecords"] = tableRecords
}
};
--
Gitblit v1.9.3