From 8687516890dc64f5af301b75ef656d99c5c91055 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 三月 2021 09:40:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBAPI
---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 6 +-
WebAPI/Controllers/LMESController.cs | 71 +++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index af00bde..f9c0821 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -350,6 +350,77 @@
}
/// <summary>
+ /// 杩斿洖濮斿宸ュ崟鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("LEMS/MES_WW_EntrustWorkOrderBillMain_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustWorkOrderBillMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ }
+ else
+ {
+ string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("LEMS/MES_Sc_StationOutBillMain_Json")]
+ [HttpGet]
+ public object MES_Sc_StationOutBillMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
+ }
+ else
+ {
+ string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
/// 杩斿洖宸ュ簭濮斿鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 3f04c6c..bfefce3 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -163,10 +163,10 @@
<publishTime>03/24/2021 13:26:42</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/12/2020 17:45:15</publishTime>
+ <publishTime>03/24/2021 15:45:15</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>03/24/2021 15:45:15</publishTime>
+ <publishTime>03/25/2021 14:47:27</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -340,7 +340,7 @@
<publishTime>03/24/2021 16:19:16</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/24/2021 16:33:09</publishTime>
+ <publishTime>03/24/2021 15:48:50</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1