物料导入bug修复

wtt

2024-09-20 9fa9149a603c5c6d54e6d547f78ef16514e94b57

物料导入bug修复

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -9,7 +9,6 @@
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
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
E:\智云mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1043,7 +1043,11 @@
                    oItem.HQtyMin = int.Parse(item["最大订货量"].ToString() == "" ? "0" : item["最大订货量"].ToString());
                    oItem.HEngName = item["英文名称"].ToString();
                    oItem.HEngModel = item["英文规格"].ToString();
                    //常规赋值
                    //常规赋值赋空值防止报错
                    oItem.HMaterTypeID = 0;
                    oItem.HColorRemark = "";
                    oItem.HColorNo = "";
                    oItem.HMaterRuleType = "";
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
                    if (sShortNumber.Trim() == "")
@@ -1078,7 +1082,8 @@
                    {

                        int HItemID = int.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
                        oBill.ModifyByID(HItemID);
                        oBill.oModel.HItemID = HItemID;
                        oBill.ModifyByID(oBill.oModel.HItemID);

                    }


 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-12T12:40:58.7161451Z;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-09-20T01:59:12.9943442Z;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/20/2024 08:59:29</publishTime>
      <publishTime>09/20/2024 10:40:20</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>09/20/2024 08:59:29</publishTime>
      <publishTime>09/20/2024 10:40:20</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>09/20/2024 08:59:27</publishTime>
      <publishTime>09/20/2024 10:40:17</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>09/20/2024 08:59:27</publishTime>
      <publishTime>09/20/2024 10:40:17</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>09/20/2024 08:59:19</publishTime>
      <publishTime>09/20/2024 10:40:11</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>09/20/2024 08:59:19</publishTime>
      <publishTime>09/20/2024 10:40:11</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/20/2024 08:59:20</publishTime>
      <publishTime>09/20/2024 10:40:13</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>09/20/2024 08:59:20</publishTime>
      <publishTime>09/20/2024 10:40:13</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/20/2024 08:59:17</publishTime>
      <publishTime>09/20/2024 10:40:09</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>09/20/2024 08:59:17</publishTime>
      <publishTime>09/20/2024 10:40:09</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>09/20/2024 08:59:18</publishTime>
      <publishTime>09/20/2024 10:40:10</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>09/20/2024 08:59:18</publishTime>
      <publishTime>09/20/2024 10:40:10</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>09/20/2024 08:59:18</publishTime>
      <publishTime>09/20/2024 10:40:10</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>09/20/2024 08:59:18</publishTime>
      <publishTime>09/20/2024 10:40:10</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>09/20/2024 08:56:16</publishTime>
      <publishTime>09/20/2024 10:36:40</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>09/20/2024 08:56:16</publishTime>
      <publishTime>09/20/2024 10:36:40</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/20/2024 08:56:23</publishTime>
      <publishTime>09/20/2024 10:36:46</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>09/20/2024 08:56:23</publishTime>
      <publishTime>09/20/2024 10:36:46</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>09/20/2024 08:59:57</publishTime>
      <publishTime>09/20/2024 10:40:48</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>09/20/2024 08:59:57</publishTime>
      <publishTime>09/20/2024 10:40:48</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -387,7 +387,7 @@
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/16/2024 08:34:04</publishTime>
      <publishTime>09/20/2024 09:12:39</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>09/12/2024 09:12:52</publishTime>
      <publishTime>09/20/2024 09:59:09</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 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,4 +9,3 @@
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