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

yusijie

2026-04-10 31223f50a23b2c3316da73057cf991c312e808bb

 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");