From c6b5ec12fd95e928a10ec7e23334eb30829d000b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 29 六月 2022 16:41:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 LMES/ClsShowMod.cs |   61 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 9c1c509..6554e4a 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3955,6 +3955,33 @@
                         oSc_PackUnionBill.ModCaption = gnmc;
                         oSc_PackUnionBill.ShowDialog();
                         break;
+                    case "gy_barcodebill_chaima":
+                        WarM.Gy_BarCodeBill_ChaiMa oGy_BarCodeBill_ChaiMa = new WarM.Gy_BarCodeBill_ChaiMa();
+                        oGy_BarCodeBill_ChaiMa.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+                        //oGy_BarCodeBill_ChaiMa.ModCaption = gnmc;
+                        oGy_BarCodeBill_ChaiMa.ShowDialog();
+                        break;
+                    case "sc_cgkb":
+                        //权限
+                        Sc_CGKB oSc_CGKB = new Sc_CGKB();
+                        oSc_CGKB.MdiParent = oMain;
+                        oSc_CGKB.Show();
+                        oMainForm.AddTabPage(oSc_CGKB);
+                        break;
+                    case "sc_cjkb":
+                        //权限
+                        Sc_CJKB oSc_CJKB = new Sc_CJKB();
+                        oSc_CJKB.MdiParent = oMain;
+                        oSc_CJKB.Show();
+                        oMainForm.AddTabPage(oSc_CJKB);
+                        break;
+                    case "sc_qlkb":
+                        //权限
+                        Sc_QLKB oSc_QLKB = new Sc_QLKB();
+                        oSc_QLKB.MdiParent = oMain;
+                        oSc_QLKB.Show();
+                        oMainForm.AddTabPage(oSc_QLKB);
+                        break;
                     default:
                         break;
                 }
@@ -5265,6 +5292,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;
@@ -5961,6 +5995,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:
@@ -6686,6 +6734,13 @@
                 //MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
                 switch (gnsy.ToLower())
                 {
+                    case "gy_stdworktimeslist":
+                        //权限
+                        Gy_StdWorkTimesList oGy_StdWorkTimesList = new Gy_StdWorkTimesList();
+                        oGy_StdWorkTimesList.MdiParent = oMain;
+                        oGy_StdWorkTimesList.Show();
+                        oMainForm.AddTabPage(oGy_StdWorkTimesList);
+                        break;
                     case "gy_dotcheck"://点检项目
                         Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
                         oGy_DotCheck.MdiParent = oMain;
@@ -8072,6 +8127,12 @@
                         oGy_DataIn_ProcessPrice.Show();
                         oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
                         break;
+                    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();
                         oGy_DataIn_Process.MdiParent = oMain;

--
Gitblit v1.9.1