智云MES后端API代码
parent: 3f7bdaca | 补丁 | 提交 | ignore whitespace
yusijie
2024-10-04 f0a0aaf5af0b2c952120a3d0b9f273bf93dd1dee 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
2个文件已删除
9个文件已修改
106 ■■■■■ 已修改文件
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 4 ●●●●● 补丁 | 查看 | 原始文档 | 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


@@ -14,4 +14,3 @@


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/WebAPIController.cs


@@ -435,47 +435,57 @@


        /// <returns></returns>


        [Route("Web/GetXGPassword")]


        [HttpGet]


        public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword)


        public object GetXGPassword(string UserName, string oldPassword, string PassWord, string Repassword,string HCloudUserName,string HCloudUserPsd)


        {


            try


            {


                ClsCN oCn = new ClsCN();


                DataSet oDs = new DataSet();


                //==========


                oDs = oCn.RunProcReturn("select Czmm from  Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");


                if (PassWord.Trim() != Repassword.Trim())


                


                if(PassWord!=null)


                {


                    objjson.code = "0";


                    objjson.count = 0;


                    objjson.Message = "2次密码不一致！";


                    objjson.data = oDs.Tables[0];


                    return objjson; ;


                }


                //===========


                if (oDs == null || oDs.Tables[0].Rows.Count == 0)


                {


                    objjson.code = "0";


                    objjson.count = 0;


                    objjson.Message = "没有这个用户，不能修改密码！";


                    objjson.data = null;


                    return objjson; ;


                }


                else


                {


                    oCn.RunProc("update  Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "' where Czybm='" + UserName.Trim() + "'");


                    oDs = oCn.RunProcReturn("select Czmm from  Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");


                    if (PassWord.Trim() != Repassword.Trim())


                    {


                        objjson.code = "0";


                        objjson.count = 0;


                        objjson.Message = "2次密码不一致！";


                        objjson.data = oDs.Tables[0];


                        return objjson; ;


                    }


                    //===========


                    if (oDs == null || oDs.Tables[0].Rows.Count == 0)


                    {


                        objjson.code = "0";


                        objjson.count = 0;


                        objjson.Message = "没有这个用户，不能修改密码！";


                        objjson.data = null;


                        return objjson; ;


                    }


                    oCn.RunProc("update  Gy_Czygl set Czmm='" + ClsPub.StrToPsd(PassWord.Trim()) + "',HCloudUserName = '" + HCloudUserName+ "',HCloudUserPsd = '" + HCloudUserPsd+ "' where Czybm='" + UserName.Trim() + "'");


                    objjson.code = "0";


                    objjson.count = 1;


                    objjson.Message = "* 密码修改成功！";


                    objjson.data = null;


                    return objjson; 


                }


                else


                {


                    oCn.RunProc("update  Gy_Czygl set HCloudUserName = '" + HCloudUserName + "',HCloudUserPsd = '" + HCloudUserPsd + "' where Czybm='" + UserName.Trim() + "'");


                    objjson.code = "0";


                    objjson.count = 1;


                    objjson.Message = "* 金蝶云账号修改成功！";


                    objjson.data = null;


                    return objjson; ;


                }


            }


            catch (Exception)


            catch (Exception e)


            {




                objjson.code = "0";


                objjson.count = 0;


                objjson.Message = "修改密码异常！";


                objjson.Message = "修改密码异常！" + e.ToString();


                objjson.data = null;


                return objjson; ;


            }




 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user


@@ -4,7 +4,7 @@


-->


<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <History>True|2024-09-30T03:07:22.5376794Z;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>


    <History>True|2024-10-03T02:57:02.9299524Z;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>


    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>


  </PropertyGroup>


  <ItemGroup>


@@ -45,28 +45,28 @@


      <publishTime>02/22/2013 16:43:40</publishTime>


    </File>


    <File Include="bin/BLL.dll">


      <publishTime>09/30/2024 11:06:56</publishTime>


      <publishTime>10/04/2024 18:32:29</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>09/30/2024 11:06:56</publishTime>


      <publishTime>10/04/2024 18:32:29</publishTime>


    </File>


    <File Include="bin/BouncyCastle.Crypto.dll">


      <publishTime>12/18/2020 05:32:28</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>09/30/2024 11:06:54</publishTime>


      <publishTime>10/04/2024 18:32:27</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>09/30/2024 11:06:54</publishTime>


      <publishTime>10/04/2024 18:32:27</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 22:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>09/30/2024 11:06:49</publishTime>


      <publishTime>10/04/2024 18:32:21</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>09/30/2024 11:06:49</publishTime>


      <publishTime>10/04/2024 18:32:21</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>09/30/2024 11:06:50</publishTime>


      <publishTime>10/04/2024 18:32:22</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>09/30/2024 11:06:50</publishTime>


      <publishTime>10/04/2024 18:32:22</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>09/30/2024 11:06:47</publishTime>


      <publishTime>10/04/2024 18:32:19</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>09/30/2024 11:06:47</publishTime>


      <publishTime>10/04/2024 18:32:19</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>09/30/2024 11:06:48</publishTime>


      <publishTime>10/04/2024 18:32:20</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>09/30/2024 11:06:48</publishTime>


      <publishTime>10/04/2024 18:32:20</publishTime>


    </File>


    <File Include="bin/RestSharp.dll">


      <publishTime>08/31/2012 06:22:50</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>09/30/2024 11:06:48</publishTime>


      <publishTime>10/04/2024 18:32:20</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>09/30/2024 11:06:48</publishTime>


      <publishTime>10/04/2024 18:32:20</publishTime>


    </File>


    <File Include="bin/Swashbuckle.Core.dll">


      <publishTime>02/16/2015 01:57:08</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.dll">


      <publishTime>09/30/2024 11:04:17</publishTime>


      <publishTime>10/04/2024 18:30:22</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.pdb">


      <publishTime>09/30/2024 11:04:17</publishTime>


      <publishTime>10/04/2024 18:30:22</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>09/30/2024 11:04:23</publishTime>


      <publishTime>10/04/2024 18:30:31</publishTime>


    </File>


    <File Include="bin/TopSdk.pdb">


      <publishTime>09/30/2024 11:04:23</publishTime>


      <publishTime>10/04/2024 18:30:31</publishTime>


    </File>


    <File Include="bin/WebActivatorEx.dll">


      <publishTime>11/24/2014 19:18:48</publishTime>


    </File>


    <File Include="bin/WebAPI.dll">


      <publishTime>09/30/2024 11:07:20</publishTime>


      <publishTime>10/04/2024 18:33:02</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>09/30/2024 11:07:20</publishTime>


      <publishTime>10/04/2024 18:33:02</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>09/29/2024 19:22:00</publishTime>


      <publishTime>10/03/2024 10:57:02</publishTime>


    </File>


  </ItemGroup>


</Project>




 WebAPI/Web.config


@@ -108,13 +108,13 @@


            </basicHttpBinding>


        </bindings>


        <client>


            <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />


            <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />


        </client>


    </system.serviceModel>


    <applicationSettings>


        <WebAPI.Properties.Settings>


            <setting name="WebAPI_WebS_WebService1" serializeAs="String">


                <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>


                <value>http://localhost/webs-web/webservice1.asmx</value>


            </setting>


        </WebAPI.Properties.Settings>


    </applicationSettings>




 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


@@ -12,7 +12,6 @@


D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache


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




 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ



 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ