From d8fc6ac36336cb02a00f1e5f4e90b7bdfb34fb85 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 十月 2024 11:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/ClsShowMod.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 722301a..d8797f5 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -25,6 +25,7 @@
using Kanban;
using Demo;
using ProM.委外管理;
+using WarM.条码打印;
namespace LMES
{
@@ -2038,7 +2039,7 @@
Sc_HZQLCGKB oSc_HZQLCGKB = new Sc_HZQLCGKB();
oSc_HZQLCGKB.ShowDialog();
break;
-
+
case "sc_processplanchangelist":
//权限
Sc_ProcessPlanChangeList oSc_ProcessPlanChangeList = new Sc_ProcessPlanChangeList();
@@ -3633,6 +3634,31 @@
oGy_BarCodeBill.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_BarCodeBill.ShowDialog();
break;
+ case "gy_barcodebill_new":
+ //
+ Gy_BarCodeBill_New oGy_BarCodeBill_New = new Gy_BarCodeBill_New();
+ oGy_BarCodeBill_New.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_BarCodeBill_New.ShowDialog();
+ break;
+ case "gy_cusbarcodebilllist":
+ //权限
+ Gy_CusBarCodeBillList oGy_CusBarCodeBillList = new Gy_CusBarCodeBillList();
+ oGy_CusBarCodeBillList.MdiParent = oMain;
+ oGy_CusBarCodeBillList.Show();
+ oMainForm.AddTabPage(oGy_CusBarCodeBillList);
+ break;
+ case "gy_cusbarcodebill_kaibei":
+ //
+ Gy_CusBarCodeBill_KaiBei oGy_CusBarCodeBill_KaiBei = new Gy_CusBarCodeBill_KaiBei();
+ oGy_CusBarCodeBill_KaiBei.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_CusBarCodeBill_KaiBei.ShowDialog();
+ break;
+ case "gy_cusbarcodebill_kaibei_langchao":
+ //
+ Gy_CusBarCodeBill_KaiBei_LangChao oGy_CusBarCodeBill_KaiBei_LangChao = new Gy_CusBarCodeBill_KaiBei_LangChao();
+ oGy_CusBarCodeBill_KaiBei_LangChao.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_CusBarCodeBill_KaiBei_LangChao.ShowDialog();
+ break;
case "sc_icmotobarcode":
//
Sc_ICMOToBarCode oSc_ICMOToBarCode = new Sc_ICMOToBarCode();
@@ -3777,6 +3803,11 @@
//
Kf_SellOutBill oKf_SellOutBill = new Kf_SellOutBill();
oKf_SellOutBill.ShowDialog();
+ break;
+ case "kf_selloutbill_barcodenote":
+ //
+ Kf_SellOutBill_BarCodeNote oKf_SellOutBill_BarCodeNote = new Kf_SellOutBill_BarCodeNote();
+ oKf_SellOutBill_BarCodeNote.ShowDialog();
break;
case "kf_mateoutbilllist":
//权限
@@ -3998,6 +4029,20 @@
oKf_AGVRequestBill_FastList.MdiParent = oMain;
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;
@@ -5444,7 +5489,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;
@@ -7906,6 +7958,10 @@
Sc_SCJDKB oSc_SCJDKB = new Sc_SCJDKB();
oSc_SCJDKB.ShowDialog();
break;
+ case "sc_wgjckkb":
+ Sc_WGJCKKB oSc_WGJCKKB = new Sc_WGJCKKB();
+ oSc_WGJCKKB.ShowDialog();
+ break;
//
case "gy_sopbilllist":
//权限
--
Gitblit v1.9.1