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/MesInvItemArnManager.cs | 222 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 150 insertions(+), 72 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index dd35489..619199b 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -213,14 +213,11 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.Guid; //鍒拌揣鍗曚富閿�
- //string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
- string shDh = model.bcsl;
+ string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
string bz = model.Remark; //澶囨敞
string gysId = model.SuppId; //渚涘簲鍟�
string orgId = model.OrgId; //鏀舵枡缁勭粐
-
- // string depot = model.Depot;//浠撳簱
-
+ int isSrm = model.IsSrm;
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
@@ -256,12 +253,15 @@
new("@outSum", SqlDbType.Int),
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
- new("@inOrderGuid", UtilityHelper.CheckGuid(guid) ? guid : DBNull.Value),
+ new("@inOrderGuid",
+ UtilityHelper.CheckGuid(guid)
+ ? guid
+ : DBNull.Value),
new("@inShdh", shDh),
new("@inBz", bz),
new("@inGysId", gysId),
new("@OrgId", orgId),
- // new("@inDepot",depot),
+ new("@isSrm", isSrm),
new("@inEdtUserGuid", _userGuid),
new("@inLineList", _sb.ToString())
};
@@ -311,7 +311,7 @@
foreach (string _val in guidList) sbMx.Append(_val);
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand("[prc_cgdhd_tui]", conn))
+ using (var cmd = new SqlCommand("[prc_cgyt_dj_add]", conn))
{
try
{
@@ -337,7 +337,7 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(),
- "prc_cgdhd_tui error锛�" + ex.Message);
+ "prc_cgyt_dj_add error锛�" + ex.Message);
_outMsg = ex.Message;
_outSum = -1;
}
@@ -379,7 +379,6 @@
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid", _guid),
new("@inFieldValue", 1),
- new("@inFieldName", ""),
new("@in1", ""),
new("@in2", "")
};
@@ -388,11 +387,8 @@
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());
-
}
catch (Exception ex)
{
@@ -466,64 +462,7 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
- /// <summary>
- /// 鍚堝苟鎻愪氦妫�楠� 2025-08-06 kyy
- /// </summary>
- /// <param name="mode"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> EditModelSubmitHb([FromBody] dynamic mode)
- {
- string _guid = mode.guid;
- dynamic m = new ExpandoObject();
- m.outSum = -1;
- m.outMsg = "";
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
- {
- using (var cmd = new SqlCommand("prc_cgdhd_submit_hb", conn))
- {
- try
- {
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
- new("@outMsg", SqlDbType.NVarChar, 2500),
- new("@outSum", SqlDbType.Int),
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", _guid),
- new("@inFieldValue", 1),
- new("@inFieldName", ""),
- new("@in1", ""),
- new("@in2", "")
- };
- 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());
-
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(),
- "prc_cgdhd_submit_hb error锛�" + ex.Message);
- m.outMsg = ex.Message;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
- }
- finally
- {
- conn.Close();
- }
- }
- }
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- }
/// <summary>
/// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
@@ -558,7 +497,7 @@
new("@inQueryWhere", keyWhere),
new("@inBusType", inBusType),
new("@inSupId", inSupId),
- new("@inP1", inReceiveOrgId),
+ new("@inP1", inReceiveOrgId),//缁勭粐
new("@inP2", "")
};
foreach (var parameter in parameters)
@@ -666,8 +605,147 @@
"璇诲彇鎴愬姛锛�");
}
+
#endregion
-
+ #region srm
+
+ /// <summary>
+ /// 璇诲彇srm
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> SelectSrm([FromBody] dynamic model)
+ {
+ int currentPage = model.currentPage;
+ int everyPageSize = model.everyPageSize;
+ string sortName = model.sortName;
+ string keyWhere = model.keyWhere;
+ string inBusType = model.inBusType;
+ string inSupId = model.inSupId;
+ string inReceiveOrgId = model.inReceiveOrgId;
+ var dset = new DataSet();
+ try
+ {
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_sel_dhd_by_xky]", conn))
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@inCurrentPage", currentPage),
+ new("@inEveryPageSize", everyPageSize),
+ new("@inSortName", sortName),
+ new("@inSortOrder", ""),
+ new("@inQueryWhere", keyWhere),
+ new("@inBusType", inBusType),//1鏄噰璐紝2鏄澶�
+ new("@inSupId", inSupId),//渚涘簲鍟�
+ new("@inP1", inReceiveOrgId),//缁勭粐
+ new("@inP2", "")
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt =
+ new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ conn.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "SelectSrm error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
+
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ {
+ var intTotal =
+ int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0
+ ? intTotal / everyPageSize + 1
+ : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
+ }
+
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿璇诲彇srm鏄庣粏
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<List<dynamic>> SelectSrmTo([FromBody] dynamic model)
+ {
+ string pi_shdh = model.inShdh;
+ string inP1 = model.inP1;
+ string inP2 = model.inP2;
+ var lst = new List<dynamic>();
+ var dset = new DataSet();
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_sel_dhdmx_by_xky]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_shdh",pi_shdh),
+ new("@inP1",""),
+ new("@inP2",""),
+ };
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ using (var dt =
+ new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_sel_dhdmx_by_xky error锛�" + ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ lst = dset.Tables[0].TableToDynamicList();
+
+ return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3