From 47f38ba0d8dad9d01e39f9ecb1c05ea64974790b Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 28 十一月 2025 18:21:15 +0800
Subject: [PATCH] 1、新增采购退货单删除接口 2、新增接口json只传主表类型
---
WebApi/Gs.Sys/Services/FmController.cs | 61 ++++++++------------
WebApi/Gs.Warehouse/Services/MesInvItemInsManager.cs | 2
WebApi/Gs.QiTaCk/MesCgthSqDjManager.cs | 61 ++++++++++++++++++++
3 files changed, 86 insertions(+), 38 deletions(-)
diff --git a/WebApi/Gs.QiTaCk/MesCgthSqDjManager.cs b/WebApi/Gs.QiTaCk/MesCgthSqDjManager.cs
index 1b6eaa0..d010a19 100644
--- a/WebApi/Gs.QiTaCk/MesCgthSqDjManager.cs
+++ b/WebApi/Gs.QiTaCk/MesCgthSqDjManager.cs
@@ -197,6 +197,65 @@
"鎿嶄綔鎴愬姛锛�");
}
-
+ /// <summary>
+ /// 鍒犻櫎涓昏〃鎴栨槑缁�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<int?> DeleteCgThSqDj([FromBody] dynamic model)
+ {
+ int? rtnInt = (int)ReturnCode.Default;
+ Guid? guid = model.guid; //閫�璐у崟涓婚敭
+ string mxGuid = model.mxGuid;
+ var _outMsg = "";
+ var _outSum = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_cgtlsq_dj_del]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inOrderGuid",
+ UtilityHelper.CheckGuid(guid)
+ ? guid
+ : DBNull.Value),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inMxGuid", mxGuid)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+
+ cmd.ExecuteNonQuery();
+ _outMsg = parameters[0].Value.ToString();
+ _outSum = int.Parse(parameters[1].Value.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_cgtlsq_dj_del error锛�" + ex.Message);
+ _outMsg = ex.Message;
+ _outSum = -1;
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ if (_outSum <= 0)
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
+ _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
+ }
}
}
\ No newline at end of file
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 627d698..ac66794 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -253,6 +253,10 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
+ string? keyList = model.keyList;//浠庡瓨鍌ㄨ繃绋嬫潵 zb/鍙彇涓昏〃鏁版嵁 mx1/鍙栨槑缁�1鐨勬暟鎹�
+
+ if (string.IsNullOrEmpty(keyList))
+ keyList = "";
try
{
@@ -271,48 +275,33 @@
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();
- }
- else
- {
- _datajson = dset.Tables[0].Rows[0].RowToDynamic();
- List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
- ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
- }
+ // 1.浠呭彇涓昏〃鏁版嵁锛屼笉澶勭悊瀛愯〃
+ if ( keyList.ToLower() == "zb".ToLower() )
+ {
+ _datajson = dset.Tables[0].Rows[0].RowToDynamic();
+ }
+ // 2.鍙栧瓙琛ㄧ涓�琛屾暟鎹�
+ else if (keyMeth.ToLower() == "toclose"
+ || keyMeth.ToLower() == "closure"
+ || keyMeth.ToLower() == "unfinish")
+ {
+ _datajson = dset.Tables[1].Rows[0].RowToDynamic();
+ }
+ // 3.鍏朵粬鎿嶄綔锛氫富琛�+瀛愯〃鎸傝浇鍒発eyChild
+ else
+ {
+ _datajson = dset.Tables[0].Rows[0].RowToDynamic();
+ List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
+ ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
+ }
+
}
var _obj = new
{
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemInsManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemInsManager.cs
index 828f895..29f3444 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemInsManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemInsManager.cs
@@ -176,7 +176,7 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(),
- "prc_cgdhd_Edt error锛�" + ex.Message);
+ "prc_cgrk_del error锛�" + ex.Message);
_outMsg = ex.Message;
_outSum = -1;
}
--
Gitblit v1.9.3