From c72e92887bc9c57c596d08d53818cc2a357de6aa Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期四, 13 十一月 2025 19:17:39 +0800
Subject: [PATCH] 1
---
WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs | 100 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 42 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
index 79a856c..38eca56 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs
@@ -149,21 +149,25 @@
string dchzlx = model.dchzlx;//璋冨嚭璐т富绫诲瀷
string drhzlx = model.drhzlx;//璋冨叆璐т富绫诲瀷
string inRemark = model.inRemark;//澶囨敞
+ string gdbh = model.gdbh;
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()) + _split
+ + m.gd + _split
+ + m.gdmx + _split
+ + m.bgy;
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
@@ -197,7 +201,8 @@
new("@drhzlx", drhzlx),
new("@inRemark", inRemark),
new("@inEdtUserGuid", _userGuid),
- new("@inLineList", _sb.ToString())
+ new("@inLineList", _sb.ToString()),
+ new("@gdbh",gdbh)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -213,8 +218,7 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(),
- "prc_move_edt error锛�" + ex.Message);
+ LogHelper.Debug(ToString(),"prc_move_edt error锛�" + ex.Message);
mObj.outMsg = ex.Message;
mObj.outSum = -1;
}
@@ -255,26 +259,23 @@
{
new("@outMsg", SqlDbType.NVarChar, 300),
new("@outSum", SqlDbType.Int),
- new("@inOrderGuid",
- CheckGuid(guid)
- ? guid
- : DBNull.Value),
+ new("@inOrderGuid", 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_move_del error锛�" + ex.Message);
+ LogHelper.Debug(ToString(),"prc_move_del error锛�" + ex.Message);
_outMsg = ex.Message;
_outSum = -1;
}
@@ -286,8 +287,7 @@
}
if (_outSum <= 0)
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,_outMsg);
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
}
@@ -315,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),
@@ -326,7 +326,9 @@
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
+ {
cmd.Parameters.Add(parameter);
+ }
cmd.ExecuteNonQuery();
m.outMsg = parameters[0].Value.ToString();
m.outSum = int.Parse(parameters[1].Value.ToString());
@@ -335,8 +337,7 @@
{
LogHelper.Debug(ToString(), "prc_move_submit:" + 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
{
@@ -360,6 +361,7 @@
string sortName = model.sortName;
string keyWhere = model.keyWhere;
string workId = model.workId;
+ string ftype = model.ftype;
var dset = new DataSet();
try
{
@@ -373,17 +375,19 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- new("@workId", workId),
- new("@inP1", ""),
- new("@inP2", "")
- };
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@workId", workId),
+ new("@inP1", ""),
+ new("@inP2", "")
+ };
foreach (var parameter in parameters)
+ {
cmd.Parameters.Add(parameter);
+ }
using (var dt = new SqlDataAdapter(cmd))
{
dt.Fill(dset, "0");
@@ -399,17 +403,20 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@inCurrentPage", currentPage),
- new("@inEveryPageSize", everyPageSize),
- new("@inSortName", sortName),
- new("@inSortOrder", ""),
- new("@inQueryWhere", keyWhere),
- new("@workId", workId),
- new("@inP1", ""),
- new("@inP2", "")
- };
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@workId", workId),
+ new("@inP1", ""),
+ new("@inP2", "")
+ };
foreach (var parameter in parameters)
+ {
cmd.Parameters.Add(parameter);
+ }
+
using (var dt = new SqlDataAdapter(cmd))
{
dt.Fill(dset, "0");
@@ -533,6 +540,7 @@
{
var intArray = model.lst.ToObject<string[]>();
string workId = model.workId;
+ string ftype = model.ftype;
var sbLine = new StringBuilder();
foreach (var str in intArray)
{
@@ -546,6 +554,10 @@
{
if (workId == "1")
{
+ if (ftype == "濮斿(WW)")
+ {
+ return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Exception, "濮斿");
+ }
using (var cmd = new SqlCommand("[prc_db_scdd_select_to_grid]", conn))
{
try
@@ -575,6 +587,10 @@
}
else
{
+ if (ftype == "鏍囧噯(NORMAL)")
+ {
+ return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Exception, "鐢熶骇");
+ }
using (var cmd = new SqlCommand("[prc_db_wwdd_select_to_grid]", conn))
{
try
--
Gitblit v1.9.3