Merge remote-tracking branch 'origin/master'

啊鑫

5 天以前 2ba5117206c152cece2e5ac40067a6232dfb2870

 WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs

@@ -31,6 +31,7 @@
    }



    #region CRUD

    /// <summary>
@@ -88,7 +89,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,
@@ -233,7 +234,6 @@
                _sb.Append("~");
            _sb.Append(_line);
        }

        dynamic mObj = new ExpandoObject();
        mObj.outMsg = "";
        mObj.outSum = -1;
@@ -290,12 +290,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);
    }


@@ -407,7 +404,6 @@
                }
            }
        }

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

@@ -501,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)
@@ -512,7 +508,6 @@
                        dt.Fill(dset, "0");
                    }
                }

                conn.Close();
            }
        }
@@ -610,6 +605,7 @@
            "读取成功！");
    }


    #endregion


@@ -646,9 +642,9 @@
                        new("@inSortName", sortName),
                        new("@inSortOrder", ""),
                        new("@inQueryWhere", keyWhere),
                        new("@inBusType", inBusType), //1是采购，2是委外
                        new("@inSupId", inSupId), //供应商
                        new("@inP1", inReceiveOrgId), //组织
                        new("@inBusType", inBusType),//1是采购，2是委外
                        new("@inSupId", inSupId),//供应商
                        new("@inP1", inReceiveOrgId),//组织
                        new("@inP2", "")
                    };
                    foreach (var parameter in parameters)
@@ -659,7 +655,6 @@
                        dt.Fill(dset, "0");
                    }
                }

                conn.Close();
            }
        }
@@ -698,7 +693,7 @@


    /// <summary>
    ///     根据单号读取srm明细
    /// 根据单号读取srm明细
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
@@ -720,9 +715,9 @@
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@pi_shdh", pi_shdh),
                        new("@inP1", ""),
                        new("@inP2", "")
                        new("@pi_shdh",pi_shdh),
                        new("@inP1",""),
                        new("@inP2",""),
                    };
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);