合并分支

chenhaozhe

2026-04-16 82b57de13d9449c48944db91d7f17b477169c324

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -49,11 +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 (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");