FEDApi.git - Gitblit

2023-03-04 440cbc6d321ecd1029338352c5116bbfc12e56cc

工单派发写入节拍工价复制表

已修改9个文件

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

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -597,6 +597,25 @@
                            CreateDate = DateTime.Now.ToString()
                        }
                    });

                    //写入工单工艺路线工序工价复制表
                    sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
                           select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
                           S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
                           from TFlw_Rtdt A
                           inner join TFlw_Rteqp C on A.step_code=C.step_code
                           inner join (select *   from TPrteEqp_Stad  where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            mesordercode = mesordercode,
                            materiel_code = partcode,
                            routecode = routecode
                        }
                    });

                    //if (is_aps == "Y")  //是否排程
                    //{
                    //    string sql1 = "select id from TBom_Main  where materiel_code='" + PartNumber + "' and status='Y' and version='" + VsionId + "'";
@@ -664,6 +683,35 @@
                            CreateDate = DateTime.Now.ToString()
                        }
                    });

                    //删除工单工艺路线工序工价复制表
                    sql = @"delete TWoPrteEqp_Stad where wo=@mesordercode";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            mesordercode = mesordercode
                        }
                    });
                    //写入工单工艺路线工序工价复制表
                    sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
                           select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
                           S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
                           from TFlw_Rtdt A
                           inner join TFlw_Rteqp C on A.step_code=C.step_code
                           inner join (select *   from TPrteEqp_Stad  where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            mesordercode = mesordercode,
                            materiel_code = partcode,
                            routecode = routecode
                        }
                    });

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

 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-03T08:02:52.7528225Z;True|2023-02-20T19:50:29.9610176+08:00;True|2022-12-02T09:48:15.8632783+08:00;True|2022-12-02T09:39:45.8161756+08:00;True|2022-12-02T08:40:39.6638743+08:00;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;True|2022-11-30T14:03:51.8326823+08:00;True|2022-11-30T13:26:46.0316090+08:00;True|2022-11-29T08:57:17.3697109+08:00;True|2022-11-23T14:06:03.8602775+08:00;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+08:00;</History>
    <History>True|2023-03-04T06:41:42.0976052Z;True|2023-03-03T16:02:52.7528225+08:00;True|2023-02-20T19:50:29.9610176+08:00;True|2022-12-02T09:48:15.8632783+08:00;True|2022-12-02T09:39:45.8161756+08:00;True|2022-12-02T08:40:39.6638743+08:00;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;True|2022-11-30T14:03:51.8326823+08:00;True|2022-11-30T13:26:46.0316090+08:00;True|2022-11-29T08:57:17.3697109+08:00;True|2022-11-23T14:06:03.8602775+08:00;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -705,13 +705,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>03/03/2023 16:02:38</publishTime>
      <publishTime>03/04/2023 14:41:33</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>03/03/2023 16:02:38</publishTime>
      <publishTime>03/04/2023 14:41:33</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>03/03/2023 16:02:38</publishTime>
      <publishTime>03/04/2023 14:41:33</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1074,7 +1074,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/03/2023 16:02:51</publishTime>
      <publishTime>03/04/2023 14:41:41</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.dll

Binary files differ

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

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

Binary files differ

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

Binary files differ

 VueWebApi/obj/Release/VueWebApi.dll

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -597,6 +597,25 @@
			CreateDate = DateTime.Now.ToString()
			}
			});

			//写入工单工艺路线工序工价复制表
			sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
			select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
			S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
			from TFlw_Rtdt A
			inner join TFlw_Rteqp C on A.step_code=C.step_code
			inner join (select * from TPrteEqp_Stad where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			mesordercode = mesordercode,
			materiel_code = partcode,
			routecode = routecode
			}
			});

			//if (is_aps == "Y") //是否排程
			//{
			// string sql1 = "select id from TBom_Main where materiel_code='" + PartNumber + "' and status='Y' and version='" + VsionId + "'";
			@@ -664,6 +683,35 @@
			CreateDate = DateTime.Now.ToString()
			}
			});

			//删除工单工艺路线工序工价复制表
			sql = @"delete TWoPrteEqp_Stad where wo=@mesordercode";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			mesordercode = mesordercode
			}
			});
			//写入工单工艺路线工序工价复制表
			sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
			select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
			S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
			from TFlw_Rtdt A
			inner join TFlw_Rteqp C on A.step_code=C.step_code
			inner join (select * from TPrteEqp_Stad where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			mesordercode = mesordercode,
			materiel_code = partcode,
			routecode = routecode
			}
			});

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

			@@ -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-03T08:02:52.7528225Z;True\|2023-02-20T19:50:29.9610176+08:00;True\|2022-12-02T09:48:15.8632783+08:00;True\|2022-12-02T09:39:45.8161756+08:00;True\|2022-12-02T08:40:39.6638743+08:00;True\|2022-12-01T14:57:53.4186199+08:00;True\|2022-11-30T15:59:10.4273430+08:00;True\|2022-11-30T14:04:20.4425530+08:00;True\|2022-11-30T14:03:51.8326823+08:00;True\|2022-11-30T13:26:46.0316090+08:00;True\|2022-11-29T08:57:17.3697109+08:00;True\|2022-11-23T14:06:03.8602775+08:00;True\|2022-11-21T15:13:10.4385853+08:00;True\|2022-11-16T10:29:41.2258924+08:00;True\|2022-11-16T09:54:23.4213778+08:00;</History>
			<History>True\|2023-03-04T06:41:42.0976052Z;True\|2023-03-03T16:02:52.7528225+08:00;True\|2023-02-20T19:50:29.9610176+08:00;True\|2022-12-02T09:48:15.8632783+08:00;True\|2022-12-02T09:39:45.8161756+08:00;True\|2022-12-02T08:40:39.6638743+08:00;True\|2022-12-01T14:57:53.4186199+08:00;True\|2022-11-30T15:59:10.4273430+08:00;True\|2022-11-30T14:04:20.4425530+08:00;True\|2022-11-30T14:03:51.8326823+08:00;True\|2022-11-30T13:26:46.0316090+08:00;True\|2022-11-29T08:57:17.3697109+08:00;True\|2022-11-23T14:06:03.8602775+08:00;True\|2022-11-21T15:13:10.4385853+08:00;True\|2022-11-16T10:29:41.2258924+08:00;True\|2022-11-16T09:54:23.4213778+08:00;</History>
			</PropertyGroup>
			<ItemGroup>
			<File Include="Areas/HelpPage/HelpPage.css">
			@@ -705,13 +705,13 @@
			<publishTime>12/24/2021 15:38:29</publishTime>
			</File>
			<File Include="bin/VueWebApi.dll">
			<publishTime>03/03/2023 16:02:38</publishTime>
			<publishTime>03/04/2023 14:41:33</publishTime>
			</File>
			<File Include="bin/VueWebApi.pdb">
			<publishTime>03/03/2023 16:02:38</publishTime>
			<publishTime>03/04/2023 14:41:33</publishTime>
			</File>
			<File Include="bin/VueWebApi.xml">
			<publishTime>03/03/2023 16:02:38</publishTime>
			<publishTime>03/04/2023 14:41:33</publishTime>
			</File>
			<File Include="bin/WebActivatorEx.dll">
			<publishTime>02/08/2013 16:42:28</publishTime>
			@@ -1074,7 +1074,7 @@
			<publishTime>06/16/2022 13:39:23</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>03/03/2023 16:02:51</publishTime>
			<publishTime>03/04/2023 14:41:41</publishTime>
			</File>
			</ItemGroup>
			</Project>