~yxj/MES-WEB-API.git

			@@ -24,6 +24,7 @@
			//using ReportM;
			using Kanban;
			using Demo;
			using ProM.委外管理;

			namespace LMES
			{
			@@ -35,6 +36,7 @@
			if (!DBUtility.ClsPub.Security_Log(gnsy.Trim(), 1, true, DBUtility.ClsPub.CurUserName))
			{
			return;

			}
			//
			switch (gnbm.Trim().Substring(0, 2))
			@@ -49,6 +51,7 @@
			break;
			case "pa":
			//工资管理

			Zxxymk_GZXT(gnsy, gnmc, oMain);
			break;
			case "jh":
			@@ -3630,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();
			@@ -3918,6 +3927,19 @@
			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;
			default:
			break;
			@@ -4277,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;
			@@ -5187,6 +5216,62 @@
			{
			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;
			oMES_StationOutBillList_BaoFei.ModCaption = gnmc;
			oMES_StationOutBillList_BaoFei.Show();
			oMainForm.AddTabPage(oMES_StationOutBillList_BaoFei);
			break;
			case "mes_stationoutbilllist_geli":
			MES_StationOutBillList_GeLi oMES_StationOutBillList_GeLi = new MES_StationOutBillList_GeLi();
			oMES_StationOutBillList_GeLi.MdiParent = oMain;
			oMES_StationOutBillList_GeLi.ModCaption = gnmc;
			oMES_StationOutBillList_GeLi.Show();
			oMainForm.AddTabPage(oMES_StationOutBillList_GeLi);
			break;
			case "mes_stationoutbilllist_bad":
			MES_StationOutBillList_Bad oMES_StationOutBillList_Bad = new MES_StationOutBillList_Bad();
			oMES_StationOutBillList_Bad.MdiParent = oMain;
			oMES_StationOutBillList_Bad.ModCaption = gnmc;
			oMES_StationOutBillList_Bad.Show();
			oMainForm.AddTabPage(oMES_StationOutBillList_Bad);
			break;
			case "sc_prodwiptotalreport":
			Sc_ProdWIPTotalReport oSc_ProdWIPTotalReport = new Sc_ProdWIPTotalReport();
			oSc_ProdWIPTotalReport.MdiParent = oMain;
			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();
			oMES_WIPProcReport.MdiParent = oMain;
			oMES_WIPProcReport.ModCaption = gnmc;
			oMES_WIPProcReport.Show();
			oMainForm.AddTabPage(oMES_WIPProcReport);
			break;
			case "mes_icmobillstatusreport":
			MES_ICMOBillStatusReport oMES_ICMOBillStatusReport = new MES_ICMOBillStatusReport();
			oMES_ICMOBillStatusReport.MdiParent = oMain;
			@@ -5657,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平板系统单据

			@@ -5735,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;
			@@ -5856,6 +5941,12 @@
			oQC_NoPassProdCheckBillQuery.MdiParent = oMain;
			oQC_NoPassProdCheckBillQuery.Show();
			oMainForm.AddTabPage(oQC_NoPassProdCheckBillQuery);
			break;
			case "defectivedetailedyieldreport":
			DefectiveDetailedYieldReport oDefectiveDetailedYieldReport = new DefectiveDetailedYieldReport();
			oDefectiveDetailedYieldReport.MdiParent = oMain;
			oDefectiveDetailedYieldReport.Show();
			oMainForm.AddTabPage(oDefectiveDetailedYieldReport);
			break;

			default:
			@@ -6578,8 +6669,15 @@
			return;
			try
			{
			//MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
			switch (gnsy.ToLower())
			{
			case "gy_dotcheck"://点检项目
			Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
			oGy_DotCheck.MdiParent = oMain;
			oGy_DotCheck.Show();
			oMainForm.AddTabPage(oGy_DotCheck);
			break;
			case "gy_basedemo":
			//权限
			Gy_BaseDemo oGy_BaseDemo = new Gy_BaseDemo();
			@@ -7652,6 +7750,7 @@
			oGy_QCCheckItem.Show();
			oMainForm.AddTabPage(oGy_QCCheckItem);
			break;

			case "":
			//
			break;