1

llj

20 小时以前 e3f218a023f0625f415a1526b278636c3e39aa4f

 WebAPI/Controllers/LMESController.cs

@@ -584,6 +584,7 @@
        public object MES_ProcessExchangeBillList_PG(string sWhere, string user, int OperationType)
        {
            DataSet ds;
            string sql = "";
            try
            {
                List<object> columnNameList = new List<object>();
@@ -597,6 +598,8 @@
                    return objJsonResult;
                }

                sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere + " order by hmainid desc ";

                if (OperationType == 1)
                {
                    //获取系统参数
@@ -609,6 +612,10 @@
                            sWhere += "  ";

                        }
                        else if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                        {
                            sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere;
                        }
                        else
                        {
                            sWhere += "  ";
@@ -616,7 +623,7 @@
                    }

                    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                    ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeArrangementList_PG");
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeArrangementList_PG");
                }
                else
                {
@@ -630,10 +637,14 @@


                        }
                        else if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                        {
                            sql = "select top 1000 * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere;
                        }
                    }

                    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                    ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeArrangementList_PG where 1 = 1 " + sWhere, "h_v_Sc_ProcessExchangeArrangementList_PG");
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeArrangementList_PG");
                }

                //添加列名