From f6ac9b9bc3c3feea605202923f7f0a49f284f21a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 21 一月 2021 16:39:19 +0800
Subject: [PATCH] 增加工艺路线列表和生产任务单列表
---
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user | 13 ++++++++-----
WebAPI/WebAPI.csproj.user | 2 +-
WebAPI/Controllers/LMESController.cs | 9 ++++++---
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 55f51ae..698ffe6 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -216,7 +216,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
}
else
{
@@ -224,11 +224,14 @@
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
}
-
}
catch (Exception e)
{
- ds = null;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
return GetObjectJson(ds);
}
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
index 3846eae..d7ef21e 100644
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
@@ -27,6 +27,9 @@
<File Include="bin/DAL.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 14:52:40</publishTime>
+ </File>
<File Include="bin/DBUtility.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
@@ -172,13 +175,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/21/2021 11:31:26</publishTime>
+ <publishTime>01/21/2021 15:10:47</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/21/2021 11:31:26</publishTime>
+ <publishTime>01/21/2021 15:10:47</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/21/2021 11:31:29</publishTime>
+ <publishTime>01/21/2021 15:10:51</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -250,7 +253,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/19/2021 15:58:45</publishTime>
+ <publishTime>01/21/2021 13:19:40</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>03/16/2020 13:09:50</publishTime>
@@ -382,7 +385,7 @@
<publishTime>11/16/2020 15:22:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/19/2021 16:03:42</publishTime>
+ <publishTime>01/21/2021 13:33:19</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 795b1e4..27721ad 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -8,7 +8,7 @@
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>PDAWeb</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
--
Gitblit v1.9.1