FEDApi.git - Gitblit

2022-12-02 accb803beb9c54b283b5b2f8bf8e0d8937b80c7a

nothing

已修改10个文件

	.vs/VueWebApi/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/DLL/DAL/KanBanManagerentDAL.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/DLL/DAL/KanBanManagerentDAL.cs

@@ -677,7 +677,7 @@
            try
            {
                //富尔达车间质量数字化看板,不良明细(取质检工序,按产线统计)
                sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
                sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,A.eqp_code,E.name as eqp_name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
                       defect_name=( STUFF(( SELECT  ',' + B.name
                                                 FROM  CSR_WorkRecord_Defect N
                                                 inner join TDefect B on N.defect_code=B.code
@@ -689,8 +689,9 @@
                       inner join TK_Wrk_Record A on MM.record_id=a.id
                       inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
                       inner join TStep T on MM.step_code=T.stepcode
                        inner join TEqpInfo E on A.eqp_code=E.code
                       where  MM.step_code=@StepCode and MM.style='B' and A.style='B' and A.ng_qty>0 and S.status<>'CLOSED' 
                       group by MM.lm_date,MM.record_id,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
                        group by MM.lm_date,MM.record_id,A.eqp_code,E.name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
                dynamicParams.Add("@StepCode", StepCode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";

 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|2022-11-30T06:04:20.4425530Z;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|2022-12-02T00:40:39.6638743Z;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>11/30/2022 14:03:45</publishTime>
      <publishTime>12/02/2022 08:40:32</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>11/30/2022 14:03:45</publishTime>
      <publishTime>12/02/2022 08:40:32</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>11/30/2022 14:03:44</publishTime>
      <publishTime>12/02/2022 08:40:32</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>11/30/2022 14:03:51</publishTime>
      <publishTime>12/02/2022 08:40:39</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.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.dll

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -677,7 +677,7 @@
			try
			{
			//富尔达车间质量数字化看板,不良明细(取质检工序,按产线统计)
			sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
			sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,A.eqp_code,E.name as eqp_name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
			defect_name=( STUFF(( SELECT ',' + B.name
			FROM CSR_WorkRecord_Defect N
			inner join TDefect B on N.defect_code=B.code
			@@ -689,8 +689,9 @@
			inner join TK_Wrk_Record A on MM.record_id=a.id
			inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
			inner join TStep T on MM.step_code=T.stepcode
			inner join TEqpInfo E on A.eqp_code=E.code
			where MM.step_code=@StepCode and MM.style='B' and A.style='B' and A.ng_qty>0 and S.status<>'CLOSED'
			group by MM.lm_date,MM.record_id,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
			group by MM.lm_date,MM.record_id,A.eqp_code,E.name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
			dynamicParams.Add("@StepCode", StepCode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";

			@@ -5,7 +5,7 @@
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<_PublishTargetUrl>D:\网站发布\MES富尔达</_PublishTargetUrl>
			<History>True\|2022-11-30T06:04:20.4425530Z;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\|2022-12-02T00:40:39.6638743Z;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>11/30/2022 14:03:45</publishTime>
			<publishTime>12/02/2022 08:40:32</publishTime>
			</File>
			<File Include="bin/VueWebApi.pdb">
			<publishTime>11/30/2022 14:03:45</publishTime>
			<publishTime>12/02/2022 08:40:32</publishTime>
			</File>
			<File Include="bin/VueWebApi.xml">
			<publishTime>11/30/2022 14:03:44</publishTime>
			<publishTime>12/02/2022 08:40:32</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>11/30/2022 14:03:51</publishTime>
			<publishTime>12/02/2022 08:40:39</publishTime>
			</File>
			</ItemGroup>
			</Project>