Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2026-02-28 7b9d53540c9b58ed78a516f592d970b96dd79c6e

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -8,13 +8,9 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
<<<<<<< HEAD
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
=======
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40

 WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml

@@ -10,11 +10,6 @@
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
<<<<<<< HEAD
    <PublishUrl>D:\gz\wy\MES-WEB-API</PublishUrl>
=======
    <PublishUrl>E:\gz\网站发布\MES-WEB-API</PublishUrl>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user

@@ -4,13 +4,8 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <History>True|2026-02-28T02:31:32.5199626Z;True|2026-02-28T09:24:47.0353907+08:00;True|2026-02-28T09:18:08.3189382+08:00;True|2026-02-28T09:12:57.9705097+08:00;True|2026-02-28T09:11:45.6332249+08:00;True|2026-02-28T09:10:52.2970685+08:00;False|2026-02-28T09:10:36.7739833+08:00;True|2026-02-27T16:36:29.9648231+08:00;True|2026-02-27T16:34:26.3915967+08:00;True|2026-02-27T16:30:24.8243216+08:00;True|2026-02-27T16:28:31.5194363+08:00;True|2026-02-27T16:26:42.5472554+08:00;True|2026-02-27T16:25:28.9632012+08:00;True|2026-02-27T16:22:43.7354490+08:00;True|2026-02-27T16:19:08.5178580+08:00;True|2026-02-27T16:16:41.8327071+08:00;True|2026-02-27T15:51:20.9252560+08:00;True|2026-02-27T15:49:29.0739490+08:00;True|2026-02-27T15:45:14.7127787+08:00;True|2026-02-27T15:35:28.8564182+08:00;True|2026-02-27T14:14:31.7930971+08:00;True|2026-02-27T14:11:27.1839644+08:00;True|2026-02-27T13:03:01.6565352+08:00;True|2026-02-27T13:02:48.3485868+08:00;True|2026-02-27T11:31:22.3021282+08:00;False|2026-02-27T11:31:08.4603091+08:00;</History>
    <_PublishTargetUrl>D:\gz\wy\MES-WEB-API</_PublishTargetUrl>
=======
    <History>True|2026-02-06T00:31:03.6312878Z;True|2026-02-06T08:23:52.9733115+08:00;False|2026-02-06T08:23:11.0102034+08:00;True|2026-02-05T19:21:05.2158159+08:00;True|2026-02-05T19:12:33.5524772+08:00;False|2026-02-05T19:12:02.9803456+08:00;True|2026-02-05T16:37:50.6355254+08:00;True|2026-02-05T16:34:32.0212507+08:00;True|2026-02-05T16:20:41.9707118+08:00;True|2026-02-05T15:44:12.8408268+08:00;True|2026-02-05T15:29:35.7671005+08:00;True|2026-02-05T15:20:42.9402452+08:00;True|2026-02-05T15:13:13.1744544+08:00;True|2026-02-05T14:50:39.7687392+08:00;True|2026-02-05T10:40:08.2854769+08:00;True|2026-02-03T09:19:29.6074097+08:00;True|2026-02-03T08:05:38.9025470+08:00;False|2026-02-03T08:04:54.8666303+08:00;True|2026-01-26T10:36:06.6951875+08:00;False|2026-01-26T10:35:27.2587580+08:00;</History>
    <_PublishTargetUrl>E:\gz\网站发布\MES-WEB-API</_PublishTargetUrl>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -50,49 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:46</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>02/27/2026 11:29:46</publishTime>
=======
      <publishTime>02/06/2026 08:30:50</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>02/06/2026 08:30:50</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:45</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>02/27/2026 11:29:45</publishTime>
=======
      <publishTime>02/06/2026 08:30:47</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>02/06/2026 08:30:47</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:42</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>02/27/2026 11:29:42</publishTime>
=======
      <publishTime>02/04/2026 18:25:43</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>02/04/2026 18:25:43</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -164,17 +138,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:43</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>02/27/2026 11:29:43</publishTime>
=======
      <publishTime>02/05/2026 09:48:42</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>02/05/2026 09:48:42</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -210,7 +177,6 @@
      <publishTime>11/13/2012 12:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:41</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
@@ -221,50 +187,24 @@
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>02/27/2026 11:29:42</publishTime>
=======
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>02/04/2026 18:25:42</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:42</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>02/27/2026 11:29:42</publishTime>
=======
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>02/04/2026 18:25:42</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:40</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>02/27/2026 11:29:40</publishTime>
=======
      <publishTime>02/04/2026 18:16:05</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>02/04/2026 18:16:05</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -375,23 +315,15 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:29:43</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>02/27/2026 11:29:43</publishTime>
=======
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>02/04/2026 16:46:28</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
<<<<<<< HEAD
      <publishTime>02/28/2026 10:31:28</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
@@ -399,15 +331,6 @@
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/28/2026 10:31:31</publishTime>
=======
      <publishTime>02/06/2026 08:30:57</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>02/06/2026 08:30:57</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/06/2026 08:31:01</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -512,27 +435,16 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="packages.config">
<<<<<<< HEAD
      <publishTime>01/27/2026 08:36:04</publishTime>
=======
      <publishTime>02/04/2026 16:46:28</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/09/2025 08:11:33</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.js">
<<<<<<< HEAD
      <publishTime>01/27/2026 08:35:50</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>01/27/2026 08:35:50</publishTime>
=======
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="Scripts/jquery.signalR-2.2.2.min.js">
      <publishTime>02/04/2026 16:46:28</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -643,11 +555,7 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web.config">
<<<<<<< HEAD
      <publishTime>02/27/2026 11:31:21</publishTime>
=======
      <publishTime>02/05/2026 10:40:07</publishTime>
>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

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

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt

@@ -14,3 +14,4 @@
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ