Merge remote-tracking branch 'origin/master'

啊鑫

6 天以前 2ba5117206c152cece2e5ac40067a6232dfb2870

 WebApi/Gs.Warehouse/Services/MesInvItemMovesManager.cs

@@ -81,7 +81,7 @@
        {
            LogHelper.Debug(ToString(), ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Exception, ex.Message);
          ReturnCode.Exception, ex.Message);
        }

        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
@@ -141,36 +141,33 @@
    public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
    {
        Guid? guid = model.guid; //主键
        string djlx = model.djlx; //单据类型
        string ywlx = model.ywlx; //业务类型
        string dbfx = model.dbfx; //调拨方向
        string sqOrg = model.sqOrg; //审请组织
        string dblx = model.dblx; //调拨类型
        string dchzlx = model.dchzlx; //调出货主类型
        string drhzlx = model.drhzlx; //调入货主类型
        string inRemark = model.inRemark; //备注
        string djlx = model.djlx;//单据类型
        string ywlx = model.ywlx;//业务类型
        string dbfx = model.dbfx;//调拨方向
        string sqOrg = model.sqOrg;//审请组织
        string dblx = model.dblx;//调拨类型
        string dchzlx = model.dchzlx;//调出货主类型
        string drhzlx = model.drhzlx;//调入货主类型
        string inRemark = model.inRemark;//备注
        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());
            if (_sb.Length > 0)
                _sb.Append("~");
            _sb.Append(_line);
        }

        dynamic mObj = new ExpandoObject();
        mObj.outMsg = "";
        mObj.outSum = -1;
@@ -190,8 +187,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("@djlx", djlx),
                        new("@ywlx", ywlx),
                        new("@dbfx", dbfx),
@@ -202,7 +198,7 @@
                        new("@inRemark", inRemark),
                        new("@inEdtUserGuid", _userGuid),
                        new("@inLineList", _sb.ToString())
                    };
                };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    parameters[2].Direction = ParameterDirection.Output;
@@ -228,12 +224,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);
    }


@@ -322,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),
@@ -340,8 +333,7 @@
                }
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(),
                        "prc_move_submit:" + ex.Message);
                    LogHelper.Debug(ToString(), "prc_move_submit:" + ex.Message);
                    m.outMsg = ex.Message;
                    return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
                        ex.Message);
@@ -352,7 +344,6 @@
                }
            }
        }

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