.vs/VueWebApi/v16/.suoBinary files differ
VueWebApi/Controllers/KanBanManagerentController.cs
@@ -240,5 +240,81 @@ return TJson.toJson(mes); } #endregion #region[富尔达车间质量数字化看板,top5不良] /// <summary> /// 富尔达车间质量数字化看板,top5不良 /// </summary> /// <param name="StepCode">工序编码(质检工序)</param> /// <returns></returns> [Route(template: "BadTop5")] [HttpGet] public HttpResponseMessage BadTop5(string StepCode) { mes = KanBanManagerentBLL.BadTop5(StepCode); return TJson.toJson(mes); } #endregion #region[富尔达车间质量数字化看板,周不良趋势] /// <summary> /// 富尔达车间质量数字化看板,周不良趋势 /// </summary> /// <param name="StepCode">工序编码(质检工序)</param> /// <returns></returns> [Route(template: "BadWeek")] [HttpGet] public HttpResponseMessage BadWeek(string StepCode) { mes = KanBanManagerentBLL.BadWeek(StepCode); return TJson.toJson(mes); } #endregion #region[富尔达车间质量数字化看板,日不良分布] /// <summary> /// 富尔达车间质量数字化看板,日不良分布 /// </summary> /// <param name="StepCode">工序编码(质检工序)</param> /// <returns></returns> [Route(template: "BadDayDistriBute")] [HttpGet] public HttpResponseMessage BadDayDistriBute(string StepCode) { mes = KanBanManagerentBLL.BadDayDistriBute(StepCode); return TJson.toJson(mes); } #endregion #region[富尔达车间质量数字化看板,周不良分布] /// <summary> /// 富尔达车间质量数字化看板,周不良分布 /// </summary> /// <param name="StepCode">工序编码(质检工序)</param> /// <returns></returns> [Route(template: "BadWeekDistriBute")] [HttpGet] public HttpResponseMessage BadWeekDistriBute(string StepCode) { mes = KanBanManagerentBLL.BadWeekDistriBute(StepCode); return TJson.toJson(mes); } #endregion #region[富尔达车间质量数字化看板,不良明细] /// <summary> /// 富尔达车间质量数字化看板,不良明细 /// </summary> /// <param name="StepCode">工序编码(质检工序)</param> /// <returns></returns> [Route(template: "BadContManger")] [HttpGet] public HttpResponseMessage BadContManger(string StepCode) { mes = KanBanManagerentBLL.BadContManger(StepCode); return TJson.toJson(mes); } #endregion } } VueWebApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -120,5 +120,41 @@ return KanBanManagerentDAL.WkshpContentData(); } #endregion #region[富尔达车间质量数字化看板,top5不良] public static ToMessage BadTop5(string StepCode) { return KanBanManagerentDAL.BadTop5(StepCode); } #endregion #region[富尔达车间质量数字化看板,周不良趋势] public static ToMessage BadWeek(string StepCode) { return KanBanManagerentDAL.BadWeek(StepCode); } #endregion #region[富尔达车间质量数字化看板,日不良分布] public static ToMessage BadDayDistriBute(string StepCode) { return KanBanManagerentDAL.BadDayDistriBute(StepCode); } #endregion #region[富尔达车间质量数字化看板,周不良分布] public static ToMessage BadWeekDistriBute(string StepCode) { return KanBanManagerentDAL.BadWeekDistriBute(StepCode); } #endregion #region[富尔达车间质量数字化看板,不良明细] public static ToMessage BadContManger(string StepCode) { return KanBanManagerentDAL.BadContManger(StepCode); } #endregion } } VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -147,7 +147,7 @@ mes.data = list; return mes; } #endregion\ #endregion #region[大岛车间综合看板,左下列表接口] public static ToMessage LineSearchBottomLeftData(string shopcode) @@ -462,15 +462,17 @@ try { //获取产线销售订单报工信息,报工数量>0 且工单状态为非关闭状态 且工序为末道工序 (--and (S.good_qty+S.ng_qty+S.bad_qty)<S.plan_qty) sql = @"select A.saleOrderCode,A.materiel_code,M.partname, isnull(sum(S.good_qty),0) as good_qty sql = @"select AA.saleOrderCode,AA.materiel_code,AA.partname,sum(AA.good_qty) as good_qty from ( select distinct A.saleOrderCode,A.materiel_code,M.partname,isnull(S.good_qty,0) as good_qty from TKimp_Ewo A inner join TK_Wrk_Man B on A.wo=B.m_po inner join TK_Wrk_Step S on B.wo_code=S.wo_code inner join TFlw_Rteqp R on S.step_code=R.step_code left join TK_Wrk_Man B on A.wo=B.m_po and A.materiel_code=B.materiel_code left join TK_Wrk_Step S on B.wo_code=S.wo_code and S.isend='Y' left join TFlw_Rteqp R on S.step_code=R.step_code left join TMateriel_Info M on A.materiel_code=M.partcode where S.good_qty>0 and S.isend='Y' and R.eqp_code=@lineCode and B.status<>'CLOSED' group by A.saleOrderCode,A.materiel_code,M.partname"; where A.saleOrderCode is not null and A.saleOrderCode<>'' and R.eqp_code=@lineCode and B.status<>'CLOSED' ) as AA group by AA.saleOrderCode,AA.materiel_code,AA.partname"; dynamicParams.Add("@lineCode", lineCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; @@ -495,10 +497,16 @@ try { //获取工单报工信息,报工数量>0 且工单状态为非关闭状态 sql = @"select A.wo_code,M.partname,B.seq,T.stepname,B.plan_qty,B.good_qty,B.ng_qty,B.bad_qty from TK_Wrk_Man A sql = @"select A.wo_code,E.name as eqp_name,M.partname,B.plan_qty,A.plan_startdate,A.plan_enddate,T.stepname,B.good_qty from TK_Wrk_Man A inner join TK_Wrk_Step B on A.wo_code=B.wo_code left join TMateriel_Info M on A.materiel_code=M.partcode inner join( select wo_code,step_code,materiel_code,eqp_code, sum(good_qty) as good_qty from TK_Wrk_Record where style='B' group by wo_code,step_code,materiel_code,eqp_code ) as S on A.wo_code=S.wo_code and A.materiel_code=S.materiel_code and B.step_code=S.step_code left join TStep T on B.step_code=T.stepcode left join TMateriel_Info M on A.materiel_code=M.partcode left join TEqpInfo E on S.eqp_code=E.code where A.status<>'CLOSED' order by A.wo_code,B.seq"; var data = DapperHelper.selecttable(sql); @@ -517,6 +525,188 @@ } #endregion #region[富尔达车间质量数字化看板,top5不良] public static ToMessage BadTop5(string StepCode) { string sql = ""; var dynamicParams = new DynamicParameters(); try { //富尔达车间质量数字化看板,top5不良(取质检工序) sql = @"select T.name,count(*) as cont from CSR_WorkRecord_Defect A inner join TDefect T on A.defect_code=T.code where step_code=@StepCode and datediff(day,GETDATE(),A.lm_date)=0 group by T.name order by cont desc"; dynamicParams.Add("@StepCode", StepCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; mes.Message = "查询成功!"; mes.data = data; } catch (Exception e) { mes.code = "300"; mes.count = 0; mes.Message = e.Message; mes.data = null; } return mes; } #endregion #region[富尔达车间质量数字化看板,周不良趋势] public static ToMessage BadWeek(string StepCode) { string sql = ""; var dynamicParams = new DynamicParameters(); try { //富尔达车间质量数字化看板,周不良趋势(取质检工序当前时间往前一周) sql = @"select case when datepart(weekday,a.click_date)=2 then '周一' when datepart(weekday,a.click_date)=3 then '周二' when datepart(weekday,a.click_date)=3 then '周二' when datepart(weekday,a.click_date)=4 then '周三' when datepart(weekday,a.click_date)=5 then '周四' when datepart(weekday,a.click_date)=6 then '周五' when datepart(weekday,a.click_date)=7 then '周六' when datepart(weekday,a.click_date)=1 then '周日' end as click_date, ISNULL(b.count,0) as count from ( SELECT convert(varchar(10),getdate()-6,120) as click_date union all SELECT convert(varchar(10),getdate()-5,120) as click_date union all SELECT convert(varchar(10),getdate()-4,120) as click_date union all SELECT convert(varchar(10),getdate()-3,120) as click_date union all SELECT convert(varchar(10),getdate()-2,120) as click_date union all SELECT convert(varchar(10),getdate()-1,120) as click_date union all SELECT convert(varchar(10),getdate(),120) as click_date ) a left join ( select convert(varchar(10),lm_date,120) as datetime, count(*) as count from CSR_WorkRecord_Defect where step_code=@StepCode group by convert(varchar(10),lm_date,120) ) b on a.click_date = b.datetime;"; dynamicParams.Add("@StepCode", StepCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; mes.Message = "查询成功!"; mes.data = data; } catch (Exception e) { mes.code = "300"; mes.count = 0; mes.Message = e.Message; mes.data = null; } return mes; } #endregion #region[富尔达车间质量数字化看板,日不良分布] public static ToMessage BadDayDistriBute(string StepCode) { string sql = ""; var dynamicParams = new DynamicParameters(); try { //富尔达车间质量数字化看板,日不良分布(取质检工序,按产线统计) sql = @"select A.eqp_code,E.name as eqp_name,count(*) as cont from TK_Wrk_Record A inner join CSR_WorkRecord_Defect B on A.id=B.record_id left join TEqpInfo E on A.eqp_code=E.code where B.step_code=@StepCode and datediff(day,GETDATE(),B.lm_date)=0 group by A.eqp_code,E.name order by cont desc"; dynamicParams.Add("@StepCode", StepCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; mes.Message = "查询成功!"; mes.data = data; } catch (Exception e) { mes.code = "300"; mes.count = 0; mes.Message = e.Message; mes.data = null; } return mes; } #endregion #region[富尔达车间质量数字化看板,周不良分布] public static ToMessage BadWeekDistriBute(string StepCode) { string sql = ""; var dynamicParams = new DynamicParameters(); try { //富尔达车间质量数字化看板,周不良分布(取质检工序,按产线统计) sql = @"select A.eqp_code,E.name as eqp_name,count(*) as cont from TK_Wrk_Record A inner join CSR_WorkRecord_Defect B on A.id=B.record_id left join TEqpInfo E on A.eqp_code=E.code where B.step_code=@StepCode and DateDiff(dd,B.lm_date,getdate())<=7 group by A.eqp_code,E.name order by cont desc"; dynamicParams.Add("@StepCode", StepCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; mes.Message = "查询成功!"; mes.data = data; } catch (Exception e) { mes.code = "300"; mes.count = 0; mes.Message = e.Message; mes.data = null; } return mes; } #endregion #region[富尔达车间质量数字化看板,不良明细] public static ToMessage BadContManger(string StepCode) { string sql = ""; var dynamicParams = new DynamicParameters(); try { //富尔达车间质量数字化看板,不良明细(取质检工序,按产线统计) sql = @"select MM.lm_date,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 where record_id=MM.record_id FOR XML PATH('') ), 1, 1, '') ) from CSR_WorkRecord_Defect as MM 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 where MM.step_code='Step02' 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"; dynamicParams.Add("@StepCode", StepCode); var data = DapperHelper.selectdata(sql, dynamicParams); mes.code = "200"; mes.Message = "查询成功!"; mes.data = data; } catch (Exception e) { mes.code = "300"; mes.count = 0; mes.Message = e.Message; mes.data = null; } return mes; } #endregion } } 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-16T02:29:41.2258924Z;True|2022-11-16T09:54:23.4213778+08:00;</History> <History>True|2022-11-21T07:13:10.4385853Z;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/16/2022 10:29:40</publishTime> <publishTime>11/21/2022 15:13:03</publishTime> </File> <File Include="bin/VueWebApi.pdb"> <publishTime>11/16/2022 10:29:40</publishTime> <publishTime>11/21/2022 15:13:03</publishTime> </File> <File Include="bin/VueWebApi.xml"> <publishTime>11/16/2022 10:29:40</publishTime> <publishTime>11/21/2022 15:13:03</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/16/2022 09:54:22</publishTime> <publishTime>11/21/2022 15:13:09</publishTime> </File> </ItemGroup> </Project> VueWebApi/bin/VueWebApi.dllBinary files differ
VueWebApi/bin/VueWebApi.dll.config
@@ -18,6 +18,8 @@ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_dd;User ID=sa;Password=xkd@20220602;pooling=false" /> <!--大岛服务器环境--> <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> <!--redis企业配置--> <add key="Enterprise" value="FED" /> <!--redis数据库链接配置ip--> <add key="RedisConnIp" value="127.0.0.1" /> <!--redis数据库链接配置端口号--> VueWebApi/bin/VueWebApi.pdbBinary files differ
VueWebApi/bin/VueWebApi.xml
@@ -1721,6 +1721,19 @@ <param name="shopcode">车间编码</param> <returns></returns> </member> <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpLineData(System.String)"> <summary> 富尔达车间生产数字化看板,产线数据 </summary> <param name="LineCode">产线编码</param> <returns></returns> </member> <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpContentData"> <summary> 富尔达车间生产数字化看板,生产信息 </summary> <returns></returns> </member> <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)"> <summary> PC用户登录 VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -18,6 +18,8 @@ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_dd;User ID=sa;Password=xkd@20220602;pooling=false" /> <!--大岛服务器环境--> <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> <!--redis企业配置--> <add key="Enterprise" value="FED" /> <!--redis数据库链接配置ip--> <add key="RedisConnIp" value="127.0.0.1" /> <!--redis数据库链接配置端口号--> VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dllBinary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdbBinary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1721,6 +1721,19 @@ <param name="shopcode">车间编码</param> <returns></returns> </member> <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpLineData(System.String)"> <summary> 富尔达车间生产数字化看板,产线数据 </summary> <param name="LineCode">产线编码</param> <returns></returns> </member> <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkshpContentData"> <summary> 富尔达车间生产数字化看板,生产信息 </summary> <returns></returns> </member> <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)"> <summary> PC用户登录 VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -18,6 +18,8 @@ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_dd;User ID=sa;Password=xkd@20220602;pooling=false" /> <!--大岛服务器环境--> <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> <!--redis企业配置--> <add key="Enterprise" value="FED" /> <!--redis数据库链接配置ip--> <add key="RedisConnIp" value="127.0.0.1" /> <!--redis数据库链接配置端口号--> VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -18,6 +18,8 @@ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_dd;User ID=sa;Password=xkd@20220602;pooling=false" /> <!--大岛服务器环境--> <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> <!--redis企业配置--> <add key="Enterprise" value="FED" /> <!--redis数据库链接配置ip--> <add key="RedisConnIp" value="127.0.0.1" /> <!--redis数据库链接配置端口号--> VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cacheBinary files differ
VueWebApi/obj/Release/VueWebApi.dllBinary files differ
VueWebApi/obj/Release/VueWebApi.pdbBinary files differ