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 | 147 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 118 insertions(+), 29 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 03e5042..9db120d 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -24,6 +24,7 @@
//using ReportM;
using Kanban;
using Demo;
+using ProM.委外管理;
namespace LMES
{
@@ -3878,6 +3879,20 @@
oKf_MateOutRequestBill.ShowDialog();
break;
//===================================报表分析
+ case "kf_icinventory_barcode":
+ Kf_ICInventory_BarCode oKf_ICInventory_BarCode = new Kf_ICInventory_BarCode();
+ oKf_ICInventory_BarCode.MdiParent = oMain;
+ oKf_ICInventory_BarCode.ModCaption = gnmc;
+ oKf_ICInventory_BarCode.Show();
+ oMainForm.AddTabPage(oKf_ICInventory_BarCode);
+ break;
+ case "wms_barcodestatusqueryreport":
+ WMS_BarCodeStatusQueryReport oWMS_BarCodeStatusQueryReport = new WMS_BarCodeStatusQueryReport();
+ oWMS_BarCodeStatusQueryReport.MdiParent = oMain;
+ oWMS_BarCodeStatusQueryReport.ModCaption = gnmc;
+ oWMS_BarCodeStatusQueryReport.Show();
+ oMainForm.AddTabPage(oWMS_BarCodeStatusQueryReport);
+ break;
case "kf_icinventorylist":
//权限
WarM.KF_ICInventoryList oKF_ICInventoryList = new WarM.KF_ICInventoryList();
@@ -3926,6 +3941,25 @@
oKf_SafeStockReport.MdiParent = oMain;
oKf_SafeStockReport.Show();
oMainForm.AddTabPage(oKf_SafeStockReport);
+ break;
+ case "pt_radiumcarvingcodebilllist":
+ //权限
+ Pt_RadiumCarvingCodeBillList oPt_RadiumCarvingCodeBillList = new Pt_RadiumCarvingCodeBillList();
+ oPt_RadiumCarvingCodeBillList.MdiParent = oMain;
+ oPt_RadiumCarvingCodeBillList.Show();
+ oMainForm.AddTabPage(oPt_RadiumCarvingCodeBillList);
+ break;
+ case "sc_packunionbill":
+ Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
+ oSc_PackUnionBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ 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;
default:
break;
@@ -4285,6 +4319,13 @@
oWW_EntrustOrderBillList.MdiParent = oMain;
oWW_EntrustOrderBillList.Show();
oMainForm.AddTabPage(oWW_EntrustOrderBillList);
+ break;
+ case "ww_ppbombilllist":
+ //权限
+ WW_PPBomBillList oWW_PPBomBillList = new WW_PPBomBillList();
+ oWW_PPBomBillList.MdiParent = oMain;
+ oWW_PPBomBillList.Show();
+ oMainForm.AddTabPage(oWW_PPBomBillList);
break;
default:
break;
@@ -5195,6 +5236,20 @@
{
switch (gnsy.ToLower())
{
+ case "jit_getppbominfo":
+ JIT_GetPPBomInfo oJIT_GetPPBomInfo = new JIT_GetPPBomInfo();
+ oJIT_GetPPBomInfo.MdiParent = oMain;
+ oJIT_GetPPBomInfo.ModCaption = gnmc;
+ oJIT_GetPPBomInfo.Show();
+ oMainForm.AddTabPage(oJIT_GetPPBomInfo);
+ break;
+ case "eam_sourceruningstatus":
+ EAM_SourceRuningStatus oEAM_SourceRuningStatus = new EAM_SourceRuningStatus();
+ oEAM_SourceRuningStatus.MdiParent = oMain;
+ oEAM_SourceRuningStatus.ModCaption = gnmc;
+ oEAM_SourceRuningStatus.Show();
+ oMainForm.AddTabPage(oEAM_SourceRuningStatus);
+ break;
case "mes_stationoutbilllist_baofei":
MES_StationOutBillList_BaoFei oMES_StationOutBillList_BaoFei = new MES_StationOutBillList_BaoFei();
oMES_StationOutBillList_BaoFei.MdiParent = oMain;
@@ -5215,6 +5270,13 @@
oMES_StationOutBillList_Bad.ModCaption = gnmc;
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();
@@ -5707,23 +5769,23 @@
// oSc_PackSplitBillList.Show();
// oMainForm.AddTabPage(oSc_PackSplitBillList);
// break;
- //case "sc_packunionbill":
- // Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
- // oSc_PackUnionBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
- // oSc_PackUnionBill.ModCaption = gnmc;
- // oSc_PackUnionBill.ShowDialog();
- // break;
- //case "sc_packunionbilllist":
- // Sc_PackUnionBillList oSc_PackUnionBillList = new Sc_PackUnionBillList();
- // oSc_PackUnionBillList.MdiParent = oMain;
- // oSc_PackUnionBillList.ModCaption = gnmc;
- // oSc_PackUnionBillList.Show();
- // oMainForm.AddTabPage(oSc_PackUnionBillList);
- // break;
+ case "sc_packunionbill":
+ Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
+ oSc_PackUnionBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oSc_PackUnionBill.ModCaption = gnmc;
+ oSc_PackUnionBill.ShowDialog();
+ break;
+ case "sc_packunionbilllist":
+ Sc_PackUnionBillList oSc_PackUnionBillList = new Sc_PackUnionBillList();
+ oSc_PackUnionBillList.MdiParent = oMain;
+ oSc_PackUnionBillList.ModCaption = gnmc;
+ oSc_PackUnionBillList.Show();
+ oMainForm.AddTabPage(oSc_PackUnionBillList);
+ break;
-
-
+
+
//===========================MES平板系统单据
@@ -5785,20 +5847,20 @@
oMES_StationOutBillList.Show();
oMainForm.AddTabPage(oMES_StationOutBillList);
break;
- case "sc_packunionbill":
- Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
- oSc_PackUnionBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
- oSc_PackUnionBill.ModCaption = gnmc;
- oSc_PackUnionBill.ShowDialog();
- break;
- case "sc_packunionbilllist":
- //权限
- Sc_PackUnionBillList oSc_PackUnionBillList = new Sc_PackUnionBillList();
- oSc_PackUnionBillList.MdiParent = oMain;
- oSc_PackUnionBillList.ModCaption = gnmc;
- oSc_PackUnionBillList.Show();
- oMainForm.AddTabPage(oSc_PackUnionBillList);
- break;
+ //case "sc_packunionbill":
+ // Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
+ // oSc_PackUnionBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ // oSc_PackUnionBill.ModCaption = gnmc;
+ // oSc_PackUnionBill.ShowDialog();
+ // break;
+ //case "sc_packunionbilllist":
+ // //权限
+ // Sc_PackUnionBillList oSc_PackUnionBillList = new Sc_PackUnionBillList();
+ // oSc_PackUnionBillList.MdiParent = oMain;
+ // oSc_PackUnionBillList.ModCaption = gnmc;
+ // oSc_PackUnionBillList.Show();
+ // oMainForm.AddTabPage(oSc_PackUnionBillList);
+ // break;
//case "mes_mesbeginworkbill":
// MES_MESBeginWorkBill oMES_MESBeginWorkBill = new MES_MESBeginWorkBill();
// oMES_MESBeginWorkBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
@@ -5912,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:
@@ -6637,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;
@@ -8023,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