From 22971886a0e1897aabf62b228215bbee3f2d5a6c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 13:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 LMES/ClsShowMod.cs |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 3c10a04..9db120d 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,7 +25,6 @@
 using Kanban;
 using Demo;
 using ProM.委外管理;
-using BaseSet.公用资料.其他基础资料;
 
 namespace LMES
 {
@@ -5272,6 +5271,13 @@
                         oMES_StationOutBillList_Bad.Show();
                         oMainForm.AddTabPage(oMES_StationOutBillList_Bad);
                         break;
+                    case "mes_stationoutbilllist_lastproc":
+                        MES_StationOutBillList_LastProc oMES_StationOutBillList_LastProc = new MES_StationOutBillList_LastProc();
+                        oMES_StationOutBillList_LastProc.MdiParent = oMain;
+                        oMES_StationOutBillList_LastProc.ModCaption = gnmc;
+                        oMES_StationOutBillList_LastProc.Show();
+                        oMainForm.AddTabPage(oMES_StationOutBillList_LastProc);
+                        break;
                     case "sc_prodwiptotalreport":
                         Sc_ProdWIPTotalReport oSc_ProdWIPTotalReport = new Sc_ProdWIPTotalReport();
                         oSc_ProdWIPTotalReport.MdiParent = oMain;
@@ -5968,6 +5974,20 @@
                         oDefectiveDetailedYieldReport.MdiParent = oMain;
                         oDefectiveDetailedYieldReport.Show();
                         oMainForm.AddTabPage(oDefectiveDetailedYieldReport);
+                        break;
+                    case "mes_stationoutprocsumreport":
+                        //权限
+                        MES_StationOutProcSumReport oMES_StationOutProcSumReport = new MES_StationOutProcSumReport();
+                        oMES_StationOutProcSumReport.MdiParent = oMain;
+                        oMES_StationOutProcSumReport.Show();
+                        oMainForm.AddTabPage(oMES_StationOutProcSumReport);
+                        break;
+                    case "mes_prodhourssumreport":
+                        //权限
+                        MES_ProdHoursSumReport oMES_ProdHoursSumReport = new MES_ProdHoursSumReport();
+                        oMES_ProdHoursSumReport.MdiParent = oMain;
+                        oMES_ProdHoursSumReport.Show();
+                        oMainForm.AddTabPage(oMES_ProdHoursSumReport);
                         break;
 
                     default:
@@ -8086,11 +8106,11 @@
                         oGy_DataIn_ProcessPrice.Show();
                         oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
                         break;
-                    case "gy_stdworktimes_routingbill":
-                        Gy_StdWorkTimes_RoutingBill oGy_StdWorkTimes_RoutingBill = new Gy_StdWorkTimes_RoutingBill();
-                        oGy_StdWorkTimes_RoutingBill.MdiParent = oMain;
-                        oGy_StdWorkTimes_RoutingBill.Show();
-                        oMainForm.AddTabPage(oGy_StdWorkTimes_RoutingBill);
+                    case "gy_datain_stdworktimes":
+                        Gy_DataIn_StdWorkTimes oGy_DataIn_StdWorkTimes = new Gy_DataIn_StdWorkTimes();
+                        oGy_DataIn_StdWorkTimes.MdiParent = oMain;
+                        oGy_DataIn_StdWorkTimes.Show();
+                        oMainForm.AddTabPage(oGy_DataIn_StdWorkTimes);
                         break;
                     case "gy_datain_process":
                         Gy_DataIn_Process oGy_DataIn_Process = new Gy_DataIn_Process();

--
Gitblit v1.9.1