| .vs/VueWebApi/v16/.suo | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/DLL/DAL/ReportManagerDAL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/bin/VueWebApi.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| VueWebApi/obj/Release/VueWebApi.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/VueWebApi/v16/.suoBinary files differ
VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -1637,13 +1637,13 @@ switch (status) { case "START": search += "and AA.status='START' "; search += "and AA.status='执行中' "; break; case "CLOSED": search += "and AA.status='CLOSED' "; search += "and AA.status='已完成' "; break; default: search += "and AA.status<>'START' and AA.status<>'CLOSED' "; search += "and AA.status='未开始' "; break; } } @@ -1695,23 +1695,28 @@ search = search.Substring(3);//截取索引2后面的字符 // --------------查询指定数据-------------- var total = 0; //总条数 var sql = @"select AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code, (case when AA.status='START' then '执行中' when AA.status='CLOSED' then '已完成' else '未开始' end) as status, AA.lm_date,AA.route_code,AA.route_name,AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name from var sql = @"select top 100 percent AA.saleOrderCode,AA.m_po,AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.status,AA.lm_date, AA.route_code,AA.route_name,AA.partcode,AA.partname,AA.partspec,AA.plan_qty,left(AA.concat_name,len(concat_name)-1) as concat_name from ( select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name as wkshp_name, case when W.status='START' then '执行中' when W.status='CLOSED' then '已完成' else '未开始' end as status, W.lm_date,W.route_code,R.name as route_name, P.partcode,P.partname,P.partspec,W.plan_qty, ( select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty, (select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n inner join TStep S on n.step_code=S.stepcode where n.wo_code=m.wo_code for xml path('')) as concat_name from TK_Wrk_Step m inner join TK_Wrk_Man W on m.wo_code=W.wo_code left join TKimp_Ewo E on W.m_po=E.wo inner join TMateriel_Info P on W.materiel_code=p.partcode inner join TFlw_Rout R on W.route_code=R.code where n.wo_code=W.wo_code for xml path('') ) as concat_name from TK_Wrk_Man W left join ( select wo,saleOrderCode from TKimp_Ewo ) as E on W.m_po=E.wo left join TMateriel_Info P on W.materiel_code=p.partcode left join TFlw_Rout R on W.route_code=R.code left join TOrganization F on W.wkshp_code=F.org_code group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty ) AA where " + search; group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,W.plan_qty ) as AA where " + search; var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total); mes.code = "200"; mes.Message = "查询成功!"; @@ -1746,13 +1751,13 @@ switch (status) { case "START": search += "and AA.status='START' "; search += "and AA.status='执行中' "; break; case "CLOSED": search += "and AA.status='CLOSED' "; search += "and AA.status='已完成' "; break; default: search += "and AA.status<>'START' and AA.status<>'CLOSED' "; search += "and AA.status='未开始' "; break; } } @@ -1804,23 +1809,30 @@ search = search.Substring(3);//截取索引2后面的字符 // --------------查询指定数据-------------- var total = 0; //总条数 var sql = @"select AA.saleOrderCode as 销售订单号,AA.m_po as 生产订单号,AA.wkshp_code as 车间编码,AA.wkshp_name as 车间名称,AA.wo_code as 生产工单号, (case when AA.status='START' then '执行中' when AA.status='CLOSED' then '已完成' else '未开始' end) as 工单状态, AA.lm_date as 单据日期,AA.route_code as 工艺路线编号,AA.route_name as 工艺路线名称, AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.plan_qty as 任务数量,left(AA.concat_name,len(concat_name)-1) as 生产进度 from var sql = @"select top 100 percent AA.saleOrderCode as 销售订单号,AA.m_po as 生产订单号,AA.wkshp_code as 车间编码,AA.wkshp_name as 车间名称,AA.wo_code as 生产工单号, AA.status as 工单状态,AA.lm_date as 单据日期,AA.route_code as 工艺路线编号,AA.route_name as 工艺路线名称, AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.plan_qty as 任务数量,left(AA.concat_name,len(concat_name)-1) as 生产进度 from ( select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name as wkshp_name, case when W.status='START' then '执行中' when W.status='CLOSED' then '已完成' else '未开始' end as status, W.lm_date,W.route_code,R.name as route_name, P.partcode,P.partname,P.partspec,W.plan_qty, ( select E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name as wkshp_name,W.status,W.lm_date,W.route_code,R.name as route_name,P.partcode,P.partname,P.partspec,m.plan_qty, (select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n select s.stepname+'/'+cast(cast(n.good_qty as decimal(18,2)) AS varchar(50))+',' from TK_Wrk_Step n inner join TStep S on n.step_code=S.stepcode where n.wo_code=m.wo_code for xml path('')) as concat_name from TK_Wrk_Step m inner join TK_Wrk_Man W on m.wo_code=W.wo_code left join TKimp_Ewo E on W.m_po=E.wo inner join TMateriel_Info P on W.materiel_code=p.partcode inner join TFlw_Rout R on W.route_code=R.code where n.wo_code=W.wo_code for xml path('') ) as concat_name from TK_Wrk_Man W left join ( select wo,saleOrderCode from TKimp_Ewo ) as E on W.m_po=E.wo left join TMateriel_Info P on W.materiel_code=p.partcode left join TFlw_Rout R on W.route_code=R.code left join TOrganization F on W.wkshp_code=F.org_code group by E.saleOrderCode,W.m_po,m.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,m.plan_qty ) AA group by E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.org_name,W.status,W.lm_date,W.route_code,R.name,P.partcode,P.partname,P.partspec,W.plan_qty ) as AA where " + search; DataTable data = DapperHelper.selectdata(sql, dynamicParams); data.TableName = "Table"; //设置DataTable的名称 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-11-22T02:45:30.7546341Z;True|2023-11-22T10:39:54.0192245+08:00;True|2023-11-20T10:49:12.5383967+08:00;True|2023-11-14T09:40:54.4312378+08:00;True|2023-11-14T09:40:10.8006338+08:00;True|2023-11-14T09:13:25.3929022+08:00;True|2023-11-14T09:10:50.7065424+08:00;True|2023-11-14T08:40:49.3427048+08:00;True|2023-11-13T17:14:18.8132307+08:00;True|2023-11-13T17:03:53.7755485+08:00;True|2023-11-13T16:59:15.1429785+08:00;True|2023-11-13T16:54:21.4762275+08:00;True|2023-11-13T16:11:03.4596175+08:00;True|2023-11-13T15:20:57.4191158+08:00;True|2023-11-10T13:01:23.2795198+08:00;True|2023-11-09T16:18:47.9473781+08:00;True|2023-11-09T14:46:45.7310735+08:00;True|2023-11-09T14:36:57.4272880+08:00;True|2023-11-02T18:28:55.6712926+08:00;True|2023-11-02T18:25:31.3074727+08:00;True|2023-11-02T16:25:20.2217266+08:00;True|2023-11-02T14:59:12.9729377+08:00;True|2023-11-02T14:03:21.3142180+08:00;True|2023-11-02T13:10:06.4259793+08:00;True|2023-11-02T13:04:59.2726100+08:00;True|2023-10-30T17:10:12.6270482+08:00;True|2023-10-30T14:52:35.6311299+08:00;True|2023-10-30T11:08:33.1712753+08:00;True|2023-10-13T12:07:07.3822225+08:00;True|2023-10-10T10:34:01.3167190+08:00;True|2023-10-10T10:28:48.9531906+08:00;True|2023-10-10T09:54:43.0218459+08:00;True|2023-10-10T09:43:57.3542420+08:00;True|2023-09-27T07:47:41.5372303+08:00;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> <History>True|2024-03-15T07:13:35.2362618Z;True|2023-11-22T10:45:30.7546341+08:00;True|2023-11-22T10:39:54.0192245+08:00;True|2023-11-20T10:49:12.5383967+08:00;True|2023-11-14T09:40:54.4312378+08:00;True|2023-11-14T09:40:10.8006338+08:00;True|2023-11-14T09:13:25.3929022+08:00;True|2023-11-14T09:10:50.7065424+08:00;True|2023-11-14T08:40:49.3427048+08:00;True|2023-11-13T17:14:18.8132307+08:00;True|2023-11-13T17:03:53.7755485+08:00;True|2023-11-13T16:59:15.1429785+08:00;True|2023-11-13T16:54:21.4762275+08:00;True|2023-11-13T16:11:03.4596175+08:00;True|2023-11-13T15:20:57.4191158+08:00;True|2023-11-10T13:01:23.2795198+08:00;True|2023-11-09T16:18:47.9473781+08:00;True|2023-11-09T14:46:45.7310735+08:00;True|2023-11-09T14:36:57.4272880+08:00;True|2023-11-02T18:28:55.6712926+08:00;True|2023-11-02T18:25:31.3074727+08:00;True|2023-11-02T16:25:20.2217266+08:00;True|2023-11-02T14:59:12.9729377+08:00;True|2023-11-02T14:03:21.3142180+08:00;True|2023-11-02T13:10:06.4259793+08:00;True|2023-11-02T13:04:59.2726100+08:00;True|2023-10-30T17:10:12.6270482+08:00;True|2023-10-30T14:52:35.6311299+08:00;True|2023-10-30T11:08:33.1712753+08:00;True|2023-10-13T12:07:07.3822225+08:00;True|2023-10-10T10:34:01.3167190+08:00;True|2023-10-10T10:28:48.9531906+08:00;True|2023-10-10T09:54:43.0218459+08:00;True|2023-10-10T09:43:57.3542420+08:00;True|2023-09-27T07:47:41.5372303+08:00;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>11/22/2023 10:45:23</publishTime> <publishTime>03/15/2024 15:13:27</publishTime> </File> <File Include="bin/VueWebApi.pdb"> <publishTime>11/22/2023 10:45:23</publishTime> <publishTime>03/15/2024 15:13:27</publishTime> </File> <File Include="bin/VueWebApi.xml"> <publishTime>11/22/2023 10:45:22</publishTime> <publishTime>03/15/2024 15:13:27</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>11/22/2023 10:45:30</publishTime> <publishTime>03/15/2024 15:13:34</publishTime> </File> </ItemGroup> </Project> VueWebApi/bin/VueWebApi.pdbBinary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdbBinary files differ
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cacheBinary files differ
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -868,6 +868,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.pdbBinary files differ
