From f1b334ba320250708dcb47a8e2c97015fc07cc27 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 18 八月 2025 16:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/LMESController.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 137724f..4dc6f45 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/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");
}
//娣诲姞鍒楀悕
--
Gitblit v1.9.1