From 959e56df41816bb4d3f28090500c8226d78d7286 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 15 四月 2026 14:21:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index 93d1113..0e2062e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/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");
--
Gitblit v1.9.1