From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/ClsShowMod.cs | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 04aa2dd..9db120d 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3956,7 +3956,7 @@
oSc_PackUnionBill.ShowDialog();
break;
case "gy_barcodebill_chaima":
- WarM.仓库管理.Gy_BarCodeBill_ChaiMa oGy_BarCodeBill_ChaiMa = new WarM.仓库管理.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();
@@ -5271,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;
@@ -5967,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:
@@ -6692,6 +6713,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;
@@ -8078,6 +8106,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