From f7a99b8d50c3cad18038c88985e8932d0f6a130b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 13 六月 2024 11:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 4a83862..40c512f 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,6 +25,7 @@
 using Kanban;
 using Demo;
 using ProM.委外管理;
+using WarM.条码打印;
 
 namespace LMES
 {
@@ -4004,6 +4005,20 @@
                         oKf_AGVRequestBill_FastList.Show();
                         oMainForm.AddTabPage(oKf_AGVRequestBill_FastList);
                         break;
+                    case "gy_barcodebill_automaticallybyplc":
+                        //权限
+                        Gy_BarCodeBill_automaticallyByPLC_New oGy_BarCodeBill_automaticallyByPLC = new Gy_BarCodeBill_automaticallyByPLC_New();
+                        oGy_BarCodeBill_automaticallyByPLC.MdiParent = oMain;
+                        oGy_BarCodeBill_automaticallyByPLC.Show();
+                        oMainForm.AddTabPage(oGy_BarCodeBill_automaticallyByPLC);
+                        break;
+                    case "gy_packbarcodebill_automaticallybyplc":
+                        //权限
+                        Gy_PackBarCodeBill_automaticallyByPLC oGy_PackBarCodeBill_automaticallyByPLC = new Gy_PackBarCodeBill_automaticallyByPLC();
+                        oGy_PackBarCodeBill_automaticallyByPLC.MdiParent = oMain;
+                        oGy_PackBarCodeBill_automaticallyByPLC.Show();
+                        oMainForm.AddTabPage(oGy_PackBarCodeBill_automaticallyByPLC);
+                        break;
                     default:
                         break;
                 }
@@ -5449,7 +5464,14 @@
                         oSc_StationOutSumReport.ModCaption = gnmc;
                         oSc_StationOutSumReport.Show();
                         oMainForm.AddTabPage(oSc_StationOutSumReport);
-                        break; 
+                        break;
+                    case "sc_procexchangenoinreport":
+                        Sc_ProcExchangeNoInReport oSc_ProcExchangeNoInReport = new Sc_ProcExchangeNoInReport();
+                        oSc_ProcExchangeNoInReport.MdiParent = oMain;
+                        oSc_ProcExchangeNoInReport.ModCaption = gnmc;
+                        oSc_ProcExchangeNoInReport.Show();
+                        oMainForm.AddTabPage(oSc_ProcExchangeNoInReport);
+                        break;
                     case "sc_processexchangebill":
                         Sc_ProcessExchangeBill oSc_ProcessExchangeBill = new Sc_ProcessExchangeBill();
                         oSc_ProcessExchangeBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;

--
Gitblit v1.9.1