Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 2ba5117206c152cece2e5ac40067a6232dfb2870

 WebApi/GS.QC/Service/RkqcSqManager.cs

@@ -10,7 +10,8 @@
using Microsoft.AspNetCore.Mvc;
using static Gs.Toolbox.UtilityHelper;

namespace GS.QC.Service;
namespace GS.QC.Service
{

/// <summary>
///     超期检验申请
@@ -85,7 +86,6 @@
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Exception, ex.Message);
        }

        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
            ReturnCode.Success, "读取成功");
    }
@@ -131,7 +131,6 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
        }

        if (m != null)
            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
                "读取成功！");
@@ -152,20 +151,17 @@
        string remark = model.Remark; //备注
        string billType = model.BillType; //申请类型
        string kcOrgId = model.KcOrgId; //
        var _sb = new StringBuilder();
        var _split = "|";
            StringBuilder _sb = new StringBuilder();
            string _split = "|";
        foreach (var m in model.list)
        {
            string _guid = m.Guid.ToString();
            var _line = m.ItemBarCode + _split
                                      + (CheckGuid(_guid)
                                          ? _guid
                                          : Guid.Empty.ToString());
                    + (UtilityHelper.CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
            if (_sb.Length > 0)
                _sb.Append("~");
            _sb.Append(_line);
        }

        dynamic mObj = new ExpandoObject();
        mObj.outMsg = "";
        mObj.outSum = -1;
@@ -185,8 +181,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("@remark", remark),
                        new("@billType", billType),
                        new("@kcOrgId", kcOrgId),
@@ -218,12 +213,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);
    }

    /// <summary>
@@ -252,7 +244,7 @@
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.Int),
                        new("@inOrderGuid",
                            CheckGuid(guid)
                            UtilityHelper.CheckGuid(guid)
                                ? guid
                                : DBNull.Value),
                        new("@inEdtUserGuid", _userGuid),
@@ -327,7 +319,6 @@
                        dt.Fill(dset, "0");
                    }
                }

                conn.Close();
            }
        }
@@ -366,6 +357,7 @@


    /// <summary>
        ///   
    /// </summary>
    /// <param name="mode"></param>
    /// <returns></returns>
@@ -374,7 +366,7 @@
    {
        string _guid = mode.guid;
        string _inFieldValue = mode.inFieldValue;
        var _proName = "cqjy_submit";
            string _proName = "cqjy_submit";
        dynamic m = new ExpandoObject();
        m.outSum = -1;
        m.outMsg = "";
@@ -406,11 +398,9 @@
                }
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(),
                        "cqjy_submit error：" + ex.Message);
                        LogHelper.Debug(ToString(), "cqjy_submit error：" + 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
                {
@@ -418,7 +408,7 @@
                }
            }
        }

        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "操作成功！");
    }
}
}