ZQHApi.git - Gitblit

2023-10-10 d570cdca55f34f8860f48bb30c5bea5b1f61390c

nothing

已修改10个文件

	.vs/VueWebApi/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/DLL/DAL/ProductModelDAL.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/DLL/DAL/ProductionManagementDAL.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/VueWebApi.csproj.user	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/DLL/DAL/ProductModelDAL.cs

@@ -2471,7 +2471,7 @@
            try
            {
                list.Clear();
                //当前工序是否关联工艺路线
                //查询节拍工价表,当前产品、工艺路线、工序、设备是否设置节拍工价
                sql = @"select *  from TPrteEqp_Stad
                        where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
                dynamicParams.Add("@partcode", partcode);
@@ -2524,6 +2524,7 @@
                        }
                    });
                }
               
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {

 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -2837,7 +2837,7 @@
                            }
                        });
                        //回写缺陷记录表的待处理数量
                        sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
                        sql = @"update CSR_WorkRecord_Defect set defect_qty=defect_qty-@repair_qty-@bad_qty,defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
                        where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
                        list.Add(new
                        {
@@ -2908,7 +2908,7 @@
                            }
                        });
                        //回写缺陷记录表的待处理数量
                        sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
                        sql = @"update CSR_WorkRecord_Defect set defect_qty=defect_qty-@repair_qty-@bad_qty,defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
                        where wo_code=@wo_code and step_code=@step_code and id=@id and style='S'";
                        list.Add(new
                        {

 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-09-21T10:22:16.9575605Z;True|2023-09-21T18:09:09.2828591+08:00;True|2023-09-21T17:57:05.3919457+08:00;True|2023-09-21T17:40:17.7722883+08:00;True|2023-09-21T17:24:20.7004108+08:00;True|2023-09-21T17:14:30.5230341+08:00;True|2023-09-21T15:14:11.3019288+08:00;True|2023-09-20T09:47:15.7375677+08:00;True|2023-09-12T14:37:37.0665432+08:00;True|2023-08-16T16:52:02.7063729+08:00;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
    <History>True|2023-09-26T23:47:41.5372303Z;True|2023-09-21T18:22:16.9575605+08:00;True|2023-09-21T18:09:09.2828591+08:00;True|2023-09-21T17:57:05.3919457+08:00;True|2023-09-21T17:40:17.7722883+08:00;True|2023-09-21T17:24:20.7004108+08:00;True|2023-09-21T17:14:30.5230341+08:00;True|2023-09-21T15:14:11.3019288+08:00;True|2023-09-20T09:47:15.7375677+08:00;True|2023-09-12T14:37:37.0665432+08:00;True|2023-08-16T16:52:02.7063729+08:00;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -750,13 +750,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>09/22/2023 15:32:17</publishTime>
      <publishTime>09/27/2023 07:47:32</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>09/22/2023 15:32:17</publishTime>
      <publishTime>09/27/2023 07:47:32</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>09/22/2023 15:32:17</publishTime>
      <publishTime>09/27/2023 07:47:31</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1161,7 +1161,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>09/22/2023 15:32:22</publishTime>
      <publishTime>09/27/2023 07:47:40</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/VueWebApi.csproj.user

@@ -11,8 +11,8 @@
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
    <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
    <WebStackScaffolding_IsPartialViewSelected>True</WebStackScaffolding_IsPartialViewSelected>

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

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

Binary files differ

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

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -2471,7 +2471,7 @@
			try
			{
			list.Clear();
			//当前工序是否关联工艺路线
			//查询节拍工价表,当前产品、工艺路线、工序、设备是否设置节拍工价
			sql = @"select * from TPrteEqp_Stad
			where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
			dynamicParams.Add("@partcode", partcode);
			@@ -2524,6 +2524,7 @@
			}
			});
			}

			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{

			@@ -2837,7 +2837,7 @@
			}
			});
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			sql = @"update CSR_WorkRecord_Defect set defect_qty=defect_qty-@repair_qty-@bad_qty,defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
			list.Add(new
			{
			@@ -2908,7 +2908,7 @@
			}
			});
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			sql = @"update CSR_WorkRecord_Defect set defect_qty=defect_qty-@repair_qty-@bad_qty,defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='S'";
			list.Add(new
			{

			@@ -5,7 +5,7 @@
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<_PublishTargetUrl>D:\网站发布\MES正清河</_PublishTargetUrl>
			<History>True\|2023-09-21T10:22:16.9575605Z;True\|2023-09-21T18:09:09.2828591+08:00;True\|2023-09-21T17:57:05.3919457+08:00;True\|2023-09-21T17:40:17.7722883+08:00;True\|2023-09-21T17:24:20.7004108+08:00;True\|2023-09-21T17:14:30.5230341+08:00;True\|2023-09-21T15:14:11.3019288+08:00;True\|2023-09-20T09:47:15.7375677+08:00;True\|2023-09-12T14:37:37.0665432+08:00;True\|2023-08-16T16:52:02.7063729+08:00;True\|2023-08-11T10:35:11.9236725+08:00;True\|2023-08-07T10:34:44.0844087+08:00;True\|2023-08-07T10:28:56.2230477+08:00;True\|2023-07-31T11:18:06.9546379+08:00;True\|2023-07-03T10:38:22.8080444+08:00;True\|2023-06-26T08:15:27.3611577+08:00;True\|2023-06-25T15:36:41.8736654+08:00;True\|2023-06-25T14:33:49.5287543+08:00;True\|2023-06-13T10:24:59.6876648+08:00;</History>
			<History>True\|2023-09-26T23:47:41.5372303Z;True\|2023-09-21T18:22:16.9575605+08:00;True\|2023-09-21T18:09:09.2828591+08:00;True\|2023-09-21T17:57:05.3919457+08:00;True\|2023-09-21T17:40:17.7722883+08:00;True\|2023-09-21T17:24:20.7004108+08:00;True\|2023-09-21T17:14:30.5230341+08:00;True\|2023-09-21T15:14:11.3019288+08:00;True\|2023-09-20T09:47:15.7375677+08:00;True\|2023-09-12T14:37:37.0665432+08:00;True\|2023-08-16T16:52:02.7063729+08:00;True\|2023-08-11T10:35:11.9236725+08:00;True\|2023-08-07T10:34:44.0844087+08:00;True\|2023-08-07T10:28:56.2230477+08:00;True\|2023-07-31T11:18:06.9546379+08:00;True\|2023-07-03T10:38:22.8080444+08:00;True\|2023-06-26T08:15:27.3611577+08:00;True\|2023-06-25T15:36:41.8736654+08:00;True\|2023-06-25T14:33:49.5287543+08:00;True\|2023-06-13T10:24:59.6876648+08:00;</History>
			</PropertyGroup>
			<ItemGroup>
			<File Include="Areas/HelpPage/HelpPage.css">
			@@ -750,13 +750,13 @@
			<publishTime>12/24/2021 15:38:29</publishTime>
			</File>
			<File Include="bin/VueWebApi.dll">
			<publishTime>09/22/2023 15:32:17</publishTime>
			<publishTime>09/27/2023 07:47:32</publishTime>
			</File>
			<File Include="bin/VueWebApi.pdb">
			<publishTime>09/22/2023 15:32:17</publishTime>
			<publishTime>09/27/2023 07:47:32</publishTime>
			</File>
			<File Include="bin/VueWebApi.xml">
			<publishTime>09/22/2023 15:32:17</publishTime>
			<publishTime>09/27/2023 07:47:31</publishTime>
			</File>
			<File Include="bin/WebActivatorEx.dll">
			<publishTime>02/08/2013 16:42:28</publishTime>
			@@ -1161,7 +1161,7 @@
			<publishTime>06/16/2022 13:39:23</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>09/22/2023 15:32:22</publishTime>
			<publishTime>09/27/2023 07:47:40</publishTime>
			</File>
			</ItemGroup>
			</Project>

			@@ -11,8 +11,8 @@
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ShowAllFiles</ProjectView>
			<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
			<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
			<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
			<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
			<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
			<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
			<WebStackScaffolding_IsPartialViewSelected>True</WebStackScaffolding_IsPartialViewSelected>