Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

4 天以前 da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -49,6 +49,11 @@
                }

                string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 组织名称='" + Organization + "'");
                //if (oSystemParameter.omodel.WMS_CampanyName.Contains("四维尔"))
                //{
                //     sql1 = string.Format(@"select * from h_v_Gy_UnitList where 1=1 ");

                //}
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 计量单位代码 ", "h_v_Gy_UnitList");