From 9debcc94042b7d76767099d6780afb6d2f17275c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 27 十二月 2024 10:15:45 +0800
Subject: [PATCH] 物料分页优化
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 1
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42 ++++++++++----------
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 1
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2 +
WebAPI/Web.config | 2
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/WebAPIController.cs | 45 ++++++++++++++++++++++
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
12 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 4108a88..8de43db 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -9,3 +9,4 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 6763499..c298d0f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -134,12 +134,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization +"'," + "''", "h_p_Gy_MaterialList");
}
else
{
+ sWhere = sWhere.Replace("'", "''");
ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Gy_MaterialList");
}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b5b974c..a81e782 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -388,6 +388,51 @@
}
}
/// <summary>
+ /// 鐧诲綍鏍规嵁ic鍗¤幏鍙栦俊鎭�
+ /// </summary>
+ /// <param name="HBarCode"></param>
+ /// <returns></returns>
+ [Route("Web/GetUserByICCard")]
+ [HttpGet]
+ public object GetUserByICCard(string HBarCode)
+ {
+ try
+ {
+ DataSet ds = null;
+ ClsCN oCnLoc = new ClsCN();
+ DAL.ClsUser oUser = new DAL.ClsUser();
+ string sql = string.Format(@" select a.* from h_v_Gy_Czygl_Login a
+ where a.HICNumber = '{0}'", HBarCode);
+ ds = oCnLoc.RunProcReturn(sql, "h_v_Gy_Czygl_Login");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鏃犳ic鍗″搴斿憳宸ヤ俊鎭紒";
+ objjson.data = null;
+ return objjson;
+ }
+
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "淇℃伅鑾峰彇鎴愬姛锛�";
+ objjson.data = ds.Tables[0];
+ return objjson;
+
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
+ objjson.data = null;
+ return objjson; ;
+ }
+ }
+
+ /// <summary>
/// 鑿滃崟鏍�
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index e76231d..0e16662 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/20/2024 16:25:53</publishTime>
+ <publishTime>12/25/2024 16:30:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/20/2024 16:25:53</publishTime>
+ <publishTime>12/25/2024 16:30:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/20/2024 16:25:51</publishTime>
+ <publishTime>12/25/2024 16:30:36</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/20/2024 16:25:51</publishTime>
+ <publishTime>12/25/2024 16:30:36</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/20/2024 16:25:45</publishTime>
+ <publishTime>12/25/2024 16:30:30</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/20/2024 16:25:45</publishTime>
+ <publishTime>12/25/2024 16:30:30</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/20/2024 16:25:46</publishTime>
+ <publishTime>12/25/2024 16:30:32</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/20/2024 16:25:46</publishTime>
+ <publishTime>12/25/2024 16:30:32</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/20/2024 16:25:43</publishTime>
+ <publishTime>12/25/2024 16:30:27</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/20/2024 16:25:43</publishTime>
+ <publishTime>12/25/2024 16:30:27</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/20/2024 16:25:44</publishTime>
+ <publishTime>12/25/2024 16:30:28</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/20/2024 16:25:44</publishTime>
+ <publishTime>12/25/2024 16:30:28</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/20/2024 16:25:44</publishTime>
+ <publishTime>12/25/2024 16:30:28</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/20/2024 16:25:44</publishTime>
+ <publishTime>12/25/2024 16:30:28</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/20/2024 16:23:35</publishTime>
+ <publishTime>12/25/2024 16:27:54</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/20/2024 16:23:35</publishTime>
+ <publishTime>12/25/2024 16:27:54</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/20/2024 16:23:41</publishTime>
+ <publishTime>12/25/2024 16:28:00</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/20/2024 16:23:41</publishTime>
+ <publishTime>12/25/2024 16:28:00</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/20/2024 16:26:26</publishTime>
+ <publishTime>12/25/2024 16:31:11</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/20/2024 16:26:26</publishTime>
+ <publishTime>12/25/2024 16:31:11</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/06/2024 13:13:33</publishTime>
+ <publishTime>12/23/2024 11:47:22</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 77d3f96..352a956 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <add key="surl" value="http://localhost/webs-web/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index d92c15a..e3ca80a 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index a503aed..ef0f293 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d6e21aa
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index aa49cca..27731b0 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -9,3 +9,4 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index d92c15a..e3ca80a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index a503aed..ef0f293 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1