LKApi.git - Gitblit

上一版本: f1241948 | 补丁 | 提交 | 忽略空白

2023-03-13 6ebb7a292cac210551186eed94a0bfdcd34494d3

用户清单数据验证 班组验证提示信息修改

已修改10个文件

	.vs/VueWebApi/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/Tools/ImportExcelData.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.xml	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\MES莱科</_PublishTargetUrl>
    <History>True|2023-03-06T08:28:52.5324366Z;True|2023-03-04T14:39:07.6196796+08:00;True|2023-03-04T11:14:42.4747638+08:00;True|2023-03-03T16:04:05.4168918+08:00;True|2023-02-27T14:08:22.9246071+08:00;</History>
    <History>True|2023-03-13T02:44:20.6460094Z;True|2023-03-07T07:53:47.8742070+08:00;True|2023-03-06T16:28:52.5324366+08:00;True|2023-03-04T14:39:07.6196796+08:00;True|2023-03-04T11:14:42.4747638+08:00;True|2023-03-03T16:04:05.4168918+08:00;True|2023-02-27T14:08:22.9246071+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -714,13 +714,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>03/06/2023 16:28:39</publishTime>
      <publishTime>03/13/2023 10:44:13</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>03/06/2023 16:28:39</publishTime>
      <publishTime>03/13/2023 10:44:13</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>03/06/2023 16:28:39</publishTime>
      <publishTime>03/13/2023 10:44:13</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1098,7 +1098,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/06/2023 16:28:51</publishTime>
      <publishTime>03/13/2023 10:44:20</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/Tools/ImportExcelData.cs

@@ -1945,7 +1945,7 @@
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{用户编码(唯一)}";
                        erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "已存在";
                        erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
@@ -1959,7 +1959,7 @@
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{组织编码}";
                        erro.ErrorCont = "用户表:{组织编码}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "不存在";
                        erro.ErrorCont = "用户表:{组织编码}字段" + excelTable[1].Rows[k][7].ToString().Trim() + "不存在";
                        list.Add(erro);
                    }
                }

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -2234,6 +2234,23 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
            <param name="creatuser">创建人员</param>
            <param name="createdate">创建时间</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
            <summary>
            产品编码查找工艺路线下拉接口

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -2234,6 +2234,23 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
            <param name="creatuser">创建人员</param>
            <param name="createdate">创建时间</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
            <summary>
            产品编码查找工艺路线下拉接口

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -847,6 +847,7 @@
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -5,7 +5,7 @@
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<_PublishTargetUrl>D:\网站发布\MES莱科</_PublishTargetUrl>
			<History>True\|2023-03-06T08:28:52.5324366Z;True\|2023-03-04T14:39:07.6196796+08:00;True\|2023-03-04T11:14:42.4747638+08:00;True\|2023-03-03T16:04:05.4168918+08:00;True\|2023-02-27T14:08:22.9246071+08:00;</History>
			<History>True\|2023-03-13T02:44:20.6460094Z;True\|2023-03-07T07:53:47.8742070+08:00;True\|2023-03-06T16:28:52.5324366+08:00;True\|2023-03-04T14:39:07.6196796+08:00;True\|2023-03-04T11:14:42.4747638+08:00;True\|2023-03-03T16:04:05.4168918+08:00;True\|2023-02-27T14:08:22.9246071+08:00;</History>
			</PropertyGroup>
			<ItemGroup>
			<File Include="Areas/HelpPage/HelpPage.css">
			@@ -714,13 +714,13 @@
			<publishTime>12/24/2021 15:38:29</publishTime>
			</File>
			<File Include="bin/VueWebApi.dll">
			<publishTime>03/06/2023 16:28:39</publishTime>
			<publishTime>03/13/2023 10:44:13</publishTime>
			</File>
			<File Include="bin/VueWebApi.pdb">
			<publishTime>03/06/2023 16:28:39</publishTime>
			<publishTime>03/13/2023 10:44:13</publishTime>
			</File>
			<File Include="bin/VueWebApi.xml">
			<publishTime>03/06/2023 16:28:39</publishTime>
			<publishTime>03/13/2023 10:44:13</publishTime>
			</File>
			<File Include="bin/WebActivatorEx.dll">
			<publishTime>02/08/2013 16:42:28</publishTime>
			@@ -1098,7 +1098,7 @@
			<publishTime>06/16/2022 13:39:23</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>03/06/2023 16:28:51</publishTime>
			<publishTime>03/13/2023 10:44:20</publishTime>
			</File>
			</ItemGroup>
			</Project>

			@@ -1945,7 +1945,7 @@
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{用户编码(唯一)}";
			erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "已存在";
			erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
			list.Add(erro);
			}
			}
			@@ -1959,7 +1959,7 @@
			ExcelErro erro = new ExcelErro();
			erro.RoeNumber = "/";
			erro.ErrorField = "{组织编码}";
			erro.ErrorCont = "用户表:{组织编码}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "不存在";
			erro.ErrorCont = "用户表:{组织编码}字段" + excelTable[1].Rows[k][7].ToString().Trim() + "不存在";
			list.Add(erro);
			}
			}

			@@ -2234,6 +2234,23 @@
			<param name="order">排序规则</param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
			<summary>
			MES报废补单工单查询
			</summary>
			<param name="mesordercode">工单编号</param>
			<param name="sourceorder">源单单号</param>
			<param name="partcode">产品编码</param>
			<param name="partname">产品名称</param>
			<param name="partspec">产品规格</param>
			<param name="creatuser">创建人员</param>
			<param name="createdate">创建时间</param>
			<param name="page">页码</param>
			<param name="rows">每页显示条数</param>
			<param name="prop">排序字段</param>
			<param name="order">排序规则</param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
			<summary>
			产品编码查找工艺路线下拉接口

			@@ -847,6 +847,7 @@
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
			D:\新凯迪MES\MES项目\MES莱科\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll