From ae23855fd7af654b5fc1027f6fb76f8b58d27118 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 17 一月 2022 09:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/ClsShowMod.cs | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 948d4c3..c419987 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -24,6 +24,7 @@
//using ReportM;
using Kanban;
using Demo;
+using ProM.委外管理;
namespace LMES
{
@@ -3632,6 +3633,12 @@
oGy_BarCodeBill.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_BarCodeBill.ShowDialog();
break;
+ case "sc_icmotobarcode":
+ //
+ Sc_ICMOToBarCode oSc_ICMOToBarCode = new Sc_ICMOToBarCode();
+ oSc_ICMOToBarCode.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oSc_ICMOToBarCode.ShowDialog();
+ break;
case "kf_barcodeoutinreport":
//权限
Kf_BarCodeOutInReport oKf_BarCodeOutInReport = new Kf_BarCodeOutInReport();
@@ -3927,6 +3934,12 @@
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;
default:
break;
@@ -4286,6 +4299,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;
@@ -5196,6 +5216,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;
@@ -5223,6 +5257,13 @@
oSc_ProdWIPTotalReport.ModCaption = gnmc;
oSc_ProdWIPTotalReport.Show();
oMainForm.AddTabPage(oSc_ProdWIPTotalReport);
+ break;
+ case "mes_wipprocreport_wip":
+ MES_WIPProcReport_WIP oMES_WIPProcReport_WIP = new MES_WIPProcReport_WIP();
+ oMES_WIPProcReport_WIP.MdiParent = oMain;
+ oMES_WIPProcReport_WIP.ModCaption = gnmc;
+ oMES_WIPProcReport_WIP.Show();
+ oMainForm.AddTabPage(oMES_WIPProcReport_WIP);
break;
case "mes_wipprocreport":
MES_WIPProcReport oMES_WIPProcReport = new MES_WIPProcReport();
@@ -5701,23 +5742,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平板系统单据
@@ -5779,20 +5820,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;
--
Gitblit v1.9.1