From 0dd60562defce9f8494121f4f5969ae07f4c0963 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 06 十一月 2025 09:13:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService
---
WebApi/Gs.Sys/Services/FmController.cs | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index c6b5389..627d698 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -253,17 +253,16 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
- //if (keyMeth.ToUpper() == "delete".ToUpper())
- // return "";
+
try
{
System.Data.DataSet dset = new System.Data.DataSet();
SqlParameter[] parameters =
{
- new("@inOrderGuid", keyGuid),
- new("@inEdtUserGuid", keyUserGuid),
- new("@keyMeth", keyMeth.ToLower()),
- };
+ new("@inOrderGuid", keyGuid),
+ new("@inEdtUserGuid", keyUserGuid),
+ new("@keyMeth", keyMeth.ToLower()),
+ };
dset = DbHelperSQL.RunProcedure(keyProduce, parameters, "0");
if (dset == null)
return "";
@@ -271,14 +270,39 @@
return "";
if (dset.Tables[0].Rows.Count <= 0)
return "";
- //杩欐槸鏅�氱殑鎺ュ彛
+
+ // 2025-11-05澶勭悊 keyProduce 涓� prc_cgthsq_sm_Erp 閲囪喘閫�璐х殑鐗规畩鎯呭喌
+ if (keyProduce == "prc_cgthsq_sm_Erp")
+ {
+ // 浠庢暟鎹泦鎻愬彇 erpid 鍜� F_WPVT_INTEGER_L6W 鐨勫�硷紙瀛楁鍚嶆牴鎹疄闄呮儏鍐佃皟鏁达級
+ string erpid = dset.Tables[0].Rows[0]["erpid"].ToString();
+ string fWpvtIntegerL6w = dset.Tables[0].Rows[0]["F_WPVT_INTEGER_L6W"].ToString();
+
+ // 鏋勫缓 datajson 鍐呭锛堜粎鍖呭惈涓や釜瀛楁锛�
+ var dataJsonContent = new
+ {
+ erpid = erpid,
+ F_WPVT_INTEGER_L6W = fWpvtIntegerL6w
+ };
+
+ // 淇濇寔鍜屽師鏈夋牸寮忎竴鑷寸殑澶栧眰缁撴瀯
+ var specialObj = new
+ {
+ mesid = dset.Tables[0].Rows[0][0].ToString(), // 娌跨敤鍘熸湁 mesid 鐨勫彇鍊奸�昏緫锛堢涓�鍒楋級
+ taskname = keyTaskName,
+ optype = keyMeth,
+ datajson = JsonConvert.SerializeObject(dataJsonContent) // 灏嗕袱涓瓧娈靛簭鍒楀寲涓� datajson
+ };
+ return JsonConvert.SerializeObject(specialObj);
+ }
+
+ // 鍘熸湁閫昏緫锛堥潪鐗规畩鎯呭喌锛�
if (string.IsNullOrEmpty(idtype))
{
string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
dynamic _datajson = new ExpandoObject();
if (dset.Tables.Count > 1)
{
- //杩欐槸缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
if (keyMeth.ToLower() == "toclose".ToLower() || keyMeth.ToLower() == "closure".ToLower() || keyMeth.ToLower() == "unfinish")
{
_datajson = dset.Tables[1].Rows[0].RowToDynamic();
@@ -296,13 +320,12 @@
taskname = keyTaskName,
optype = keyMeth,
datajson = JsonConvert.SerializeObject(_datajson),
- // datajson = (_datajson),
};
return JsonConvert.SerializeObject(_obj);
}
- //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
+
List<dynamic> _datajson22 = new List<dynamic>();
- dynamic _ob= new ExpandoObject();
+ dynamic _ob = new ExpandoObject();
_ob.ENTRY = dset.Tables[0].TableToDynamicList();
_datajson22.Add(_ob);
@@ -320,6 +343,7 @@
throw ex;
}
}
+
#endregion
--
Gitblit v1.9.3