From 3c647d6880baafd75db2ce06a2cb953f8fcf9261 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 09 八月 2025 16:38:39 +0800
Subject: [PATCH] 1、提交合并检验 2、到货条码新增合并明细页签
---
WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
index d21ba21..dd35489 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs
@@ -213,10 +213,14 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.Guid; //鍒拌揣鍗曚富閿�
- string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
+ //string shDh = model.PaperBillNo; //閫佽揣鍗曞彿
+ string shDh = model.bcsl;
string bz = model.Remark; //澶囨敞
string gysId = model.SuppId; //渚涘簲鍟�
string orgId = model.OrgId; //鏀舵枡缁勭粐
+
+ // string depot = model.Depot;//浠撳簱
+
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
@@ -252,14 +256,12 @@
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("@inEdtUserGuid", _userGuid),
new("@inLineList", _sb.ToString())
};
@@ -377,6 +379,7 @@
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid", _guid),
new("@inFieldValue", 1),
+ new("@inFieldName", ""),
new("@in1", ""),
new("@in2", "")
};
@@ -385,8 +388,11 @@
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)
{
@@ -460,8 +466,65 @@
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>
/// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
/// </summary>
--
Gitblit v1.9.3