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.Warehouse/Services/MesInvItemMovesManager.cs | 57 ++++++++++++++++++++++++---------------------------------
1 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
index d4fae74..87b3d99 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
@@ -81,7 +81,7 @@
{
LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ ReturnCode.Exception, ex.Message);
}
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
@@ -141,36 +141,33 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.guid; //涓婚敭
- string djlx = model.djlx; //鍗曟嵁绫诲瀷
- string ywlx = model.ywlx; //涓氬姟绫诲瀷
- string dbfx = model.dbfx; //璋冩嫧鏂瑰悜
- string sqOrg = model.sqOrg; //瀹¤缁勭粐
- string dblx = model.dblx; //璋冩嫧绫诲瀷
- string dchzlx = model.dchzlx; //璋冨嚭璐т富绫诲瀷
- string drhzlx = model.drhzlx; //璋冨叆璐т富绫诲瀷
- string inRemark = model.inRemark; //澶囨敞
+ string djlx = model.djlx;//鍗曟嵁绫诲瀷
+ string ywlx = model.ywlx;//涓氬姟绫诲瀷
+ string dbfx = model.dbfx;//璋冩嫧鏂瑰悜
+ string sqOrg = model.sqOrg;//瀹¤缁勭粐
+ string dblx = model.dblx;//璋冩嫧绫诲瀷
+ string dchzlx = model.dchzlx;//璋冨嚭璐т富绫诲瀷
+ string drhzlx = model.drhzlx;//璋冨叆璐т富绫诲瀷
+ string inRemark = model.inRemark;//澶囨敞
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
{
string _guid = m.Guid.ToString();
var _line = m.ItemId + _split
- + m.Sqsl + _split
- + m.Bz + _split
- + m.dczz + _split
- + m.dcck + _split
- + m.drzz + _split
- + m.drck + _split
- + m.dchz + _split
- + m.drhz + _split
- + (CheckGuid(_guid)
- ? _guid
- : Guid.Empty.ToString());
+ + m.Sqsl + _split
+ + m.Bz + _split
+ + m.dczz + _split
+ + m.dcck + _split
+ + m.drzz + _split
+ + m.drck + _split
+ + m.dchz + _split
+ + m.drhz + _split
+ + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
}
-
dynamic mObj = new ExpandoObject();
mObj.outMsg = "";
mObj.outSum = -1;
@@ -190,8 +187,7 @@
new("@outSum", SqlDbType.Int),
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
- new("@inOrderGuid",
- CheckGuid(guid) ? guid : DBNull.Value),
+ new("@inOrderGuid",UtilityHelper.CheckGuid(guid)? guid : DBNull.Value),
new("@djlx", djlx),
new("@ywlx", ywlx),
new("@dbfx", dbfx),
@@ -202,7 +198,7 @@
new("@inRemark", inRemark),
new("@inEdtUserGuid", _userGuid),
new("@inLineList", _sb.ToString())
- };
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
parameters[2].Direction = ParameterDirection.Output;
@@ -228,12 +224,9 @@
}
}
}
-
if (mObj.outSum <= 0)
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception,
- mObj.outMsg);
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
- mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
}
@@ -322,7 +315,7 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outMsg", SqlDbType.NVarChar, 300),
new("@outSum", SqlDbType.Int),
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid", _guid),
@@ -340,8 +333,7 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(),
- "prc_move_submit:" + ex.Message);
+ LogHelper.Debug(ToString(), "prc_move_submit:" + ex.Message);
m.outMsg = ex.Message;
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
ex.Message);
@@ -352,7 +344,6 @@
}
}
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
}
\ No newline at end of file
--
Gitblit v1.9.3