From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.QiTaCk/MesCgthSqManager.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/WebApi/Gs.QiTaCk/MesCgthSqManager.cs b/WebApi/Gs.QiTaCk/MesCgthSqManager.cs
index 16b4956..1c5904e 100644
--- a/WebApi/Gs.QiTaCk/MesCgthSqManager.cs
+++ b/WebApi/Gs.QiTaCk/MesCgthSqManager.cs
@@ -118,7 +118,7 @@
m = dr.RowToDynamic();
var _tb = dset.Tables[1].TableToDynamicList();
m.list = _tb;
-
+
}
}
catch (Exception ex)
@@ -174,11 +174,9 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(),
- "prc_cgthsq_submit error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "prc_cgthsq_submit error锛�" + ex.Message);
m.outMsg = ex.Message;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
}
finally
{
@@ -199,9 +197,15 @@
{
Guid? guid = model.Guid; //涓婚敭
string bz = model.Remark; //澶囨敞
+ string thOrgId = model.thOrgId;//閫�璐х粍缁�
string gysId = model.SuppId; //渚涘簲鍟�
string Fmrmode = model.Fmrmode;//鏂瑰紡
string Reason = model.Reason;//鍘熷洜
+ string fHasLink = model.fHasLink;
+ string fRequireOrgId = model.fRequireOrgId;
+ string fPurchaseDeptId = model.fPurchaseDeptId;
+ string fPurchaserId = model.fPurchaserId;
+ string fOwnerIdHead = model.fOwnerIdHead;
StringBuilder _sb = new StringBuilder();
string _split = "|";
foreach (var m in model.list)
@@ -211,6 +215,7 @@
+ m.Quantity + _split
+ m.Bz + _split
+ m.DepotId + _split
+ + m.ItemId + _split
+ (UtilityHelper.CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
if (_sb.Length > 0)
_sb.Append("~");
@@ -241,6 +246,12 @@
new("@Fmrmode", Fmrmode),
new("@Reason", Reason),
new("@inEdtUserGuid", _userGuid),
+ new("@thOrgId", thOrgId),
+ new("@fHasLink", fHasLink),
+ new("@fRequireOrgId", fRequireOrgId),
+ new("@fPurchaseDeptId", fPurchaseDeptId),
+ new("@fPurchaserId", fPurchaserId),
+ new("@fOwnerIdHead", fOwnerIdHead),
new("@inLineList", _sb.ToString())
};
parameters[0].Direction = ParameterDirection.Output;
@@ -282,7 +293,7 @@
public ReturnDto<int?> DeleteModelOrMx([FromBody] dynamic model)
{
int? rtnInt = (int)ReturnCode.Default;
- Guid? guid = model.guid;
+ Guid? guid = model.guid;
string mxGuid = model.mxGuid;
var _outMsg = "";
var _outSum = -1;
--
Gitblit v1.9.3