From 4da5a13be9ca200c16003d11345b583653697b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com> Date: Thu, 25 Jul 2024 08:06:51 +0800 Subject: [PATCH] 11 --- APP/QMAPP.Web/App_Data/Menu.xml | 6 +- .../Bucket/BucketMaterialClassBLL.cs | 2 +- .../CompleteStatisticsBLL.cs | 12 +- APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj | 1 + APPQ5/QMAPP.FJC.BLL/TianJin/MonitordataBLL.cs | 141 ++++ APPQ5/QMAPP.FJC.BLL/TianJin/TJPaoMoPlanBLL.cs | 494 +++----------- APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs | 524 ++++----------- .../Bucket/BucketMaterialClassDAL.cs | 16 +- .../CompleteStatisticsDAL.cs | 50 +- .../TJCompleteStatisticsDAL.cs | 613 ++++++++++++++++++ APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj | 2 + APPQ5/QMAPP.FJC.DAL/TianJin/MonitordataDAL.cs | 201 ++++++ APPQ5/QMAPP.FJC.DAL/TianJin/TJPaoMoPlanDAL.cs | 74 +-- APPQ5/QMAPP.FJC.DAL/TianJin/TJZhuSuPlanDAL.cs | 110 ++-- .../Bucket/BucketMaterialClass.cs | 6 +- .../CompleteStatisticsEntity.cs | 4 +- .../TJCompleteStatisticsEntity.cs | 80 +++ .../Table/T_AW_COMPLETE_TJSTATISTICS.cs | 92 +++ .../QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj | 3 + APPQ5/QMAPP.FJC.Entity/TianJin/Monitordata.cs | 183 ++++++ APPQ5/QMAPP.FJC.Entity/TianJin/TJPaoMoPlan.cs | 13 +- APPQ5/QMAPP.FJC.Entity/TianJin/TJZhuSuPlan.cs | 15 +- .../App_Data/Excel/TJPaoMoPlanImp.xlsx | Bin 0 -> 9505 bytes .../App_Data/Excel/TJPaoMoPlanImp.xml | 43 ++ .../App_Data/Excel/TJZhuSuPlanImp.xlsx | Bin 0 -> 9512 bytes .../App_Data/Excel/TJZhuSuPlanImp.xml | 43 ++ .../Controllers/MonitordataController.cs | 131 ++++ .../Models/Bucket/BucketMaterialClassModel.cs | 4 +- .../Models/TianJin/MonitordataModel.cs | 242 +++++++ .../Models/TianJin/TJPaoMoPlanModel.cs | 18 + .../Models/TianJin/TJZhuSuPlanModel.cs | 19 + APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj | 17 +- .../04409478-d788-4852-8555-f18cbd26a4af.xlsx | Bin 0 -> 8160 bytes .../93f7ac3d-039c-4909-b0d0-93e8be0fb2ed.xlsx | Bin 0 -> 8149 bytes .../9c911783-5bb0-45b7-909f-52e9ae8dfe9f.xlsx | Bin 0 -> 8160 bytes .../e42910bf-4998-4621-aa8a-5fb504b03308.xlsx | Bin 0 -> 8149 bytes .../BucketMaterialClassEdit.aspx | 4 +- .../BucketMaterialClassList.aspx | 4 +- .../Views/Monitordata/MonitordataList.aspx | 91 +++ .../QTYCompletionRateCountView.aspx | 170 +++++ .../Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx | 16 + .../Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx | 16 + .../Forms/Injection/InjectionCodePrint.cs | 2 +- .../Forms/Injection/SewingPrint.cs | 2 +- .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 9 +- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +- .../App_Data/FJCServiceList.xml | 7 + WebAPI/Controllers/InventoryController.cs | 20 + WebAPI/Controllers/MachineClassController.cs | 76 ++- WebAPI/Controllers/WareController.cs | 2 +- 50 files changed, 2569 insertions(+), 1013 deletions(-) create mode 100644 APPQ5/QMAPP.FJC.BLL/TianJin/MonitordataBLL.cs create mode 100644 APPQ5/QMAPP.FJC.DAL/CompleteStatistics/TJCompleteStatisticsDAL.cs create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/MonitordataDAL.cs create mode 100644 APPQ5/QMAPP.FJC.Entity/CompleteStatistics/TJCompleteStatisticsEntity.cs create mode 100644 APPQ5/QMAPP.FJC.Entity/CompleteStatistics/Table/T_AW_COMPLETE_TJSTATISTICS.cs create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/Monitordata.cs create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJPaoMoPlanImp.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJPaoMoPlanImp.xml create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJZhuSuPlanImp.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJZhuSuPlanImp.xml create mode 100644 APPQ5/QMAPP.FJC.Web/Controllers/MonitordataController.cs create mode 100644 APPQ5/QMAPP.FJC.Web/Models/TianJin/MonitordataModel.cs create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/04409478-d788-4852-8555-f18cbd26a4af.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/93f7ac3d-039c-4909-b0d0-93e8be0fb2ed.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/9c911783-5bb0-45b7-909f-52e9ae8dfe9f.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/e42910bf-4998-4621-aa8a-5fb504b03308.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Views/Monitordata/MonitordataList.aspx create mode 100644 APPQ5/QMAPP.FJC.Web/Views/RawMaterialRecordCount/QTYCompletionRateCountView.aspx diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index e72f1d0..7f8ff69 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -898,7 +898,11 @@ 删除 - + + + 查询 + + + <%=QMAPP.MESReport.Web.Controllers.EChartExampleController.QMEChartPageConfig()%> +
+
+ <%--异步获取数据生成图表--%> + <%=QMFrameWork.WebUI.QMEChart.QMEChartHelper.CreateEchart("echartID", "/QTYCompletionRateCount/GetEchartDataBar2", new string[] { "line", "bar" } + , "myEChart",400, QMFrameWork.WebUI.QMEChart.QMEChartHelper.echartEventEnum.click, "")%> +
+
+ + +
+
+
+ + + + + + + + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("PID")%> + + + + + + + + + + + + +
+ <%=Html.QTButtonSearch("QTYCompletionRateCount", "QTYCompletionRateCountView", "refreshEChartbar2()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("export", "ExportBanCi", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx index b68b3c3..bd5a90c 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/TJPaoMoPlan/TJPaoMoPlanEdit.aspx @@ -53,6 +53,22 @@ <%=Html.QC(p => p.COMPLETE_QTY)%> + + + + <%=Html.QV(p => p.REPAIR_QTY)%> + + + <%=Html.QC(p => p.REPAIR_QTY)%> + + + + + <%=Html.QV(p => p.SCRAP_QTY)%> + + + <%=Html.QC(p => p.SCRAP_QTY)%> + diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx index 718765a..daf89f1 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/TJZhuSuPlan/TJZhuSuPlanEdit.aspx @@ -54,6 +54,22 @@ <%=Html.QC(p => p.COMPLETE_QTY)%> + + + <%=Html.QV(p => p.REPAIR_QTY)%> + + + <%=Html.QC(p => p.REPAIR_QTY)%> + + + + + <%=Html.QV(p => p.SCRAP_QTY)%> + + + <%=Html.QC(p => p.SCRAP_QTY)%> + + <%=Html.QV(p => p.REMARK)%> diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs index 0f807f8..2d82664 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs @@ -254,7 +254,7 @@ namespace QMAPP.WinForm.Forms.Injection foreach (var la in labels) { - var material_T = new BucketMaterialClass() { MaterialCode = la.MaterialCode }; + var material_T = new BucketMaterialClass() { MaterialName = la.MaterialName }; var List = _agent.InvokeServiceFunction>(B9BasicService.RawMaterialBLL_GetListTo.ToString(), material_T); if (List != null && List.Count > 0) diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs index 7159775..ccfa5a6 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs @@ -244,7 +244,7 @@ namespace QMAPP.WinForm.Forms.Injection foreach (var la in labels) { - var material_T = new BucketMaterialClass() { MaterialCode = la.MaterialCode }; + var material_T = new BucketMaterialClass() { MaterialName = la.MaterialCode }; var List = _agent.InvokeServiceFunction>(B9BasicService.RawMaterialBLL_GetListTo.ToString(), material_T); if (List != null && List.Count > 0) diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index 3c726d7..e214d67 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -2178,8 +2178,10 @@ namespace QMAPP.WinForm.Forms.TianJin { if (dgvNF.Rows[a].Cells[CODE_NF.Name].Value.ToString().ToUpper() == tbl.Rows[i]["VIN"].ToString()) { - var sssss = dgvNF.Rows[a].Cells[CARSETDESC_CN_NF.Name].Value.ToString(); - ncsdr["CARSETDESCCN"] = sssss; + var CARSETDESCCN = dgvNF.Rows[a].Cells[CARSETDESC_CN_NF.Name].Value.ToString(); + var Material_code = dgvNF.Rows[a].Cells[PRODNO_NF.Name].Value.ToString(); + ncsdr["CARSETDESCCN"] = CARSETDESCCN; + tbl.Rows[i]["PRODNO"] = Material_code; } } @@ -2563,13 +2565,14 @@ namespace QMAPP.WinForm.Forms.TianJin { QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - CompleteStatisticsEntity model = new CompleteStatisticsEntity(); + TJCompleteStatisticsEntity model = new TJCompleteStatisticsEntity(); model.MATERIALNO = MaterialCode; model.SYSCOMPLETECOUNT = 1; model.COMPLETECOUNT = 1; model.STARTTIME = DateTime.Now; model.ENDTIME = DateTime.Now; model.ORDERNO = ORDERNO; + model.line = "770B"; var ss = agent.InvokeServiceFunction>("CompleteStatisticsBLL_Insert", model); } diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 928508f..ff5e811 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2024.07.05.01")] -[assembly: AssemblyFileVersion("2024.07.05.01")] +[assembly: AssemblyVersion("2024.07.24.01")] +[assembly: AssemblyFileVersion("2024.07.24.01")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml index 443a48a..bb3013e 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml @@ -1064,5 +1064,12 @@ QMAPP.FJC.BLL.TianJin.TJZhuSuPlanBLL QMAPP.FJC.BLL.dll + + + MonitordataBLL + 注塑参数 + QMAPP.FJC.BLL.TianJin.MonitordataBLL + QMAPP.FJC.BLL.dll + \ No newline at end of file diff --git a/WebAPI/Controllers/InventoryController.cs b/WebAPI/Controllers/InventoryController.cs index 9ee5bf7..afe709e 100644 --- a/WebAPI/Controllers/InventoryController.cs +++ b/WebAPI/Controllers/InventoryController.cs @@ -250,6 +250,26 @@ namespace WebAPI.Controllers $"(NEWID(), '{resObj.ProductCode}', '{resObj.Type}', '{resObj.State}', '{resObj.User}', '{DateTime.Now}');"; SqlData.InsertWare(sql_log); + if (resObj.Type == "1" && resObj.State == "3") + { + var sel3 = $"update [dbo].[T_PP_ORDERPLAN_PAOMO] set REPAIR_QTY = REPAIR_QTY + 1 where PLAN_NO = '{resObj.PlanID.Substring(0, 14)}'"; + SqlData.InsertWare(sel3); + } + else if (resObj.Type == "1" && resObj.State == "4") + { + var sel3 = $"update [dbo].[T_PP_ORDERPLAN_PAOMO] set SCRAP_QTY = SCRAP_QTY + 1 where PLAN_NO = '{resObj.PlanID.Substring(0, 14)}'"; + SqlData.InsertWare(sel3); + } + else if (resObj.Type == "2" && resObj.State == "3") + { + var sel3 = $"update [dbo].[T_PP_ORDERPLAN_ZHUSU] set REPAIR_QTY = REPAIR_QTY + 1 where PLAN_NO = '{resObj.PlanID.Substring(0, 14)}'"; + SqlData.InsertWare(sel3); + } + else if (resObj.Type == "2" && resObj.State == "4") + { + var sel3 = $"update [dbo].[T_PP_ORDERPLAN_ZHUSU] set SCRAP_QTY = SCRAP_QTY + 1 where PLAN_NO = '{resObj.PlanID.Substring(0, 14)}'"; + SqlData.InsertWare(sel3); + } } else { diff --git a/WebAPI/Controllers/MachineClassController.cs b/WebAPI/Controllers/MachineClassController.cs index 879ef5b..131b182 100644 --- a/WebAPI/Controllers/MachineClassController.cs +++ b/WebAPI/Controllers/MachineClassController.cs @@ -245,40 +245,64 @@ namespace WebAPI.Controllers var list_MachineClass = new List(); if (dataSet.Tables[0].Rows.Count > 0) { - foreach (DataRow R in dataSet.Tables[0].Rows) + if (sql_selectSetValue.Tables[0].Rows.Count > 0) { - var t = new MachineClass(); - t.PID = R["PID"].ToString(); - t.MachineCode = R["MachineCode"].ToString(); - t.Name = R["Name"].ToString(); - t.Position = R["Position"].ToString(); - t.Content = R["Content"].ToString(); - t.Methond = R["Methond"].ToString(); - t.Type = R["Type"].ToString(); - t.SerialNumber = R["SerialNumber"].ToString(); - - var m = list_PutMachine.Where(p => p.MachinePID == t.PID).OrderBy(o => o.SerialNumber).ToList(); - t.putMachine = m; - if (sql_selectSetValue.Tables[0].Rows.Count > 0) - { - t.SelectName = sql_selectSetValue.Tables[0].Rows[0]["HoldEndPos"].ToString(); - t.SelectValue = sql_selectSetValue.Tables[0].Rows[0]["HoldEndPos"].ToString(); - } - else + foreach (DataRow R in dataSet.Tables[0].Rows) { - t.SelectName = "0"; - t.SelectValue = "0"; + var t = new MachineClass(); + t.PID = R["PID"].ToString(); + t.MachineCode = R["MachineCode"].ToString(); + t.Name = R["Name"].ToString(); + t.Position = R["Position"].ToString(); + t.Content = R["Content"].ToString(); + t.Methond = R["Methond"].ToString(); + t.Type = R["Type"].ToString(); + t.SerialNumber = R["SerialNumber"].ToString(); + + var m = list_PutMachine.Where(p => p.MachinePID == t.PID).OrderBy(o => o.SerialNumber).ToList(); + t.putMachine = m; + + if (sql_selectSetValue.Tables[0].Rows.Count > 0) + { + if (R["SerialNumber"].ToString() == "1") + { + //注塑开始位置 + t.SelectName = sql_selectSetValue.Tables[0].Rows[0]["InjectStartPos"].ToString(); + t.SelectValue = sql_selectSetValue.Tables[0].Rows[0]["InjectStartPos"].ToString(); + } + else if (R["SerialNumber"].ToString() == "2") + { + //保压结束位置 + t.SelectName = sql_selectSetValue.Tables[0].Rows[0]["HoldEndPos"].ToString(); + t.SelectValue = sql_selectSetValue.Tables[0].Rows[0]["HoldEndPos"].ToString(); + } + else if (R["SerialNumber"].ToString() == "3") + { + //储料完成位置 + t.SelectName = sql_selectSetValue.Tables[0].Rows[0]["ChargeEndPos"].ToString(); + t.SelectValue = sql_selectSetValue.Tables[0].Rows[0]["ChargeEndPos"].ToString(); + } + } + else + { + t.SelectName = "0"; + t.SelectValue = "0"; + } + + list_MachineClass.Add(t); } - list_MachineClass.Add(t); + result.Result = list_MachineClass; + } + else + { + result.Code = 202; + result.Message = "产品信息不存在"; } - - result.Result = list_MachineClass; } else { - result.Code = 201; - result.Message = "设备信息不存在"; + } return result; diff --git a/WebAPI/Controllers/WareController.cs b/WebAPI/Controllers/WareController.cs index 1d8b463..065a401 100644 --- a/WebAPI/Controllers/WareController.cs +++ b/WebAPI/Controllers/WareController.cs @@ -59,7 +59,7 @@ namespace WebAPI.Controllers var resObj = JsonHelper.Instance.JsonToObj(requeststr); var sql = $"INSERT INTO [dbo].[T_MD_RawMaterialPaomo] ([PID], [planNumber], [materialName], [materialCode], [materialQty], [UserName], [CreateTime], [Remark1], [Remark2], [Remark3]) VALUES" + - $" (N'{Guid.NewGuid()}', N'{resObj.planNumber.Substring(0, 14)}', N'{resObj.materialName}', N'{resObj.materialCode}', N'{resObj.materialQty}', N'{resObj.id}', '{DateTime.Now}', NULL, NULL, NULL);"; + $" (N'{Guid.NewGuid()}', NULL, N'{resObj.materialName}', N'{resObj.materialCode}', N'{resObj.materialQty}', N'{resObj.id}', '{DateTime.Now}', NULL, NULL, NULL);"; SqlData.InsertWare(sql);