Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService

cnf

2025-08-14 ace3f2e2f6ca71647fe7938b24fa096e680f48e8

Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService

 WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs

@@ -466,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>

 WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs

@@ -115,6 +115,7 @@
                m = dr.RowToDynamic();
                m.list1 = dset.Tables[1].TableToDynamicList();
                m.list2 = dset.Tables[2].TableToDynamicList();
                m.list3 = dset.Tables[3].TableToDynamicList();
            }
        }
        catch (Exception ex)
@@ -125,7 +126,7 @@
                    "读取成功！");
    }

    /// <summary>
    /*  /// <summary>
    /// 删除条码
    /// </summary>
    /// <param name="model"></param>
@@ -183,6 +184,76 @@
                _outMsg);
        return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
    }
  */
    /// <summary>


    /// <summary>
    /// 删除条码
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<int?> DeleteBarcode([FromBody] dynamic model)
    {
        int? rtnInt = (int)ReturnCode.Default;
        string guidList = model.guidList;
        string aboutType = model.aboutType;
        string aboutGuid = model.aboutGuid;
        var _outMsg = "";
        var _outSum = -1;

        // 判断aboutGuid是否为有效的uniqueidentifier
        bool is_validGuid = Guid.TryParse(aboutGuid, out _);
        // 根据验证结果选择对应的存储过程
        string storedProcedureName = is_validGuid ? "[prc_barcode_del]" : "[prc_barcode_del_hb]";

        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand(storedProcedureName, conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                    new("@outMsg", SqlDbType.NVarChar, 300),
                    new("@outSum", SqlDbType.Int),
                    new("@inOrderGuid", aboutGuid),
                    new("@inEdtUserGuid", _userGuid),
                    new("@guidList", guidList),
                    new("@aboutType", aboutType)
                };
                    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(),
                        $"{storedProcedureName} error：{ex.Message}");
                    _outMsg = ex.Message;
                    _outSum = -1;
                }
                finally
                {
                    conn.Close();
                }
            }
        }

        if (_outSum <= 0)
            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
                _outMsg);
        return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
    }



    /// <summary>
    /// 选择条码