智云MES后端API代码
parent: fd2d833b | 补丁 | 提交 | ignore whitespace
wtt
2024-12-27 9debcc94042b7d76767099d6780afb6d2f17275c 
物料分页优化
10个文件已修改
2个文件已添加
93 ■■■■■ 已修改文件
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史 
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ



 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




 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");


                }






 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>




 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>




 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"/>--><!--斯莫尔-->


        




 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ



 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ



 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache

Binary files differ



 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




 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ



 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ