~yxj/MES-WEB-API.git

			@@ -24,6 +24,8 @@
			//using ReportM;
			using Kanban;
			using Demo;
			using ProM.委外管理;
			using BaseSet.公用资料.其他基础资料;

			namespace LMES
			{
			@@ -50,6 +52,7 @@
			break;
			case "pa":
			//工资管理

			Zxxymk_GZXT(gnsy, gnmc, oMain);
			break;
			case "jh":
			@@ -3631,6 +3634,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();
			@@ -3871,6 +3880,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();
			@@ -3919,6 +3942,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;
			@@ -4278,6 +4320,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;
			@@ -5188,6 +5237,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;
			@@ -5658,23 +5763,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平板系统单据

			@@ -5736,20 +5841,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;
			@@ -5857,6 +5962,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:
			@@ -6579,8 +6690,22 @@
			return;
			try
			{
			//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;
			oGy_DotCheck.Show();
			oMainForm.AddTabPage(oGy_DotCheck);
			break;
			case "gy_basedemo":
			//权限
			Gy_BaseDemo oGy_BaseDemo = new Gy_BaseDemo();
			@@ -7653,6 +7778,7 @@
			oGy_QCCheckItem.Show();
			oMainForm.AddTabPage(oGy_QCCheckItem);
			break;

			case "":
			//
			break;
			@@ -7960,6 +8086,12 @@
			oGy_DataIn_ProcessPrice.Show();
			oMainForm.AddTabPage(oGy_DataIn_ProcessPrice);
			break;
			case "gy_stdworktimes_routingbill":
			Gy_StdWorkTimes_RoutingBill oGy_StdWorkTimes_RoutingBill = new Gy_StdWorkTimes_RoutingBill();
			oGy_StdWorkTimes_RoutingBill.MdiParent = oMain;
			oGy_StdWorkTimes_RoutingBill.Show();
			oMainForm.AddTabPage(oGy_StdWorkTimes_RoutingBill);
			break;
			case "gy_datain_process":
			Gy_DataIn_Process oGy_DataIn_Process = new Gy_DataIn_Process();
			oGy_DataIn_Process.MdiParent = oMain;