MES-WEB-API.git

			@@ -10,7 +10,9 @@
			public ClsXt_SystemParameterMain omodel = new ClsXt_SystemParameterMain();
			public List<ClsXt_SystemParameterMain> DetailColl = new List<ClsXt_SystemParameterMain>();
			ClsSqlHelper oCn = new ClsSqlHelper();


			public object Kf_POStockInBill_MulSourceBill { get; set; }

			//新增
			public bool AddBill(ref string sReturn)
			{
			@@ -86,7 +88,7 @@
			for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
			{
			//WMS条码系统参数
			//生产汇报单
			//==============================生产汇报单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
			{
			omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -135,7 +137,18 @@
			{
			omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//收料通知单(送货单、到货确认）
			//生产汇报单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ICMOReportBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产汇报单报工台报检申请生产汇报单前判断是否过程检验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ProcessCheckOut")
			{
			omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==========================================收料通知单(送货单、到货确认）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
			{
			omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -148,7 +161,7 @@
			{
			omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//采购入库单
			//===================================采购入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
			{
			omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -193,8 +206,13 @@
			{
			omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//采购入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//产品入库单
			//=======================================产品入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
			{
			omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -239,8 +257,12 @@
			{
			omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库单
			//产品入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//=======================================================其他入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
			{
			omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -281,7 +303,13 @@
			{
			omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库单校验
			//其他入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//========================================其他入库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -295,7 +323,7 @@
			omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外入库单
			//==============================================委外入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
			{
			omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -336,8 +364,15 @@
			{
			omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产领料单


			//=========================================生产领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
			{
			omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -390,7 +425,10 @@
			{
			omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产领料单校验



			//=========================================生产领料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -404,7 +442,7 @@
			omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售出库单
			//=======================================销售出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
			{
			omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -461,6 +499,12 @@
			{
			omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//销售出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
			{
			@@ -473,6 +517,10 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MultilineCtl")
			{
			omodel.Kf_SellOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库单
			@@ -520,7 +568,14 @@
			{
			omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他出库单校验
			//其他出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//========================================其他出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -534,7 +589,7 @@
			omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外出库单
			//========================================委外出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -583,8 +638,28 @@
			{
			omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产补料单

			//===========================委外领料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
			{
			omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
			{
			omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=============================生产补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
			{
			omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -621,7 +696,20 @@
			{
			omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOList")
			{
			omodel.Kf_MateReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOCtl")
			{
			omodel.Kf_MateReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产补料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==============================生产补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -635,7 +723,71 @@
			omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//直接调拨单
			//================================委外补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
			{
			omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_ERPMode")
			{
			omodel.Kf_EntrustReplenishOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MustQtyCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MulSourceBill")
			{
			omodel.Kf_EntrustReplenishOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BatchNoCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MultilineCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MaterWHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOList")
			{
			omodel.Kf_EntrustReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外补料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//======================委外补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==================直接调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
			{
			omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -684,7 +836,12 @@
			{
			omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//直接调拨单校验
			//直接调拨单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========================================直接调拨单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
			{
			omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -698,7 +855,7 @@
			omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调出单
			//==============================================分步式调出单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
			{
			omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -743,8 +900,12 @@
			{
			omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调入单
			//分步式调出单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//=========================================分步式调入单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
			{
			omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -793,8 +954,13 @@
			{
			omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//分步式调入单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//采购退料单
			//=====================================采购退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
			{
			omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -831,8 +997,12 @@
			{
			omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退库单
			//采购退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========================生产退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
			{
			omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -869,8 +1039,12 @@
			{
			omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库红字
			//产品退库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==============================其他入库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
			{
			omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -907,8 +1081,12 @@
			{
			omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退库单
			//其他入库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===================================委外退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
			{
			omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -945,8 +1123,12 @@
			{
			omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退料单
			//其他入库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//====================================生产退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
			{
			omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -987,8 +1169,13 @@
			{
			omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售退库单
			//===========================销售退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
			{
			omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1029,8 +1216,12 @@
			{
			omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库红字
			//销售退库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========================其他出库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
			{
			omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1067,8 +1258,12 @@
			{
			omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退料单
			//其他出库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//======================================委外退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1108,6 +1303,11 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode")
			{
			omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//WMS 通用
			@@ -1181,6 +1381,11 @@
			{
			omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//单据日期是否取界面递入日期
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_BillDateMode")
			{
			omodel.WMS_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//桌面条码模块
			//有源单生成条码，生成条码数量可否超源单数量控制
			@@ -1202,6 +1407,155 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_UpdatePrintQtyCtl")
			{
			omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//============================================================================器具管理EAM系统参数
			//===========器具采购入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_AutoCheck")
			{
			omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty")
			{
			omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具领用出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck")
			{
			omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty")
			{
			omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew")
			{
			omodel.Sc_MouldProdOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_MouldProdOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrl")
			{
			omodel.Sc_MouldProdOutBill_MouldLifeCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrlType")
			{
			omodel.Sc_MouldProdOutBill_MouldLifeCtrlType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具领用退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_AutoCheck")
			{
			omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty")
			{
			omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具改制出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck")
			{
			omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty")
			{
			omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具改制入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck")
			{
			omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty")
			{
			omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具其他入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck")
			{
			omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty")
			{
			omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具其他出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck")
			{
			omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty")
			{
			omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具暂借入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck")
			{
			omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty")
			{
			omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具暂借出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck")
			{
			omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty")
			{
			omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具报废入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck")
			{
			omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty")
			{
			omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具报废出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck")
			{
			omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty")
			{
			omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具直接调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck")
			{
			omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty")
			{
			omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具分步调出单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck")
			{
			omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty")
			{
			omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具分步调入单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck")
			{
			omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty")
			{
			omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具盘点单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck")
			{
			omodel.Sc_MouldProdCheckStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==============================================================================================
			@@ -1242,7 +1596,24 @@
			{
			omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//进站接收单是否自动匹配对应流水号
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_AutoFindSNO")
			{
			omodel.MES_StationInBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//进站接收单只显示用户对应工序
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_ShowUSERProcess")
			{
			omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
			{
			omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}



			//===============出站单
			//出站数量不能大于本道进站汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
			@@ -1259,6 +1630,39 @@
			{
			omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//首道工序出站后自动生成ERP生产汇报单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FstAutoICMOReport")
			{
			omodel.MES_StationOutBill_FstAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//末道工序出站后自动生成ERP生产汇报单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_LastAutoICMOReport")
			{
			omodel.MES_StationOutBill_LastAutoICMOReport = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//末道工序出站后自动生成ERP生产入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoStockIn")
			{
			omodel.MES_StationOutBill_AutoStockIn = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//末道工序自动入库时仓库取值类型（物料、工序、工艺路线）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
			{
			omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站汇报单是否自动匹配对应流水号
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoFindSNO")
			{
			omodel.MES_StationOutBill_AutoFindSNO = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站汇报单只显示用户对应工序
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_ShowUSERProcess")
			{
			omodel.MES_StationOutBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}




			//=====不良评审单
			//不良品数不能大于出站单报废数量
			@@ -1316,6 +1720,18 @@
			omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//工序末道入库仓库取值类型
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
			{
			omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//===========工艺路线
			//保存到数据库时自动加上转工序
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_SaveAutoLastProc")
			{
			omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=======JIT

			@@ -1349,6 +1765,11 @@
			{
			omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//当下一个生产日计划是相同产品时，MES系统自动开工下一单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill")
			{
			omodel.Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========质量汇报单
			//自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillQualityStatus_AutoCheck")
			@@ -1375,6 +1796,11 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_AutoCheck")
			{
			omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//是否发送钉钉消息本地不发,(斯莫尔)客户发
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_SendDingDingMsg")
			{
			omodel.OA_ErrMsgBackBill_SendDingDingMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========工序进站接收单
			@@ -1405,11 +1831,131 @@
			omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//=============================首件检验单
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_AutoCheck")
			{
			omodel.QC_FirstPieceCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//保存后变为新增状态
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_SaveAutoAddnew")
			{
			omodel.QC_FirstPieceCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_DeleterAndMakerMustSame")
			{
			omodel.QC_FirstPieceCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//质检方案来源
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_FirstPieceCheckBill_QCSchemeSource")
			{
			omodel.QC_FirstPieceCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}



			//=============================巡检单
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_AutoCheck")
			{
			omodel.QC_PatrolProcCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//保存后变为新增状态
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_SaveAutoAddnew")
			{
			omodel.QC_PatrolProcCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_DeleterAndMakerMustSame")
			{
			omodel.QC_PatrolProcCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//质检方案来源
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_PatrolProcCheckBill_QCSchemeSource")
			{
			omodel.QC_PatrolProcCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//=============================工序转序检验单
			//保存后是否自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_AutoCheck")
			{
			omodel.QC_ProcessCheckBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//保存后变为新增状态
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_SaveAutoAddnew")
			{
			omodel.QC_ProcessCheckBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_DeleterAndMakerMustSame")
			{
			omodel.QC_ProcessCheckBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//质检方案来源
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "QC_ProcessCheckBill_QCSchemeSource")
			{
			omodel.QC_ProcessCheckBill_QCSchemeSource = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}



			//报工台，工序汇报自动审核参数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
			{
			omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//条码主档删除人必须是制单人（'Y'为控制）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_DeleterAndMakerMustSame")
			{
			omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//-==================生产订单
			//生产订单同步时自动生成流转卡
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_AutoProcExchBill")
			{
			omodel.Sc_ICMOBill_AutoProcExchBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ICMOBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//-==================工序流转卡
			//工序流转卡保存自动同步条码档案
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
			{
			omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull")
			{
			omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			////=========工序进站单
			////自动匹配流水号
			//if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
			//{
			// omodel.MES_StationBill_ProcNo = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			//}

			////=========工序进出站
			////只显示用户对应工序
			//if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNoByUser")
			//{
			// omodel.MES_StationBill_ProcNoByUser = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			//}
			}
			sReturn = "显示单据成功！";
			return true;
			@@ -1433,8 +1979,8 @@

			for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
			{
			//WMS条码系统参数
			//生产汇报单
			//========================================================WMS条码系统参数
			//===========生产汇报单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
			{
			omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1483,7 +2029,17 @@
			{
			omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//收料通知单(送货单、到货确认）
			//生产汇报单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ICMOReportBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产汇报单报工台报检申请生产汇报单前判断是否过程检验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ProcessCheckOut")
			{
			omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//========收料通知单(送货单、到货确认）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
			{
			omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1496,7 +2052,7 @@
			{
			omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//采购入库单
			//===========采购入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
			{
			omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1541,8 +2097,13 @@
			{
			omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//采购入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//产品入库单
			//===========产品入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
			{
			omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1587,8 +2148,13 @@
			{
			omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//产品入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库单
			//=========其他入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
			{
			omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1629,7 +2195,12 @@
			{
			omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库单校验
			//其他入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//============其他入库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1643,7 +2214,7 @@
			omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外入库单
			//=========委外入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
			{
			omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1684,8 +2255,13 @@
			{
			omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外入库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产领料单
			//==========生产领料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
			{
			omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1738,7 +2314,7 @@
			{
			omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产领料单校验
			//==========生产领料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1752,7 +2328,7 @@
			omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售出库单
			//============销售出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
			{
			omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1809,7 +2385,12 @@
			{
			omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//销售出库单校验
			//销售出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//============销售出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_SellOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1822,8 +2403,12 @@
			{
			omodel.Kf_SellOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_SourceBarCodeCtl")
			{
			omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库单
			//============其他出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
			{
			omodel.Kf_OtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1868,7 +2453,12 @@
			{
			omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他出库单校验
			//其他出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========其他出库单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1882,7 +2472,7 @@
			omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外出库单
			//==========委外出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1931,8 +2521,26 @@
			{
			omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外出库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========委外领料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_WHSPCtl")
			{
			omodel.Kf_EntrustOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MultilineCtl")
			{
			omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产补料单
			//===========生产补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
			{
			omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1969,7 +2577,20 @@
			{
			omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOList")
			{
			omodel.Kf_MateReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_FIFOCtl")
			{
			omodel.Kf_MateReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产补料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========生产补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -1983,7 +2604,71 @@
			omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//直接调拨单
			//===========委外补料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
			{
			omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_ERPMode")
			{
			omodel.Kf_EntrustReplenishOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MustQtyCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MulSourceBill")
			{
			omodel.Kf_EntrustReplenishOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillTypeOneScan")
			{
			omodel.Kf_EntrustReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BatchNoCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MultilineCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_MaterWHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOList")
			{
			omodel.Kf_EntrustReplenishOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_FIFOCtl")
			{
			omodel.Kf_EntrustReplenishOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外补料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========委外补料单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_WHSPCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MultilineCtl")
			{
			omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========直接调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
			{
			omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2032,7 +2717,12 @@
			{
			omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//直接调拨单校验
			//直接调拨单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========直接调拨单校验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
			{
			omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2046,7 +2736,7 @@
			omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调出单
			//============分步式调出单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
			{
			omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2091,8 +2781,13 @@
			{
			omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//分步式调出单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//分步式调入单
			//===========分步式调入单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
			{
			omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2141,8 +2836,13 @@
			{
			omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//分步式调入单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//采购退料单
			//===============采购退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
			{
			omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2179,8 +2879,13 @@
			{
			omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//采购退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退库单
			//===========生产退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
			{
			omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2217,8 +2922,13 @@
			{
			omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//产品退库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他入库红字
			//===========其他入库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
			{
			omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2255,8 +2965,13 @@
			{
			omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退库单
			//===========委外退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
			{
			omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2293,8 +3008,13 @@
			{
			omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他入库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl")
			{
			omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//生产退料单
			//========生产退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
			{
			omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2335,8 +3055,13 @@
			{
			omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//生产退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//销售退库单
			//==========销售退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
			{
			omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2377,8 +3102,13 @@
			{
			omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//销售退库单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//其他出库红字
			//=========其他出库红字
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
			{
			omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2415,8 +3145,13 @@
			{
			omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//其他出库红字单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//委外退料单
			//===========委外退料单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
			{
			omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			@@ -2457,8 +3192,23 @@
			{
			omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//委外退料单暂存删除人必须是制单人
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_DeleterAndMakerMustSame")
			{
			omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//WMS 通用
			//===========生产组托单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_SourceBillTypeCtl")
			{
			omodel.Sc_PackUnionBill_SourceBillTypeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_SourceBillNoCtl")
			{
			omodel.Sc_PackUnionBill_SourceBillNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==============================================WMS 通用
			//库存控制-ERP负库存控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl")
			{
			@@ -2529,8 +3279,13 @@
			{
			omodel.WMS_CloudMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//单据日期是否取界面递入日期
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_BillDateMode")
			{
			omodel.WMS_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//桌面条码模块
			//桌面条码模块条码主档
			//有源单生成条码，生成条码数量可否超源单数量控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_SourceQtyCtl")
			{
			@@ -2551,10 +3306,216 @@
			{
			omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//选源单生产入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoProductInBillWMS")
			{
			omodel.BarCode_AutoProductInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//选源单采购入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoPOStockInBillWMS")
			{
			omodel.BarCode_AutoPOStockInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//选源单生产退料单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoMateOutBackBillWMS")
			{
			omodel.BarCode_AutoMateOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//选源单销售退货单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoSellOutBackBillWMS")
			{
			omodel.BarCode_AutoSellOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//条码主档删除人必须是制单人（'Y'为控制）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_DeleterAndMakerMustSame")
			{
			omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//==============================================================================================
			//============================================================================器具管理EAM系统参数
			//===========器具采购入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_AutoCheck")
			{
			omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty")
			{
			omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具领用出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck")
			{
			omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty")
			{
			omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew")
			{
			omodel.Sc_MouldProdOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_MouldProdOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrl")
			{
			omodel.Sc_MouldProdOutBill_MouldLifeCtrl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_MouldLifeCtrlType")
			{
			omodel.Sc_MouldProdOutBill_MouldLifeCtrlType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具领用退库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_AutoCheck")
			{
			omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty")
			{
			omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具改制出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck")
			{
			omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty")
			{
			omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具改制入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck")
			{
			omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty")
			{
			omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具其他入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck")
			{
			omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty")
			{
			omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具其他出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck")
			{
			omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty")
			{
			omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具暂借入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck")
			{
			omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty")
			{
			omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具暂借出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck")
			{
			omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty")
			{
			omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具报废入库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck")
			{
			omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty")
			{
			omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具报废出库单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck")
			{
			omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty")
			{
			omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具直接调拨单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck")
			{
			omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty")
			{
			omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具分步调出单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck")
			{
			omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty")
			{
			omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具分步调入单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck")
			{
			omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty")
			{
			omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//===========器具盘点单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck")
			{
			omodel.Sc_MouldProdCheckStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//-======进站单
			//============================================================================MES系统参数

			//-==================生产订单
			//生产订单同步时自动生成流转卡
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_AutoProcExchBill")
			{
			omodel.Sc_ICMOBill_AutoProcExchBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ICMOBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//-==================工序流转卡
			//工序流转卡保存自动同步条码档案
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
			{
			omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_DeleterAndMakerMustSame")
			{
			omodel.Sc_ProcessExchangeBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_SaveDeptIsNull")
			{
			omodel.Sc_ProcessExchangeBill_SaveDeptIsNull = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//-======工序进站接收单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
			{
			omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//先进先出
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_FIFOCtl")
			{
			@@ -2590,12 +3551,44 @@
			{
			omodel.MES_StationInBill_LineBindCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//进站接收单删除时是否进行关联控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DeleteRelationCtl")
			{
			omodel.MES_StationInBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//本道进站数量不能大于上道出站合格数量
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_PreQtyCtl")
			{
			omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
			{
			omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//===============出站单


			//===============工序出站汇报单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
			{
			omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站数量不能大于本道进站汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyCtl")
			{
			omodel.MES_StationOutBill_QtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站数量(合格数量或总数量)汇总不能大于上道合格汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyPreQtyCtl")
			{
			omodel.MES_StationOutBill_QtyPreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站数量(合格数量或总数量)汇总不能大于下道合格汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_QtyNextQtyCtl")
			{
			omodel.MES_StationOutBill_QtyNextQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出战单判断本道工序是否做首件检验
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_FirstCheckOut")
			@@ -2607,6 +3600,22 @@
			{
			omodel.MES_StationOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//出站汇报单删除时是否进行关联控制
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_DeleteRelationCtl")
			{
			omodel.MES_StationOutBill_DeleteRelationCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工序末道入库仓库取值类型末道工序自动入库时仓库取值类型（物料、工序、工艺路线）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_InStockType")
			{
			omodel.MES_StationOutBill_InStockType = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//本道出站数量不允许小于下道进站数量
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_NextQtyCtl")
			{
			omodel.MES_StationOutBill_NextQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//=====不良评审单
			//不良品数不能大于出站单报废数量
			@@ -2624,8 +3633,14 @@
			{
			omodel.QC_NoPassProdCheckBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}


			//=======委外发出
			//=======工序委外发出单//
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
			{
			omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//工站或工序先进先出（同上）
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_FIFOCtl")
			{
			@@ -2652,7 +3667,13 @@
			omodel.MES_StationEntrustInBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//===========委外接收单
			//===========工序委外接收单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
			{
			omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//出站数量不能大于本道进站汇总数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_QtyCtl")
			{
			@@ -2664,14 +3685,21 @@
			omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}



			//=======JIT

			//=======JIT系统参数

			//==========开班单
			//自动审核
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_AutoCheck")
			{
			omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//刷卡验证
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_SwipeCardStart")
			{
			omodel.Sc_MESBeginWorkBill_SwipeCardStart = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========返工单
			//自动审核
			@@ -2696,6 +3724,11 @@
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoCheck")
			{
			omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//当下一个生产日计划是相同产品时，MES系统自动开工下一单
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill")
			{
			omodel.Sc_ICMOBillWorkQtyStatus_AutoNextWorkBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}
			//==========质量汇报单
			//自动审核
			@@ -2724,40 +3757,30 @@
			{
			omodel.OA_ErrMsgBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========工序进站接收单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_SaveAutoAddnew")
			//是否发送钉钉消息本地不发,(斯莫尔)客户发
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "OA_ErrMsgBackBill_SendDingDingMsg")
			{
			omodel.MES_StationInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			omodel.OA_ErrMsgBackBill_SendDingDingMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========工序出站汇报单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_SaveAutoAddnew")
			{
			omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========工序委外发出单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
			{
			omodel.MES_StationEntrustInBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=========工序委外接收单
			//自动新增
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustOutBill_SaveAutoAddnew")
			{
			omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//报工台，工序汇报自动审核参数
			//=======报工台，工序汇报自动审核参数
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
			{
			omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}

			//=================================================基础资料

			//=========工艺路线
			//自动新增保存到数据库时自动加上转工序
			if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_SaveAutoLastProc")
			{
			omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
			}





			}
			sReturn = "显示单据成功！";
			return true;